From: Dexuan Cui decui@microsoft.com Sent: Monday, April 3, 2023 7:06 PM

The hpdev->state is never really useful. The only use in hv_pci_eject_device() and hv_eject_device_work() is not really necessary.

Signed-off-by: Dexuan Cui decui@microsoft.com Cc: stable@vger.kernel.org

---

drivers/pci/controller/pci-hyperv.c | 12 ------------ 1 file changed, 12 deletions(-)

v2: No change to the patch body. Added Cc:stable

diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c index 1b11cf7391933..46df6d093d683 100644 --- a/drivers/pci/controller/pci-hyperv.c +++ b/drivers/pci/controller/pci-hyperv.c @@ -553,19 +553,10 @@ struct hv_dr_state { struct hv_pcidev_description func[]; };

-enum hv_pcichild_state {

• hv_pcichild_init = 0,
• hv_pcichild_requirements,
• hv_pcichild_resourced,
• hv_pcichild_ejecting,
• hv_pcichild_maximum

-};

struct hv_pci_dev { /* List protected by pci_rescan_remove_lock */ struct list_head list_entry; refcount_t refs;

• enum hv_pcichild_state state; struct pci_slot *pci_slot; struct hv_pcidev_description desc; bool reported_missing;

@@ -2750,8 +2741,6 @@ static void hv_eject_device_work(struct work_struct *work) hpdev = container_of(work, struct hv_pci_dev, wrk); hbus = hpdev->hbus;

• WARN_ON(hpdev->state != hv_pcichild_ejecting);
• /*
  • Ejection can come before or after the PCI bus has been set up, so
  • attempt to find it and tear down the bus state, if it exists. This

@@ -2808,7 +2797,6 @@ static void hv_pci_eject_device(struct hv_pci_dev *hpdev) return; }

• hpdev->state = hv_pcichild_ejecting; get_pcichild(hpdev); INIT_WORK(&hpdev->wrk, hv_eject_device_work); queue_work(hbus->wq, &hpdev->wrk);

-- 2.25.1

Reviewed-by: Michael Kelley mikelley@microsoft.com