openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] ufshcd-pci: release ioremapped region during removing driver 

Before commit 2953f850c3 ("[SCSI] ufs:
use devres functions for ufshcd"), UFSHCI register was ioremapped by
each glue-driver (ufshcd-pltfrm and ufshcd-pci) during probing and it
was iounmapped by core-driver during removing driver.  The commit
converted ufshcd-pltfrm to use devres functions, but it didn't convert
ufshcd-pci.

Therefore, the change causes ufshcd-pci driver not to iounmap UFSHCI
register region during removing driver.  This fixes it by converting
ufshcd-pci to use devres functions.

Signed-off-by: Akinobu Mita <mita@fixstars.com>
Signed-off-by: Santosh Y <santoshsy@gmail.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Akinobu Mita 2013-07-30 00:36:01 +05:30 committed by James Bottomley
parent 62694735ca
commit 36f4f3b672
1 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/scsi/ufs/ufshcd-pci.c
View File

@ -134,10 +134,7 @@ static void ufshcd_pci_remove(struct pci_dev *pdev)
disable_irq(pdev->irq); disable_irq(pdev->irq);
ufshcd_remove(hba); ufshcd_remove(hba);
pci_release_regions(pdev);
pci_set_drvdata(pdev, NULL); pci_set_drvdata(pdev, NULL);
pci_clear_master(pdev);
pci_disable_device(pdev);
} }
/** /**
@ -174,38 +171,32 @@ ufshcd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
void __iomem *mmio_base; void __iomem *mmio_base;
int err; int err;
err = pci_enable_device(pdev); err = pcim_enable_device(pdev);
if (err) { if (err) {
dev_err(&pdev->dev, "pci_enable_device failed\n"); dev_err(&pdev->dev, "pcim_enable_device failed\n");
goto out_error; return err;
} }
pci_set_master(pdev); pci_set_master(pdev);
err = pcim_iomap_regions(pdev, 1 << 0, UFSHCD);
err = pci_request_regions(pdev, UFSHCD);
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, "request regions failed\n"); dev_err(&pdev->dev, "request and iomap failed\n");
goto out_disable; return err;
} }
mmio_base = pci_ioremap_bar(pdev, 0); mmio_base = pcim_iomap_table(pdev)[0];
if (!mmio_base) {
dev_err(&pdev->dev, "memory map failed\n");
err = -ENOMEM;
goto out_release_regions;
}
err = ufshcd_set_dma_mask(pdev); err = ufshcd_set_dma_mask(pdev);
if (err) { if (err) {
dev_err(&pdev->dev, "set dma mask failed\n"); dev_err(&pdev->dev, "set dma mask failed\n");
goto out_iounmap; return err;
} }
err = ufshcd_init(&pdev->dev, &hba, mmio_base, pdev->irq); err = ufshcd_init(&pdev->dev, &hba, mmio_base, pdev->irq);
if (err) { if (err) {
dev_err(&pdev->dev, "Initialization failed\n"); dev_err(&pdev->dev, "Initialization failed\n");
goto out_iounmap; return err;
} }
pci_set_drvdata(pdev, hba); pci_set_drvdata(pdev, hba);
@ -213,16 +204,6 @@ ufshcd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
pm_runtime_allow(&pdev->dev); pm_runtime_allow(&pdev->dev);
return 0; return 0;
out_iounmap:
iounmap(mmio_base);
out_release_regions:
pci_release_regions(pdev);
out_disable:
pci_clear_master(pdev);
pci_disable_device(pdev);
out_error:
return err;
} }
static const struct dev_pm_ops ufshcd_pci_pm_ops = { static const struct dev_pm_ops ufshcd_pci_pm_ops = {