summaryrefslogtreecommitdiff
path: root/drivers/staging/mei
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2012-04-02 17:32:39 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-10 16:37:52 (GMT)
commitc38ea24e22e8c416d4a2b13355a546b5916ae296 (patch)
tree68427b7498eb6e219300cc7c5b1ad8d1cc0cebf1 /drivers/staging/mei
parent68d923d5369e7e8f72dbc75015829b7fc83512fc (diff)
downloadlinux-fsl-qoriq-c38ea24e22e8c416d4a2b13355a546b5916ae296.tar.xz
staging/mei: cleanup driver naming strings
1. use only mei_driver_name and remove define MEI_DRIVER_NAME 2. drop MEI_DEV_NAME and assign device name directly 3. drop mei_driver_string, it is not used Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/mei')
-rw-r--r--drivers/staging/mei/main.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/staging/mei/main.c b/drivers/staging/mei/main.c
index 5e91010..20f80df 100644
--- a/drivers/staging/mei/main.c
+++ b/drivers/staging/mei/main.c
@@ -41,15 +41,7 @@
#include "mei.h"
#include "interface.h"
-
-#define MEI_DRIVER_NAME "mei"
-#define MEI_DEV_NAME "mei"
-
-/*
- * mei driver strings
- */
-static char mei_driver_name[] = MEI_DRIVER_NAME;
-static const char mei_driver_string[] = "Intel(R) Management Engine Interface";
+static const char mei_driver_name[] = "mei";
/* The device pointer */
/* Currently this driver works as long as there is only a single AMT device. */
@@ -932,7 +924,7 @@ static const struct file_operations mei_fops = {
* Misc Device Struct
*/
static struct miscdevice mei_misc_device = {
- .name = MEI_DRIVER_NAME,
+ .name = "mei",
.fops = &mei_fops,
.minor = MISC_DYNAMIC_MINOR,
};