renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-04 11:24:04 +08:00
Code

collie_battery: Convert to gpio_request_array() / gpio_free_array()

Browse Source 
As suggested by Igor Grinberg, this change make the implementation looks
simpler.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
This commit is contained in:
Axel Lin 2011-08-26 15:52:48 +08:00 committed by Anton Vorontsov
parent 7ab2f0207d
commit 389cd203d6
1 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/power/collie_battery.c
View File

@ -277,18 +277,13 @@ static struct collie_bat collie_bat_bu = {
.adc_temp_divider = -1, .adc_temp_divider = -1,
}; };
static struct { static struct gpio collie_batt_gpios[] = {
int gpio; { COLLIE_GPIO_CO, GPIOF_IN, "main battery full" },
char *name; { COLLIE_GPIO_MAIN_BAT_LOW, GPIOF_IN, "main battery low" },
bool output; { COLLIE_GPIO_CHARGE_ON, GPIOF_OUT_INIT_LOW, "main charge on" },
int value; { COLLIE_GPIO_MBAT_ON, GPIOF_OUT_INIT_LOW, "main battery" },
} gpios[] = { { COLLIE_GPIO_TMP_ON, GPIOF_OUT_INIT_LOW, "main battery temp" },
{ COLLIE_GPIO_CO, "main battery full", 0, 0 }, { COLLIE_GPIO_BBAT_ON, GPIOF_OUT_INIT_LOW, "backup battery" },
{ COLLIE_GPIO_MAIN_BAT_LOW, "main battery low", 0, 0 },
{ COLLIE_GPIO_CHARGE_ON, "main charge on", 1, 0 },
{ COLLIE_GPIO_MBAT_ON, "main battery", 1, 0 },
{ COLLIE_GPIO_TMP_ON, "main battery temp", 1, 0 },
{ COLLIE_GPIO_BBAT_ON, "backup battery", 1, 0 },
}; };
#ifdef CONFIG_PM #ifdef CONFIG_PM
@ -313,29 +308,16 @@ static int collie_bat_resume(struct ucb1x00_dev *dev)
static int __devinit collie_bat_probe(struct ucb1x00_dev *dev) static int __devinit collie_bat_probe(struct ucb1x00_dev *dev)
{ {
int ret; int ret;
int i;
if (!machine_is_collie()) if (!machine_is_collie())
return -ENODEV; return -ENODEV;
ucb = dev->ucb; ucb = dev->ucb;
for (i = 0; i < ARRAY_SIZE(gpios); i++) { ret = gpio_request_array(collie_batt_gpios,
ret = gpio_request(gpios[i].gpio, gpios[i].name); ARRAY_SIZE(collie_batt_gpios));
if (ret) { if (ret)
i--; return ret;
goto err_gpio;
}
if (gpios[i].output)
ret = gpio_direction_output(gpios[i].gpio,
gpios[i].value);
else
ret = gpio_direction_input(gpios[i].gpio);
if (ret)
goto err_gpio;
}
mutex_init(&collie_bat_main.work_lock); mutex_init(&collie_bat_main.work_lock);
@ -363,19 +345,12 @@ err_psy_reg_main:
/* see comment in collie_bat_remove */ /* see comment in collie_bat_remove */
cancel_work_sync(&bat_work); cancel_work_sync(&bat_work);
gpio_free_array(collie_batt_gpios, ARRAY_SIZE(collie_batt_gpios));
i--;
err_gpio:
for (; i >= 0; i--)
gpio_free(gpios[i].gpio);
return ret; return ret;
} }
static void __devexit collie_bat_remove(struct ucb1x00_dev *dev) static void __devexit collie_bat_remove(struct ucb1x00_dev *dev)
{ {
int i;
free_irq(gpio_to_irq(COLLIE_GPIO_CO), &collie_bat_main); free_irq(gpio_to_irq(COLLIE_GPIO_CO), &collie_bat_main);
power_supply_unregister(&collie_bat_bu.psy); power_supply_unregister(&collie_bat_bu.psy);
@ -387,9 +362,7 @@ static void __devexit collie_bat_remove(struct ucb1x00_dev *dev)
* unregistered now. * unregistered now.
*/ */
cancel_work_sync(&bat_work); cancel_work_sync(&bat_work);
gpio_free_array(collie_batt_gpios, ARRAY_SIZE(collie_batt_gpios));
for (i = ARRAY_SIZE(gpios) - 1; i >= 0; i--)
gpio_free(gpios[i].gpio);
} }
static struct ucb1x00_driver collie_bat_driver = { static struct ucb1x00_driver collie_bat_driver = {