summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2018-09-19 02:58:47 +0300
committerBjorn Helgaas <bhelgaas@google.com>2018-10-19 03:41:16 +0300
commit369fd7b00fce169570d6a74cb369e60dbfc95fb4 (patch)
treebdacdc0724f5ec232d8989f68e8bb03dadfd67d9 /drivers/pci
parent6200cc5ee2baa573e7ac4dbcfca750e0b777c37d (diff)
downloadlinux-369fd7b00fce169570d6a74cb369e60dbfc95fb4.tar.xz
PCI/AER: Use managed resource allocations
Use the managed device resource allocations for the service data so the AER driver doesn't need to manage it, further simplifying this driver. Link: https://lore.kernel.org/linux-pci/20180918235848.26694-12-keith.busch@intel.com Signed-off-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pcie/aer.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 638d0cbc704e..90b53abf621d 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -1367,11 +1367,7 @@ static void aer_remove(struct pcie_device *dev)
{
struct aer_rpc *rpc = get_service_data(dev);
- if (rpc) {
- aer_disable_rootport(rpc);
- kfree(rpc);
- set_service_data(dev, NULL);
- }
+ aer_disable_rootport(rpc);
}
/**
@@ -1384,10 +1380,9 @@ static int aer_probe(struct pcie_device *dev)
{
int status;
struct aer_rpc *rpc;
- struct device *device = &dev->port->dev;
+ struct device *device = &dev->device;
- /* Alloc rpc data structure */
- rpc = kzalloc(sizeof(struct aer_rpc), GFP_KERNEL);
+ rpc = devm_kzalloc(device, sizeof(struct aer_rpc), GFP_KERNEL);
if (!rpc) {
dev_printk(KERN_DEBUG, device, "alloc AER rpc failed\n");
return -ENOMEM;
@@ -1395,13 +1390,11 @@ static int aer_probe(struct pcie_device *dev)
rpc->rpd = dev->port;
set_service_data(dev, rpc);
- /* Request IRQ ISR */
- status = request_threaded_irq(dev->irq, aer_irq, aer_isr,
- IRQF_SHARED, "aerdrv", dev);
+ status = devm_request_threaded_irq(device, dev->irq, aer_irq, aer_isr,
+ IRQF_SHARED, "aerdrv", dev);
if (status) {
dev_printk(KERN_DEBUG, device, "request AER IRQ %d failed\n",
dev->irq);
- aer_remove(dev);
return status;
}