leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpio: rdc321x: remove unnecessary platform_set_drvdata()

Browse Source 
The driver core clears the driver data to NULL after device_release
or on probe failure, since commit 0998d06310
(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>
This commit is contained in:
Jingoo Han 2013-05-06 12:29:18 +09:00 committed by Linus Walleij
parent 07606bfc73
commit 8be2010ec9
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpio/gpio-rdc321x.c
View File

@ -187,20 +187,18 @@ static int rdc321x_gpio_probe(struct platform_device *pdev)
rdc321x_gpio_dev->reg1_data_base, rdc321x_gpio_dev->reg1_data_base,
&rdc321x_gpio_dev->data_reg[0]); &rdc321x_gpio_dev->data_reg[0]);
if (err) if (err)
goto out_drvdata; goto out_free;
err = pci_read_config_dword(rdc321x_gpio_dev->sb_pdev, err = pci_read_config_dword(rdc321x_gpio_dev->sb_pdev,
rdc321x_gpio_dev->reg2_data_base, rdc321x_gpio_dev->reg2_data_base,
&rdc321x_gpio_dev->data_reg[1]); &rdc321x_gpio_dev->data_reg[1]);
if (err) if (err)
goto out_drvdata; goto out_free;
dev_info(&pdev->dev, "registering %d GPIOs\n", dev_info(&pdev->dev, "registering %d GPIOs\n",
rdc321x_gpio_dev->chip.ngpio); rdc321x_gpio_dev->chip.ngpio);
return gpiochip_add(&rdc321x_gpio_dev->chip); return gpiochip_add(&rdc321x_gpio_dev->chip);
out_drvdata:
platform_set_drvdata(pdev, NULL);
out_free: out_free:
kfree(rdc321x_gpio_dev); kfree(rdc321x_gpio_dev);
return err; return err;
@ -216,7 +214,6 @@ static int rdc321x_gpio_remove(struct platform_device *pdev)
dev_err(&pdev->dev, "failed to unregister chip\n"); dev_err(&pdev->dev, "failed to unregister chip\n");
kfree(rdc321x_gpio_dev); kfree(rdc321x_gpio_dev);
platform_set_drvdata(pdev, NULL);
return ret; return ret;
} }