Commit d08b8fc0 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: remove the reference to pdev from mei_device 



For purpose of adding testing HW we would like
to get rid of pci dependency in generic mei code.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1bd30b6a

drivers/misc/mei/hw-me.c

+1 −2
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id) 


	/* Ack the interrupt here

	 * In case of MSI we don't go through the quick handler */

	if (pci_dev_msi_enabled(dev->pdev))

	if (pci_dev_msi_enabled(to_pci_dev(dev->dev)))

		mei_clear_interrupts(dev);



	/* check if ME wants a reset */
@@ -854,7 +854,6 @@ struct mei_device *mei_me_dev_init(struct pci_dev *pdev, 


	mei_device_init(dev, &pdev->dev, &mei_me_hw_ops);

	dev->cfg  = cfg;

	dev->pdev = pdev;

	return dev;

}

drivers/misc/mei/hw-txe.c

+1 −2
Original line number Diff line number Diff line
@@ -998,7 +998,7 @@ irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id) 
	mutex_lock(&dev->device_lock);

	mei_io_list_init(&complete_list);



	if (pci_dev_msi_enabled(dev->pdev))

	if (pci_dev_msi_enabled(to_pci_dev(dev->dev)))

		mei_txe_check_and_ack_intrs(dev, true);



	/* show irq events */
@@ -1157,7 +1157,6 @@ struct mei_device *mei_txe_dev_init(struct pci_dev *pdev, 
	init_waitqueue_head(&hw->wait_aliveness_resp);



	dev->cfg  = cfg;

	dev->pdev = pdev;

	return dev;

}

drivers/misc/mei/mei_dev.h

+0 −2
Original line number Diff line number Diff line
@@ -401,7 +401,6 @@ struct mei_cfg { 
/**

 * struct mei_device -  MEI private device struct



 * @pdev - pointer to pci device struct

 * @dev  - device on a bus

 * @cdev - character device

 * @minor - minor number allocated for device
@@ -420,7 +419,6 @@ struct mei_cfg { 
 * @cfg - per device generation config and ops

 */

struct mei_device {

	struct pci_dev *pdev;	/* pointer to pci device struct */

	struct device *dev;

	struct cdev cdev;

	int minor;

drivers/misc/mei/pci-me.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static int mei_me_pm_runtime_resume(struct device *device) 
 */

static inline void mei_me_set_pm_domain(struct mei_device *dev)

{

	struct pci_dev *pdev  = dev->pdev;

	struct pci_dev *pdev  = to_pci_dev(dev->dev);



	if (pdev->dev.bus && pdev->dev.bus->pm) {

		dev->pg_domain.ops = *pdev->dev.bus->pm;

drivers/misc/mei/pci-txe.c

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static int mei_txe_pm_runtime_resume(struct device *device) 
 */

static inline void mei_txe_set_pm_domain(struct mei_device *dev)

{

	struct pci_dev *pdev  = dev->pdev;

	struct pci_dev *pdev  = to_pci_dev(dev->dev);



	if (pdev->dev.bus && pdev->dev.bus->pm) {

		dev->pg_domain.ops = *pdev->dev.bus->pm;