Commit f66472df authored by Frans Klaver's avatar Frans Klaver Committed by Sebastian Reichel

power: reset: ltc2952: unroll gpio_desc array

The three gpio's used by this driver are stored in an array of pointers.
This doesn't add much besides cleanups in a loop. In fact, it makes most
of the usage sites harder to read. Unroll the loop, and live with the
fact that cleanups become slightly larger.
Signed-off-by: default avatarFrans Klaver <frans.klaver@xsens.com>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent 07d08237
...@@ -72,21 +72,14 @@ struct ltc2952_poweroff_data { ...@@ -72,21 +72,14 @@ struct ltc2952_poweroff_data {
struct device *dev; struct device *dev;
/** struct gpio_desc *gpio_trigger;
* 0: trigger struct gpio_desc *gpio_watchdog;
* 1: watchdog struct gpio_desc *gpio_kill;
* 2: kill
*/
struct gpio_desc *gpio[3];
}; };
static int ltc2952_poweroff_panic; static int ltc2952_poweroff_panic;
static struct ltc2952_poweroff_data *ltc2952_data; static struct ltc2952_poweroff_data *ltc2952_data;
#define POWERPATH_IO_TRIGGER 0
#define POWERPATH_IO_WATCHDOG 1
#define POWERPATH_IO_KILL 2
/** /**
* ltc2952_poweroff_timer_wde - Timer callback * ltc2952_poweroff_timer_wde - Timer callback
* Toggles the watchdog reset signal each wde_interval * Toggles the watchdog reset signal each wde_interval
...@@ -105,8 +98,8 @@ static enum hrtimer_restart ltc2952_poweroff_timer_wde(struct hrtimer *timer) ...@@ -105,8 +98,8 @@ static enum hrtimer_restart ltc2952_poweroff_timer_wde(struct hrtimer *timer)
if (ltc2952_poweroff_panic) if (ltc2952_poweroff_panic)
return HRTIMER_NORESTART; return HRTIMER_NORESTART;
state = gpiod_get_value(ltc2952_data->gpio[POWERPATH_IO_WATCHDOG]); state = gpiod_get_value(ltc2952_data->gpio_watchdog);
gpiod_set_value(ltc2952_data->gpio[POWERPATH_IO_WATCHDOG], !state); gpiod_set_value(ltc2952_data->gpio_watchdog, !state);
now = hrtimer_cb_get_time(timer); now = hrtimer_cb_get_time(timer);
overruns = hrtimer_forward(timer, now, ltc2952_data->wde_interval); overruns = hrtimer_forward(timer, now, ltc2952_data->wde_interval);
...@@ -120,7 +113,7 @@ static enum hrtimer_restart ltc2952_poweroff_timer_trigger( ...@@ -120,7 +113,7 @@ static enum hrtimer_restart ltc2952_poweroff_timer_trigger(
int ret; int ret;
ret = hrtimer_start(&ltc2952_data->timer_wde, ret = hrtimer_start(&ltc2952_data->timer_wde,
ltc2952_data->wde_interval, HRTIMER_MODE_REL); ltc2952_data->wde_interval, HRTIMER_MODE_REL);
if (ret) { if (ret) {
dev_err(ltc2952_data->dev, "unable to start the timer\n"); dev_err(ltc2952_data->dev, "unable to start the timer\n");
...@@ -180,7 +173,7 @@ static irqreturn_t ltc2952_poweroff_handler(int irq, void *dev_id) ...@@ -180,7 +173,7 @@ static irqreturn_t ltc2952_poweroff_handler(int irq, void *dev_id)
static void ltc2952_poweroff_kill(void) static void ltc2952_poweroff_kill(void)
{ {
gpiod_set_value(ltc2952_data->gpio[POWERPATH_IO_KILL], 1); gpiod_set_value(ltc2952_data->gpio_kill, 1);
} }
static int ltc2952_poweroff_suspend(struct platform_device *pdev, static int ltc2952_poweroff_suspend(struct platform_device *pdev,
...@@ -196,11 +189,6 @@ static int ltc2952_poweroff_resume(struct platform_device *pdev) ...@@ -196,11 +189,6 @@ static int ltc2952_poweroff_resume(struct platform_device *pdev)
static void ltc2952_poweroff_default(struct ltc2952_poweroff_data *data) static void ltc2952_poweroff_default(struct ltc2952_poweroff_data *data)
{ {
unsigned int i;
for (i = 0; i < ARRAY_SIZE(data->gpio); i++)
data->gpio[i] = NULL;
data->wde_interval = ktime_set(0, 300L*1E6L); data->wde_interval = ktime_set(0, 300L*1E6L);
data->trigger_delay = ktime_set(2, 500L*1E6L); data->trigger_delay = ktime_set(2, 500L*1E6L);
...@@ -214,45 +202,46 @@ static void ltc2952_poweroff_default(struct ltc2952_poweroff_data *data) ...@@ -214,45 +202,46 @@ static void ltc2952_poweroff_default(struct ltc2952_poweroff_data *data)
static int ltc2952_poweroff_init(struct platform_device *pdev) static int ltc2952_poweroff_init(struct platform_device *pdev)
{ {
int ret, virq; int ret, virq;
unsigned int i;
struct ltc2952_poweroff_data *data; struct ltc2952_poweroff_data *data;
static char *name[] = {
"trigger",
"watchdog",
"kill",
NULL
};
data = ltc2952_data; data = ltc2952_data;
ltc2952_poweroff_default(ltc2952_data); ltc2952_poweroff_default(ltc2952_data);
for (i = 0; i < ARRAY_SIZE(ltc2952_data->gpio); i++) { ltc2952_data->gpio_watchdog = gpiod_get(&pdev->dev, "watchdog");
ltc2952_data->gpio[i] = gpiod_get(&pdev->dev, name[i]); if (IS_ERR(ltc2952_data->gpio_watchdog)) {
ret = PTR_ERR(ltc2952_data->gpio_watchdog);
dev_err(&pdev->dev, "unable to claim gpio \"watchdog\"\n");
return ret;
}
if (IS_ERR(ltc2952_data->gpio[i])) { ltc2952_data->gpio_kill = gpiod_get(&pdev->dev, "kill");
ret = PTR_ERR(ltc2952_data->gpio[i]); if (IS_ERR(ltc2952_data->gpio_kill)) {
dev_err(&pdev->dev, ret = PTR_ERR(ltc2952_data->gpio_kill);
"unable to claim the following gpio: %s\n", dev_err(&pdev->dev, "unable to claim gpio \"kill\"\n");
name[i]); goto err_kill;
goto err_io; }
}
ltc2952_data->gpio_trigger = gpiod_get(&pdev->dev, "trigger");
if (IS_ERR(ltc2952_data->gpio_trigger)) {
ret = PTR_ERR(ltc2952_data->gpio_trigger);
dev_err(&pdev->dev, "unable to claim gpio \"trigger\"\n");
goto err_trigger;
} }
ret = gpiod_direction_output( ret = gpiod_direction_output(
ltc2952_data->gpio[POWERPATH_IO_WATCHDOG], 0); ltc2952_data->gpio_watchdog, 0);
if (ret) { if (ret) {
dev_err(&pdev->dev, "unable to use watchdog-gpio as output\n"); dev_err(&pdev->dev, "unable to use watchdog-gpio as output\n");
goto err_io; goto err_io;
} }
ret = gpiod_direction_output(ltc2952_data->gpio[POWERPATH_IO_KILL], 0); ret = gpiod_direction_output(ltc2952_data->gpio_kill, 0);
if (ret) { if (ret) {
dev_err(&pdev->dev, "unable to use kill-gpio as output\n"); dev_err(&pdev->dev, "unable to use kill-gpio as output\n");
goto err_io; goto err_io;
} }
virq = gpiod_to_irq(ltc2952_data->gpio[POWERPATH_IO_TRIGGER]); virq = gpiod_to_irq(ltc2952_data->gpio_trigger);
if (virq < 0) { if (virq < 0) {
dev_err(&pdev->dev, "cannot map GPIO as interrupt"); dev_err(&pdev->dev, "cannot map GPIO as interrupt");
goto err_io; goto err_io;
...@@ -272,9 +261,11 @@ static int ltc2952_poweroff_init(struct platform_device *pdev) ...@@ -272,9 +261,11 @@ static int ltc2952_poweroff_init(struct platform_device *pdev)
return 0; return 0;
err_io: err_io:
for (i = 0; i < ARRAY_SIZE(ltc2952_data->gpio); i++) gpiod_put(ltc2952_data->gpio_trigger);
if (ltc2952_data->gpio[i]) err_trigger:
gpiod_put(ltc2952_data->gpio[i]); gpiod_put(ltc2952_data->gpio_kill);
err_kill:
gpiod_put(ltc2952_data->gpio_watchdog);
return ret; return ret;
} }
...@@ -308,14 +299,13 @@ static int ltc2952_poweroff_probe(struct platform_device *pdev) ...@@ -308,14 +299,13 @@ static int ltc2952_poweroff_probe(struct platform_device *pdev)
static int ltc2952_poweroff_remove(struct platform_device *pdev) static int ltc2952_poweroff_remove(struct platform_device *pdev)
{ {
unsigned int i;
pm_power_off = NULL; pm_power_off = NULL;
if (ltc2952_data) if (ltc2952_data) {
for (i = 0; i < ARRAY_SIZE(ltc2952_data->gpio); i++) gpiod_put(ltc2952_data->gpio_trigger);
gpiod_put(ltc2952_data->gpio[i]); gpiod_put(ltc2952_data->gpio_watchdog);
gpiod_put(ltc2952_data->gpio_kill);
}
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment