lkml.org 
[lkml]   [2012]   [Aug]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[char-misc-next] mei: rename struct pci_dev *mei_device to mei_pdev
Date
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: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/mei/main.c | 17 ++++++++---------
drivers/misc/mei/mei_dev.h | 5 -----
2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index d792f3c..e477e6f 100644
--- a/drivers/misc/mei/main.c
+++ b/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;

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

- if (mei_device) {
+ if (mei_pdev) {
err = -EEXIST;
goto end;
}
@@ -1007,7 +1006,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);


@@ -1052,7 +1051,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);
@@ -1065,7 +1064,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/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index c8660c0..ad6c9d5 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/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
--
1.7.4.4


\
 
 \ /
  Last update: 2012-08-17 09:21    [W:0.022 / U:0.688 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site