diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-09-20 04:49:34 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2013-10-23 11:21:07 -0400 |
commit | af1192d769a146328cabfe11916f107f35561ae8 (patch) | |
tree | 7276a41df16c775ad0d6d9b7f0f9e369ae280343 /drivers/mfd/rtsx_pcr.c | |
parent | bef781617691488472f31ca9e5978de5bd064c56 (diff) |
mfd: mc12xx-i2c: rtsx_pcr: ti-ssp: Remove redundant dev_set_drvdata
Driver core sets driver data to NULL upon failure or remove.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/rtsx_pcr.c')
-rw-r--r-- | drivers/mfd/rtsx_pcr.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c index e6ae7720f9e1..11e20afbdcac 100644 --- a/drivers/mfd/rtsx_pcr.c +++ b/drivers/mfd/rtsx_pcr.c | |||
@@ -1149,7 +1149,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, | |||
1149 | pcr->remap_addr = ioremap_nocache(base, len); | 1149 | pcr->remap_addr = ioremap_nocache(base, len); |
1150 | if (!pcr->remap_addr) { | 1150 | if (!pcr->remap_addr) { |
1151 | ret = -ENOMEM; | 1151 | ret = -ENOMEM; |
1152 | goto free_host; | 1152 | goto free_handle; |
1153 | } | 1153 | } |
1154 | 1154 | ||
1155 | pcr->rtsx_resv_buf = dma_alloc_coherent(&(pcidev->dev), | 1155 | pcr->rtsx_resv_buf = dma_alloc_coherent(&(pcidev->dev), |
@@ -1209,8 +1209,6 @@ disable_msi: | |||
1209 | pcr->rtsx_resv_buf, pcr->rtsx_resv_buf_addr); | 1209 | pcr->rtsx_resv_buf, pcr->rtsx_resv_buf_addr); |
1210 | unmap: | 1210 | unmap: |
1211 | iounmap(pcr->remap_addr); | 1211 | iounmap(pcr->remap_addr); |
1212 | free_host: | ||
1213 | dev_set_drvdata(&pcidev->dev, NULL); | ||
1214 | free_handle: | 1212 | free_handle: |
1215 | kfree(handle); | 1213 | kfree(handle); |
1216 | free_pcr: | 1214 | free_pcr: |
@@ -1242,7 +1240,6 @@ static void rtsx_pci_remove(struct pci_dev *pcidev) | |||
1242 | pci_disable_msi(pcr->pci); | 1240 | pci_disable_msi(pcr->pci); |
1243 | iounmap(pcr->remap_addr); | 1241 | iounmap(pcr->remap_addr); |
1244 | 1242 | ||
1245 | dev_set_drvdata(&pcidev->dev, NULL); | ||
1246 | pci_release_regions(pcidev); | 1243 | pci_release_regions(pcidev); |
1247 | pci_disable_device(pcidev); | 1244 | pci_disable_device(pcidev); |
1248 | 1245 | ||