Skip to content

Commit

Permalink
leds: netxbig: convert to use the devm_ functions
Browse files Browse the repository at this point in the history 
This patch converts the leds-netxbig driver to use the devres functions
devm_gpio_request_one() and devm_led_classdev_register(). This allows to
simplify the code a bit.

Signed-off-by: Simon Guinot <[email protected]>
Signed-off-by: Jacek Anaszewski <[email protected]>
  • Loading branch information
@simonguinot @janaszewski
simonguinot authored and janaszewski committed Nov 3, 2015
1 parent ebc278f commit cd01095
Showing 1 changed file with 28 additions and 80 deletions.
108 changes: 28 additions & 80 deletions drivers/leds/leds-netxbig.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ static void gpio_ext_set_value(struct netxbig_gpio_ext *gpio_ext,
spin_unlock_irqrestore(&gpio_ext_lock, flags);
}

static int gpio_ext_init(struct netxbig_gpio_ext *gpio_ext)
static int gpio_ext_init(struct platform_device *pdev,
struct netxbig_gpio_ext *gpio_ext)
{
int err;
int i;
Expand All @@ -81,46 +82,28 @@ static int gpio_ext_init(struct netxbig_gpio_ext *gpio_ext)

/* Configure address GPIOs. */
for (i = 0; i < gpio_ext->num_addr; i++) {
err = gpio_request_one(gpio_ext->addr[i], GPIOF_OUT_INIT_LOW,
"GPIO extension addr");
err = devm_gpio_request_one(&pdev->dev, gpio_ext->addr[i],
GPIOF_OUT_INIT_LOW,
"GPIO extension addr");
if (err)
goto err_free_addr;
return err;
}
/* Configure data GPIOs. */
for (i = 0; i < gpio_ext->num_data; i++) {
err = gpio_request_one(gpio_ext->data[i], GPIOF_OUT_INIT_LOW,
"GPIO extension data");
err = devm_gpio_request_one(&pdev->dev, gpio_ext->data[i],
GPIOF_OUT_INIT_LOW,
"GPIO extension data");
if (err)
goto err_free_data;
return err;
}
/* Configure "enable select" GPIO. */
err = gpio_request_one(gpio_ext->enable, GPIOF_OUT_INIT_LOW,
"GPIO extension enable");
err = devm_gpio_request_one(&pdev->dev, gpio_ext->enable,
GPIOF_OUT_INIT_LOW,
"GPIO extension enable");
if (err)
goto err_free_data;
return err;

return 0;

err_free_data:
for (i = i - 1; i >= 0; i--)
gpio_free(gpio_ext->data[i]);
i = gpio_ext->num_addr;
err_free_addr:
for (i = i - 1; i >= 0; i--)
gpio_free(gpio_ext->addr[i]);

return err;
}

static void gpio_ext_free(struct netxbig_gpio_ext *gpio_ext)
{
int i;

gpio_free(gpio_ext->enable);
for (i = gpio_ext->num_addr - 1; i >= 0; i--)
gpio_free(gpio_ext->addr[i]);
for (i = gpio_ext->num_data - 1; i >= 0; i--)
gpio_free(gpio_ext->data[i]);
}

/*
Expand All @@ -141,11 +124,6 @@ struct netxbig_led_data {
spinlock_t lock;
};

struct netxbig_led_priv {
struct netxbig_led_platform_data *pdata;
struct netxbig_led_data leds_data[];
};

static int netxbig_led_get_timer_mode(enum netxbig_led_mode *mode,
unsigned long delay_on,
unsigned long delay_off,
Expand Down Expand Up @@ -305,18 +283,11 @@ static struct attribute *netxbig_led_attrs[] = {
};
ATTRIBUTE_GROUPS(netxbig_led);

static void delete_netxbig_led(struct netxbig_led_data *led_dat)
{
led_classdev_unregister(&led_dat->cdev);
}

static int create_netxbig_led(struct platform_device *pdev, int led,
struct netxbig_led_priv *priv)
static int create_netxbig_led(struct platform_device *pdev,
struct netxbig_led_platform_data *pdata,
struct netxbig_led_data *led_dat,
const struct netxbig_led *template)
{
struct netxbig_led_platform_data *pdata = priv->pdata;
struct netxbig_led_data *led_dat = &priv->leds_data[led];
const struct netxbig_led *template = &priv->pdata->leds[led];

spin_lock_init(&led_dat->lock);
led_dat->gpio_ext = pdata->gpio_ext;
led_dat->cdev.name = template->name;
Expand Down Expand Up @@ -349,7 +320,7 @@ static int create_netxbig_led(struct platform_device *pdev, int led,
if (led_dat->mode_val[NETXBIG_LED_SATA] != NETXBIG_LED_INVALID_MODE)
led_dat->cdev.groups = netxbig_led_groups;

return led_classdev_register(&pdev->dev, &led_dat->cdev);
return devm_led_classdev_register(&pdev->dev, &led_dat->cdev);
}

#ifdef CONFIG_OF_GPIO
Expand Down Expand Up @@ -579,7 +550,7 @@ netxbig_leds_get_of_pdata(struct device *dev,
static int netxbig_led_probe(struct platform_device *pdev)
{
struct netxbig_led_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct netxbig_led_priv *priv;
struct netxbig_led_data *leds_data;
int i;
int ret;

Expand All @@ -592,51 +563,28 @@ static int netxbig_led_probe(struct platform_device *pdev)
return ret;
}

priv = devm_kzalloc(&pdev->dev, sizeof(*priv) +
pdata->num_leds * sizeof(struct netxbig_led_data),
GFP_KERNEL);
if (!priv)
leds_data = devm_kzalloc(&pdev->dev,
pdata->num_leds * sizeof(*leds_data),
GFP_KERNEL);
if (!leds_data)
return -ENOMEM;
priv->pdata = pdata;

ret = gpio_ext_init(pdata->gpio_ext);
ret = gpio_ext_init(pdev, pdata->gpio_ext);
if (ret < 0)
return ret;

for (i = 0; i < pdata->num_leds; i++) {
ret = create_netxbig_led(pdev, i, priv);
ret = create_netxbig_led(pdev, pdata,
&leds_data[i], &pdata->leds[i]);
if (ret < 0)
goto err_free_leds;
return ret;
}
platform_set_drvdata(pdev, priv);

return 0;

err_free_leds:
for (i = i - 1; i >= 0; i--)
delete_netxbig_led(&priv->leds_data[i]);

gpio_ext_free(pdata->gpio_ext);
return ret;
}

static int netxbig_led_remove(struct platform_device *pdev)
{
struct netxbig_led_priv *priv = platform_get_drvdata(pdev);
struct netxbig_led_platform_data *pdata = priv->pdata;
int i;

for (i = 0; i < pdata->num_leds; i++)
delete_netxbig_led(&priv->leds_data[i]);

gpio_ext_free(pdata->gpio_ext);

return 0;
}

static struct platform_driver netxbig_led_driver = {
.probe = netxbig_led_probe,
.remove = netxbig_led_remove,
.driver = {
.name = "leds-netxbig",
.of_match_table = of_match_ptr(of_netxbig_leds_match),
Expand Down

0 comments on commit cd01095

Please sign in to comment.