Skip to content

Commit 80f10bc

Browse files
musicakcgregkh
authored andcommitted
staging: rts5208: Replace pci_enable_device with pcim_enable_device
Devm_ functions allocate memory that is automatically freed when a driver detaches. Replace pci_enable_device with pcim_enable_device. Remove unnecessary pci_disable_device and pci_release_regions from probe and remove functions in rts5208 driver since pcim_enable_device contains a call to pcim_release which contains calls to both pci_disable_device and pci_release_regions. Signed-off-by: Amitoj Kaur Chawla <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 56c4a79 commit 80f10bc

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

drivers/staging/rts5208/rtsx.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -656,9 +656,6 @@ static void rtsx_release_resources(struct rtsx_dev *dev)
656656
if (dev->remap_addr)
657657
iounmap(dev->remap_addr);
658658

659-
pci_disable_device(dev->pci);
660-
pci_release_regions(dev->pci);
661-
662659
rtsx_release_chip(dev->chip);
663660
kfree(dev->chip);
664661
}
@@ -850,7 +847,7 @@ static int rtsx_probe(struct pci_dev *pci,
850847

851848
dev_dbg(&pci->dev, "Realtek PCI-E card reader detected\n");
852849

853-
err = pci_enable_device(pci);
850+
err = pcim_enable_device(pci);
854851
if (err < 0) {
855852
dev_err(&pci->dev, "PCI enable device failed!\n");
856853
return err;
@@ -860,7 +857,6 @@ static int rtsx_probe(struct pci_dev *pci,
860857
if (err < 0) {
861858
dev_err(&pci->dev, "PCI request regions for %s failed!\n",
862859
CR_DRIVER_NAME);
863-
pci_disable_device(pci);
864860
return err;
865861
}
866862

@@ -871,8 +867,6 @@ static int rtsx_probe(struct pci_dev *pci,
871867
host = scsi_host_alloc(&rtsx_host_template, sizeof(*dev));
872868
if (!host) {
873869
dev_err(&pci->dev, "Unable to allocate the scsi host\n");
874-
pci_release_regions(pci);
875-
pci_disable_device(pci);
876870
return -ENOMEM;
877871
}
878872

0 commit comments

Comments
 (0)