---

yaml
---
r: 197903
b: refs/heads/master
c: 460d298
h: refs/heads/master
i:
  197901: 839b0f2
  197899: aca4295
  197895: ac1228a
  197887: 0c558c4
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6d34eddecb34fd84f9fb2ea26a63cfde5662f49
+refs/heads/master: 460d298d521910483dcdc09920ca4c4a63b16730

trunk/drivers/pci/pcie/aer/aerdrv.c

@@ -179,7 +179,8 @@ static void aer_remove(struct pcie_device *dev)
 
 		wait_event(rpc->wait_release, rpc->prod_idx == rpc->cons_idx);
 
-		aer_delete_rootport(rpc);
+		aer_disable_rootport(rpc);
+		kfree(rpc);
 		set_service_data(dev, NULL);
 	}
 }

trunk/drivers/pci/pcie/aer/aerdrv.h

@@ -118,7 +118,7 @@ static inline pci_ers_result_t merge_result(enum pci_ers_result orig,
 
 extern struct bus_type pcie_port_bus_type;
 extern void aer_enable_rootport(struct aer_rpc *rpc);
-extern void aer_delete_rootport(struct aer_rpc *rpc);
+extern void aer_disable_rootport(struct aer_rpc *rpc);
 extern int aer_init(struct pcie_device *dev);
 extern void aer_isr(struct work_struct *work);
 extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info);

trunk/drivers/pci/pcie/aer/aerdrv_core.c

@@ -629,12 +629,12 @@ void aer_enable_rootport(struct aer_rpc *rpc)
 }
 
 /**
- * disable_root_aer - disable Root Port's interrupts when receiving messages
+ * aer_disable_rootport - disable Root Port's interrupts when receiving messages
  * @rpc: pointer to a Root Port data structure
  *
  * Invoked when PCIe bus unloads AER service driver.
  */
-static void disable_root_aer(struct aer_rpc *rpc)
+void aer_disable_rootport(struct aer_rpc *rpc)
 {
 	struct pci_dev *pdev = rpc->rpd->port;
 	u32 reg32;
@@ -839,20 +839,6 @@ void aer_isr(struct work_struct *work)
 	wake_up(&rpc->wait_release);
 }
 
-/**
- * aer_delete_rootport - disable root port aer and delete service data
- * @rpc: pointer to a root port device being deleted
- *
- * Invoked when AER service unloaded on a specific Root Port
- */
-void aer_delete_rootport(struct aer_rpc *rpc)
-{
-	/* Disable root port AER itself */
-	disable_root_aer(rpc);
-
-	kfree(rpc);
-}
-
 /**
  * aer_init - provide AER initialization
  * @dev: pointer to AER pcie device