Commit add9195e authored by Dexuan Cui's avatar Dexuan Cui Committed by Wei Liu
Browse files

PCI: hv: Remove the useless hv_pcichild_state from struct hv_pci_dev 



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: default avatarDexuan Cui <decui@microsoft.com>
Reviewed-by: default avatarMichael Kelley <mikelley@microsoft.com>
Acked-by: default avatarLorenzo Pieralisi <lpieralisi@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20230615044451.5580-4-decui@microsoft.com


Signed-off-by: default avatarWei Liu <wei.liu@kernel.org>
parent 2738d5ab

drivers/pci/controller/pci-hyperv.c

+0 −12
Original line number Diff line number Diff line
@@ -545,19 +545,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;
@@ -2843,8 +2834,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
@@ -2901,7 +2890,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);