From 8d5e7728bbf36e9716ea377c27526719505c39bf Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Fri, 17 Aug 2012 09:54:23 +0300
Subject: [PATCH] --- yaml --- r: 324335 b: refs/heads/master c:
 daed6b5e78c11f34f08cc2bc1640b7f248884cee h: refs/heads/master i:   324333:
 390f3fbc8080c28f068f3e54da830f34ec9b5015   324331:
 dacb62f32e1c4b05a12353da1594668ad7f0f7f8   324327:
 d139b4b78722661a0b9d7bee58a4a12a751a832d   324319:
 6190633bb7e59e588daae7ef23b0c0d2ade13508 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/misc/mei/main.c    | 17 ++++++++---------
 trunk/drivers/misc/mei/mei_dev.h |  5 -----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index b071d4df2f55..9a59202cec81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efda0ad4aa92439d9244d77a13339e23df5e1dc1
+refs/heads/master: daed6b5e78c11f34f08cc2bc1640b7f248884cee
diff --git a/trunk/drivers/misc/mei/main.c b/trunk/drivers/misc/mei/main.c
index 9a595338ae15..d6fe278347fc 100644
--- a/trunk/drivers/misc/mei/main.c
+++ b/trunk/drivers/misc/mei/main.c
@@ -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;
diff --git a/trunk/drivers/misc/mei/mei_dev.h b/trunk/drivers/misc/mei/mei_dev.h
index c8660c0eb1c7..ad6c9d5af1e9 100644
--- a/trunk/drivers/misc/mei/mei_dev.h
+++ b/trunk/drivers/misc/mei/mei_dev.h
@@ -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