aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-05-05 23:29:18 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-05-30 13:20:21 -0400
commit8be2010ec96ae36e71df119eff0aba3d8ecd5622 (patch)
tree0c7309fc3d6ab8e29f02440e87be077d2f95f9b4 /drivers/gpio
parent07606bfc73248fd9ef0bf5ac3c0b12098fb19b25 (diff)
gpio: rdc321x: remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-rdc321x.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-rdc321x.c b/drivers/gpio/gpio-rdc321x.c
index 1bf55f67f7a5..368c3c00fca5 100644
--- a/drivers/gpio/gpio-rdc321x.c
+++ b/drivers/gpio/gpio-rdc321x.c
@@ -187,20 +187,18 @@ static int rdc321x_gpio_probe(struct platform_device *pdev)
187 rdc321x_gpio_dev->reg1_data_base, 187 rdc321x_gpio_dev->reg1_data_base,
188 &rdc321x_gpio_dev->data_reg[0]); 188 &rdc321x_gpio_dev->data_reg[0]);
189 if (err) 189 if (err)
190 goto out_drvdata; 190 goto out_free;
191 191
192 err = pci_read_config_dword(rdc321x_gpio_dev->sb_pdev, 192 err = pci_read_config_dword(rdc321x_gpio_dev->sb_pdev,
193 rdc321x_gpio_dev->reg2_data_base, 193 rdc321x_gpio_dev->reg2_data_base,
194 &rdc321x_gpio_dev->data_reg[1]); 194 &rdc321x_gpio_dev->data_reg[1]);
195 if (err) 195 if (err)
196 goto out_drvdata; 196 goto out_free;
197 197
198 dev_info(&pdev->dev, "registering %d GPIOs\n", 198 dev_info(&pdev->dev, "registering %d GPIOs\n",
199 rdc321x_gpio_dev->chip.ngpio); 199 rdc321x_gpio_dev->chip.ngpio);
200 return gpiochip_add(&rdc321x_gpio_dev->chip); 200 return gpiochip_add(&rdc321x_gpio_dev->chip);
201 201
202out_drvdata:
203 platform_set_drvdata(pdev, NULL);
204out_free: 202out_free:
205 kfree(rdc321x_gpio_dev); 203 kfree(rdc321x_gpio_dev);
206 return err; 204 return err;
@@ -216,7 +214,6 @@ static int rdc321x_gpio_remove(struct platform_device *pdev)
216 dev_err(&pdev->dev, "failed to unregister chip\n"); 214 dev_err(&pdev->dev, "failed to unregister chip\n");
217 215
218 kfree(rdc321x_gpio_dev); 216 kfree(rdc321x_gpio_dev);
219 platform_set_drvdata(pdev, NULL);
220 217
221 return ret; 218 return ret;
222} 219}