|
@@ -110,7 +110,7 @@ static int dwc3_pci_probe(struct pci_dev *pci,
|
|
|
|
|
|
glue->dev = dev;
|
|
|
|
|
|
- ret = pci_enable_device(pci);
|
|
|
+ ret = pcim_enable_device(pci);
|
|
|
if (ret) {
|
|
|
dev_err(dev, "failed to enable pci device\n");
|
|
|
return -ENODEV;
|
|
@@ -127,8 +127,7 @@ static int dwc3_pci_probe(struct pci_dev *pci,
|
|
|
dwc3 = platform_device_alloc("dwc3", PLATFORM_DEVID_AUTO);
|
|
|
if (!dwc3) {
|
|
|
dev_err(dev, "couldn't allocate dwc3 device\n");
|
|
|
- ret = -ENOMEM;
|
|
|
- goto err1;
|
|
|
+ return -ENOMEM;
|
|
|
}
|
|
|
|
|
|
memset(res, 0x00, sizeof(struct resource) * ARRAY_SIZE(res));
|
|
@@ -145,7 +144,7 @@ static int dwc3_pci_probe(struct pci_dev *pci,
|
|
|
ret = platform_device_add_resources(dwc3, res, ARRAY_SIZE(res));
|
|
|
if (ret) {
|
|
|
dev_err(dev, "couldn't add resources to dwc3 device\n");
|
|
|
- goto err1;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
pci_set_drvdata(pci, glue);
|
|
@@ -167,9 +166,6 @@ static int dwc3_pci_probe(struct pci_dev *pci,
|
|
|
|
|
|
err3:
|
|
|
platform_device_put(dwc3);
|
|
|
-err1:
|
|
|
- pci_disable_device(pci);
|
|
|
-
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -180,7 +176,6 @@ static void dwc3_pci_remove(struct pci_dev *pci)
|
|
|
platform_device_unregister(glue->dwc3);
|
|
|
platform_device_unregister(glue->usb2_phy);
|
|
|
platform_device_unregister(glue->usb3_phy);
|
|
|
- pci_disable_device(pci);
|
|
|
}
|
|
|
|
|
|
static const struct pci_device_id dwc3_pci_id_table[] = {
|