From c38ea24e22e8c416d4a2b13355a546b5916ae296 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Mon, 2 Apr 2012 20:32:39 +0300 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/mei/main.c | 12 ++---------- 1 file 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, }; -- 2.7.4