hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: chipidea: move to pcim_* functions 

This patch makes error path cleaner and probe function tidier.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andy Shevchenko 2013-06-13 18:00:02 +03:00 committed by Greg Kroah-Hartman
parent 54b448e5e4
commit 8b2379b49a
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/usb/chipidea/ci13xxx_pci.c
View File

@ -61,14 +61,13 @@ static int ci13xxx_pci_probe(struct pci_dev *pdev,
return -ENODEV; return -ENODEV;
} }
retval = pci_enable_device(pdev); retval = pcim_enable_device(pdev);
if (retval) if (retval)
goto done; return retval;
if (!pdev->irq) { if (!pdev->irq) {
dev_err(&pdev->dev, "No IRQ, check BIOS/PCI setup!"); dev_err(&pdev->dev, "No IRQ, check BIOS/PCI setup!");
retval = -ENODEV; return -ENODEV;
goto disable_device;
} }
pci_set_master(pdev); pci_set_master(pdev);
@ -84,18 +83,12 @@ static int ci13xxx_pci_probe(struct pci_dev *pdev,
plat_ci = ci13xxx_add_device(&pdev->dev, res, nres, platdata); plat_ci = ci13xxx_add_device(&pdev->dev, res, nres, platdata);
if (IS_ERR(plat_ci)) { if (IS_ERR(plat_ci)) {
dev_err(&pdev->dev, "ci13xxx_add_device failed!\n"); dev_err(&pdev->dev, "ci13xxx_add_device failed!\n");
retval = PTR_ERR(plat_ci); return PTR_ERR(plat_ci);
goto disable_device;
} }
pci_set_drvdata(pdev, plat_ci); pci_set_drvdata(pdev, plat_ci);
return 0; return 0;
disable_device:
pci_disable_device(pdev);
done:
return retval;
} }
/** /**
@ -111,7 +104,6 @@ static void ci13xxx_pci_remove(struct pci_dev *pdev)
struct platform_device *plat_ci = pci_get_drvdata(pdev); struct platform_device *plat_ci = pci_get_drvdata(pdev);
ci13xxx_remove_device(plat_ci); ci13xxx_remove_device(plat_ci);
pci_disable_device(pdev);
} }
/** /**