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

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

staging: mei: remove driver internal versioning 



There is no need for internal module versioning for in-kernel driver:
remove mei_version.h

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

drivers/staging/mei/iorw.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include "hw.h"

#include "hw.h"

#include "mei.h"

#include "mei.h"

#include "interface.h"

#include "interface.h"

#include "mei_version.h"

drivers/staging/mei/main.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include "mei_dev.h"

#include "mei_dev.h"

#include "mei.h"

#include "mei.h"

#include "interface.h"

#include "interface.h"

#include "mei_version.h"









#define MEI_READ_TIMEOUT 45

#define MEI_READ_TIMEOUT 45
@@ -50,7 +49,6 @@ 
 */

 */

static char mei_driver_name[] = MEI_DRIVER_NAME;

static char mei_driver_name[] = MEI_DRIVER_NAME;

static const char mei_driver_string[] = "Intel(R) Management Engine Interface";

static const char mei_driver_string[] = "Intel(R) Management Engine Interface";

static const char mei_driver_version[] = MEI_DRIVER_VERSION;





/* The device pointer */

/* The device pointer */

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

/* Currently this driver works as long as there is only a single AMT device. */
@@ -1206,8 +1204,7 @@ static int __init mei_init_module(void) 
{

{

	int ret;

	int ret;





	pr_debug("mei: %s - version %s\n",

	pr_debug("mei: %s\n", mei_driver_string);

		mei_driver_string, mei_driver_version);

	/* init pci module */

	/* init pci module */

	ret = pci_register_driver(&mei_driver);

	ret = pci_register_driver(&mei_driver);

	if (ret < 0)

	if (ret < 0)
@@ -1238,4 +1235,3 @@ module_exit(mei_exit_module); 
MODULE_AUTHOR("Intel Corporation");

MODULE_AUTHOR("Intel Corporation");

MODULE_DESCRIPTION("Intel(R) Management Engine Interface");

MODULE_DESCRIPTION("Intel(R) Management Engine Interface");

MODULE_LICENSE("GPL v2");
 
MODULE_LICENSE("GPL v2");
 
MODULE_VERSION(MEI_DRIVER_VERSION);

drivers/staging/mei/mei_version.h

deleted100644 → 0
+0 −31
Original line number Original line Diff line number Diff line 
/*

 *

 * Intel Management Engine Interface (Intel MEI) Linux driver

 * Copyright (c) 2003-2012, Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 */





#ifndef MEI_VERSION_H

#define MEI_VERSION_H



#define MAJOR_VERSION		7

#define MINOR_VERSION		1

#define QUICK_FIX_NUMBER	20

#define VER_BUILD		1



#define MEI_DRV_VER1 __stringify(MAJOR_VERSION) "." __stringify(MINOR_VERSION)

#define MEI_DRV_VER2 __stringify(QUICK_FIX_NUMBER) "." __stringify(VER_BUILD)



#define MEI_DRIVER_VERSION	MEI_DRV_VER1 "." MEI_DRV_VER2



#endif