diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-09-13 04:23:57 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2013-10-23 17:20:56 +0200 |
| commit | 7902fe8cbc58ae2bd3dad1a8ecf28ce83b1ba3a8 (patch) | |
| tree | d128694f40be3ce2ce4443c1f4e6d26ab0192e08 /drivers/mfd/timberdale.c | |
| parent | mfd: sm501: Remove unnecessary pci_set_drvdata() (diff) | |
| download | linux-7902fe8cbc58ae2bd3dad1a8ecf28ce83b1ba3a8.tar.xz linux-7902fe8cbc58ae2bd3dad1a8ecf28ce83b1ba3a8.zip | |
mfd: timberdale: Remove unnecessary pci_set_drvdata()
The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL. It also removes unnecessary label such
as 'err_request'.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/timberdale.c')
| -rw-r--r-- | drivers/mfd/timberdale.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c index a6755ec7bd6a..dbb34f94e5e3 100644 --- a/drivers/mfd/timberdale.c +++ b/drivers/mfd/timberdale.c @@ -678,7 +678,7 @@ static int timb_probe(struct pci_dev *dev, priv->ctl_mapbase = mapbase + CHIPCTLOFFSET; if (!request_mem_region(priv->ctl_mapbase, CHIPCTLSIZE, "timb-ctl")) { dev_err(&dev->dev, "Failed to request ctl mem\n"); - goto err_request; + goto err_start; } priv->ctl_membase = ioremap(priv->ctl_mapbase, CHIPCTLSIZE); @@ -828,13 +828,10 @@ err_config: iounmap(priv->ctl_membase); err_ioremap: release_mem_region(priv->ctl_mapbase, CHIPCTLSIZE); -err_request: - pci_set_drvdata(dev, NULL); err_start: pci_disable_device(dev); err_enable: kfree(priv); - pci_set_drvdata(dev, NULL); return -ENODEV; } @@ -851,7 +848,6 @@ static void timb_remove(struct pci_dev *dev) pci_disable_msix(dev); pci_disable_device(dev); - pci_set_drvdata(dev, NULL); kfree(priv); } |