releases/upstream/2.6.22-rc1/0002-ACPI-ibm-acpi-rename-some-identifiers.patch

   1 From e062e0343871a41e8ec408f1c1e8ac3b0310da9d Mon Sep 17 00:00:00 2001
   2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
   3 Date: Fri, 23 Mar 2007 17:33:55 -0300
   4 Subject: ACPI: ibm-acpi: rename some identifiers
   5
   6 Rename some identifiers so that they are more in tune with the rest of the
   7 driver code, or less generic.
   8
   9 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  10 Signed-off-by: Len Brown <len.brown@intel.com>
  11 ---
  12  drivers/acpi/ibm_acpi.c |   43 ++++++++++++++++++++++++-------------------
  13  1 files changed, 24 insertions(+), 19 deletions(-)
  14
  15 diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
  16 index 60aaed9..41c46b0 100644
  17 --- a/drivers/acpi/ibm_acpi.c
  18 +++ b/drivers/acpi/ibm_acpi.c
  19 @@ -506,7 +506,7 @@ static int ibm_acpi_driver_init(void)
  20         return 0;
  21  }
  22
  23 -static int driver_read(char *p)
  24 +static int ibm_acpi_driver_read(char *p)
  25  {
  26         int len = 0;
  27
  28 @@ -1310,9 +1310,9 @@ static const int led_exp_hlbl[] = { 0, 0, 1 };    /* led# * */
  29  static const int led_exp_hlcl[] = { 0, 1, 1 }; /* led# * */
  30  static const int led_led_arg1[] = { 0, 0x80, 0xc0 };
  31
  32 -#define EC_HLCL 0x0c
  33 -#define EC_HLBL 0x0d
  34 -#define EC_HLMS 0x0e
  35 +#define IBMACPI_LED_EC_HLCL 0x0c
  36 +#define IBMACPI_LED_EC_HLBL 0x0d
  37 +#define IBMACPI_LED_EC_HLMS 0x0e
  38
  39  static int led_write(char *buf)
  40  {
  41 @@ -1344,13 +1344,15 @@ static int led_write(char *buf)
  42                 } else if (led_supported == IBMACPI_LED_OLD) {
  43                         /* 600e/x, 770e, 770x, A21e, A2xm/p, T20-22, X20 */
  44                         led = 1 << led;
  45 -                       ret = ec_write(EC_HLMS, led);
  46 +                       ret = ec_write(IBMACPI_LED_EC_HLMS, led);
  47                         if (ret >= 0)
  48                                 ret =
  49 -                                   ec_write(EC_HLBL, led * led_exp_hlbl[ind]);
  50 +                                   ec_write(IBMACPI_LED_EC_HLBL,
  51 +                                            led * led_exp_hlbl[ind]);
  52                         if (ret >= 0)
  53                                 ret =
  54 -                                   ec_write(EC_HLCL, led * led_exp_hlcl[ind]);
  55 +                                   ec_write(IBMACPI_LED_EC_HLCL,
  56 +                                            led * led_exp_hlcl[ind]);
  57                         if (ret < 0)
  58                                 return ret;
  59                 } else {
  60 @@ -1657,8 +1659,8 @@ static int brightness_read(char *p)
  61         return len;
  62  }
  63
  64 -#define BRIGHTNESS_UP  4
  65 -#define BRIGHTNESS_DOWN        5
  66 +#define TP_CMOS_BRIGHTNESS_UP  4
  67 +#define TP_CMOS_BRIGHTNESS_DOWN        5
  68
  69  static int brightness_set(int value)
  70  {
  71 @@ -1667,7 +1669,8 @@ static int brightness_set(int value)
  72
  73         value &= 7;
  74
  75 -       cmos_cmd = value > current_value ? BRIGHTNESS_UP : BRIGHTNESS_DOWN;
  76 +       cmos_cmd = value > current_value ?
  77 +                  TP_CMOS_BRIGHTNESS_UP : TP_CMOS_BRIGHTNESS_DOWN;
  78         inc = value > current_value ? 1 : -1;
  79         for (i = current_value; i != value; i += inc) {
  80                 if (!cmos_eval(cmos_cmd))
  81 @@ -1769,9 +1772,9 @@ static int volume_read(char *p)
  82         return len;
  83  }
  84
  85 -#define VOLUME_DOWN    0
  86 -#define VOLUME_UP      1
  87 -#define VOLUME_MUTE    2
  88 +#define TP_CMOS_VOLUME_DOWN    0
  89 +#define TP_CMOS_VOLUME_UP      1
  90 +#define TP_CMOS_VOLUME_MUTE    2
  91
  92  static int volume_write(char *buf)
  93  {
  94 @@ -1805,7 +1808,8 @@ static int volume_write(char *buf)
  95                         return -EINVAL;
  96
  97                 if (new_level != level) {       /* mute doesn't change */
  98 -                       cmos_cmd = new_level > level ? VOLUME_UP : VOLUME_DOWN;
  99 +                       cmos_cmd = new_level > level ?
 100 +                                       TP_CMOS_VOLUME_UP : TP_CMOS_VOLUME_DOWN;
 101                         inc = new_level > level ? 1 : -1;
 102
 103                         if (mute && (!cmos_eval(cmos_cmd) ||
 104 @@ -1817,14 +1821,15 @@ static int volume_write(char *buf)
 105                                     !acpi_ec_write(volume_offset, i + inc))
 106                                         return -EIO;
 107
 108 -                       if (mute && (!cmos_eval(VOLUME_MUTE) ||
 109 +                       if (mute && (!cmos_eval(TP_CMOS_VOLUME_MUTE) ||
 110                                      !acpi_ec_write(volume_offset,
 111                                                     new_level + mute)))
 112                                 return -EIO;
 113                 }
 114
 115                 if (new_mute != mute) { /* level doesn't change */
 116 -                       cmos_cmd = new_mute ? VOLUME_MUTE : VOLUME_UP;
 117 +                       cmos_cmd = new_mute ?
 118 +                                  TP_CMOS_VOLUME_MUTE : TP_CMOS_VOLUME_UP;
 119
 120                         if (!cmos_eval(cmos_cmd) ||
 121                             !acpi_ec_write(volume_offset, level + new_mute))
 122 @@ -2315,7 +2320,7 @@ static struct ibm_struct ibms[] = {
 123         {
 124          .name = "driver",
 125          .init = ibm_acpi_driver_init,
 126 -        .read = driver_read,
 127 +        .read = ibm_acpi_driver_read,
 128          },
 129         {
 130          .name = "hotkey",
 131 @@ -2534,7 +2539,7 @@ static int __init ibm_device_add(struct acpi_device *device)
 132         return 0;
 133  }
 134
 135 -static int __init register_driver(struct ibm_struct *ibm)
 136 +static int __init register_ibmacpi_subdriver(struct ibm_struct *ibm)
 137  {
 138         int ret;
 139
 140 @@ -2569,7 +2574,7 @@ static int __init ibm_init(struct ibm_struct *ibm)
 141                 return 0;
 142
 143         if (ibm->hid) {
 144 -               ret = register_driver(ibm);
 145 +               ret = register_ibmacpi_subdriver(ibm);
 146                 if (ret < 0)
 147                         return ret;
 148                 ibm->driver_registered = 1;
 149 --
 150 1.5.1
 151