Skip to content

Commit 54e657d

Browse files
andy-shevlag-linaro
authored andcommitted
leds: gpio: Move temporary variable for struct device to gpio_led_probe()
Use temporary variable for struct device in gpio_led_probe() in order to make code neater. Signed-off-by: Andy Shevchenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lee Jones <[email protected]>
1 parent 5ac50ec commit 54e657d

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

drivers/leds/leds-gpio.c

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,8 @@ struct gpio_leds_priv {
142142
struct gpio_led_data leds[] __counted_by(num_leds);
143143
};
144144

145-
static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
145+
static struct gpio_leds_priv *gpio_leds_create(struct device *dev)
146146
{
147-
struct device *dev = &pdev->dev;
148147
struct fwnode_handle *child;
149148
struct gpio_leds_priv *priv;
150149
int count, ret;
@@ -253,13 +252,13 @@ static struct gpio_desc *gpio_led_get_gpiod(struct device *dev, int idx,
253252

254253
static int gpio_led_probe(struct platform_device *pdev)
255254
{
256-
struct gpio_led_platform_data *pdata = dev_get_platdata(&pdev->dev);
255+
struct device *dev = &pdev->dev;
256+
struct gpio_led_platform_data *pdata = dev_get_platdata(dev);
257257
struct gpio_leds_priv *priv;
258258
int i, ret = 0;
259259

260260
if (pdata && pdata->num_leds) {
261-
priv = devm_kzalloc(&pdev->dev, struct_size(priv, leds, pdata->num_leds),
262-
GFP_KERNEL);
261+
priv = devm_kzalloc(dev, struct_size(priv, leds, pdata->num_leds), GFP_KERNEL);
263262
if (!priv)
264263
return -ENOMEM;
265264

@@ -272,22 +271,20 @@ static int gpio_led_probe(struct platform_device *pdev)
272271
led_dat->gpiod = template->gpiod;
273272
else
274273
led_dat->gpiod =
275-
gpio_led_get_gpiod(&pdev->dev,
276-
i, template);
274+
gpio_led_get_gpiod(dev, i, template);
277275
if (IS_ERR(led_dat->gpiod)) {
278-
dev_info(&pdev->dev, "Skipping unavailable LED gpio %d (%s)\n",
276+
dev_info(dev, "Skipping unavailable LED gpio %d (%s)\n",
279277
template->gpio, template->name);
280278
continue;
281279
}
282280

283-
ret = create_gpio_led(template, led_dat,
284-
&pdev->dev, NULL,
281+
ret = create_gpio_led(template, led_dat, dev, NULL,
285282
pdata->gpio_blink_set);
286283
if (ret < 0)
287284
return ret;
288285
}
289286
} else {
290-
priv = gpio_leds_create(pdev);
287+
priv = gpio_leds_create(dev);
291288
if (IS_ERR(priv))
292289
return PTR_ERR(priv);
293290
}

0 commit comments

Comments
 (0)