Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mei: rename struct pci_dev *mei_device to mei_pdev 



1. rename mei_device variable to mei_pdev to remove
confusion with type 'struct mei_device'
2. mei_pdev no longer need to be gloabal so make it static
 and remove the declaration from the header file

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

drivers/misc/mei/main.c

+8 −9
Original line number Diff line number Diff line
@@ -41,9 +41,8 @@ 
#include <linux/mei.h>

#include "interface.h"



/* The device pointer */

/* Currently this driver works as long as there is only a single AMT device. */

struct pci_dev *mei_device;

/* AMT device is a singleton on the platform */

static struct pci_dev *mei_pdev;



/* mei_pci_tbl - PCI Device ID Table */

static DEFINE_PCI_DEVICE_TABLE(mei_pci_tbl) = {
@@ -218,10 +217,10 @@ static int mei_open(struct inode *inode, struct file *file) 
	int err;



	err = -ENODEV;

	if (!mei_device)

	if (!mei_pdev)

		goto out;



	dev = pci_get_drvdata(mei_device);

	dev = pci_get_drvdata(mei_pdev);

	if (!dev)

		goto out;
@@ -945,7 +944,7 @@ static int __devinit mei_probe(struct pci_dev *pdev, 
		goto end;

	}



	if (mei_device) {

	if (mei_pdev) {

		err = -EEXIST;

		goto end;

	}
@@ -1006,7 +1005,7 @@ static int __devinit mei_probe(struct pci_dev *pdev, 
	if (err)

		goto release_irq;



	mei_device = pdev;

	mei_pdev = pdev;

	pci_set_drvdata(pdev, dev);
@@ -1051,7 +1050,7 @@ static void __devexit mei_remove(struct pci_dev *pdev) 
{

	struct mei_device *dev;



	if (mei_device != pdev)

	if (mei_pdev != pdev)

		return;



	dev = pci_get_drvdata(pdev);
@@ -1064,7 +1063,7 @@ static void __devexit mei_remove(struct pci_dev *pdev) 


	mei_wd_stop(dev);



	mei_device = NULL;

	mei_pdev = NULL;



	if (dev->iamthif_cl.state == MEI_FILE_CONNECTED) {

		dev->iamthif_cl.state = MEI_FILE_DISCONNECTING;

drivers/misc/mei/mei_dev.h

+0 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ 


#define MEI_RD_MSG_BUF_SIZE           (128 * sizeof(u32))



/*

 * MEI PCI Device object

 */

extern struct pci_dev *mei_device;





/*

 * AMTHI Client UUID