OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mei: push all standard settings into mei_device_init 

Setting of hw_ops and device has should be in
mei_device_init.
We add reference to the parent device and remove
pci dependent cfg

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tomas Winkler 2014-09-29 16:31:41 +03:00 committed by Greg Kroah-Hartman
parent 2190fe2a3f
commit 3a7e9b6c66
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/misc/mei/hw-me.c
View File

@ -824,10 +824,8 @@ struct mei_device *mei_me_dev_init(struct pci_dev *pdev,
if (!dev) if (!dev)
return NULL; return NULL;
mei_device_init(dev, cfg); mei_device_init(dev, &pdev->dev, &mei_me_hw_ops);
dev->cfg = cfg;
dev->ops = &mei_me_hw_ops;
dev->pdev = pdev; dev->pdev = pdev;
return dev; return dev;
} }

5
drivers/misc/mei/hw-txe.c
View File

@ -1123,14 +1123,13 @@ struct mei_device *mei_txe_dev_init(struct pci_dev *pdev,
if (!dev) if (!dev)
return NULL; return NULL;
mei_device_init(dev, cfg); mei_device_init(dev, &pdev->dev, &mei_txe_hw_ops);
hw = to_txe_hw(dev); hw = to_txe_hw(dev);
init_waitqueue_head(&hw->wait_aliveness_resp); init_waitqueue_head(&hw->wait_aliveness_resp);
dev->ops = &mei_txe_hw_ops; dev->cfg = cfg;
dev->pdev = pdev; dev->pdev = pdev;
return dev; return dev;
} }

14
drivers/misc/mei/init.c
View File

@ -365,7 +365,16 @@ int mei_fw_status(struct mei_device *dev, struct mei_fw_status *fw_status)
} }
EXPORT_SYMBOL_GPL(mei_fw_status); EXPORT_SYMBOL_GPL(mei_fw_status);
void mei_device_init(struct mei_device *dev, const struct mei_cfg *cfg) /**
* mei_device_init -- initialize mei_device structure
*
* @dev: the mei device
* @device: the device structure
* @hw_ops: hw operations
*/
void mei_device_init(struct mei_device *dev,
struct device *device,
const struct mei_hw_ops *hw_ops)
{ {
/* setup our list array */ /* setup our list array */
INIT_LIST_HEAD(&dev->file_list); INIT_LIST_HEAD(&dev->file_list);
@ -404,7 +413,8 @@ void mei_device_init(struct mei_device *dev, const struct mei_cfg *cfg)
bitmap_set(dev->host_clients_map, 0, 1); bitmap_set(dev->host_clients_map, 0, 1);
dev->pg_event = MEI_PG_EVENT_IDLE; dev->pg_event = MEI_PG_EVENT_IDLE;
dev->cfg = cfg; dev->ops = hw_ops;
dev->dev = device;
} }
EXPORT_SYMBOL_GPL(mei_device_init); EXPORT_SYMBOL_GPL(mei_device_init);

6
drivers/misc/mei/mei_dev.h
View File

@ -399,6 +399,7 @@ struct mei_cfg {
* struct mei_device - MEI private device struct * struct mei_device - MEI private device struct
* @pdev - pointer to pci device struct * @pdev - pointer to pci device struct
* @dev - device on a bus
* @cdev - character device * @cdev - character device
* @minor - minor number allocated for device * @minor - minor number allocated for device
* *
@ -417,6 +418,7 @@ struct mei_cfg {
*/ */
struct mei_device { struct mei_device {
struct pci_dev *pdev; /* pointer to pci device struct */ struct pci_dev *pdev; /* pointer to pci device struct */
struct device *dev;
struct cdev cdev; struct cdev cdev;
int minor; int minor;
@ -560,7 +562,9 @@ static inline u32 mei_slots2data(int slots)
/* /*
* mei init function prototypes * mei init function prototypes
*/ */
void mei_device_init(struct mei_device *dev, const struct mei_cfg *cfg); void mei_device_init(struct mei_device *dev,
struct device *device,
const struct mei_hw_ops *hw_ops);
int mei_reset(struct mei_device *dev); int mei_reset(struct mei_device *dev);
int mei_start(struct mei_device *dev); int mei_start(struct mei_device *dev);
int mei_restart(struct mei_device *dev); int mei_restart(struct mei_device *dev);