Input: remove unneeded MODULE_VERSION usage

PATCH In review Greg Kroah-Hartman 2 participants 8 messages Nov 22, 2017 – Jan 17, 2018

Subsystems (3)

HID Input drivers ATI_REMOTE2 driver

lore

Share & tools

lore

Greg Kroah-Hartman

author

2017-11-22 17:49 UTC #0 lore raw

cover Input: remove unneeded MODULE_VERSION usage

Here's a short patch series against linux-next at the moment, that removes all of the MODULE_VERSION() usage in drivers/input/ as it's not needed at all.

Greg Kroah-Hartman (6):
Input: rmi4: remove unneeded MODULE_VERSION() usage
Input: keyboard: pmic8xxx: remove unneeded MODULE_VERSION() usage
Input: mouse: elan_i2c: remove unneeded MODULE_VERSION() usage
Input: touchscreen: remove unneeded MODULE_VERSION() usage
Input: misc: remove unneeded MODULE_VERSION() usage
Input: remove remaining unneeded MODULE_VERSION() usage

 drivers/input/input-polldev.c               | 1 -
 drivers/input/keyboard/pmic8xxx-keypad.c    | 1 -
 drivers/input/misc/apanel.c                 | 2 --
 drivers/input/misc/ati_remote2.c            | 2 --
 drivers/input/misc/uinput.c                 | 1 -
 drivers/input/mouse/elan_i2c_core.c         | 2 --
 drivers/input/rmi4/rmi_bus.c                | 1 -
 drivers/input/rmi4/rmi_driver.h             | 2 --
 drivers/input/rmi4/rmi_i2c.c                | 1 -
 drivers/input/rmi4/rmi_spi.c                | 1 -
 drivers/input/sparse-keymap.c               | 1 -
 drivers/input/touchscreen/colibri-vf50-ts.c | 2 --
 drivers/input/touchscreen/elants_i2c.c      | 2 --
 drivers/input/touchscreen/melfas_mip4.c     | 1 -
 drivers/input/touchscreen/wdt87xx_i2c.c     | 2 --
 15 files changed, 22 deletions(-)

Signature · 1 line

2.15.0

Greg Kroah-Hartman

author

2017-11-22 17:49 UTC #1 lore raw

PATCH 1/6 Input: rmi4: remove unneeded MODULE_VERSION() usage

MODULE_VERSION is useless for in-kernel drivers, so just remove all usage of it in the rmi4 drivers. Now that this is gone, the RMI_DRIVER_VERSION macro was also removed as it was pointless.

Cc Dmitry Torokhov <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 drivers/input/rmi4/rmi_bus.c    | 1 -
 drivers/input/rmi4/rmi_driver.h | 2 --
 drivers/input/rmi4/rmi_i2c.c    | 1 -
 drivers/input/rmi4/rmi_spi.c    | 1 -
 4 files changed, 5 deletions(-)

drivers/input/rmi4/rmi_bus.c +0 -1

index ae1bffe45c75..c5fa53adba8d 100644
@@ -427,4 +427,3 @@ MODULE_AUTHOR("Christopher Heiny <[email protected]");
 MODULE_AUTHOR("Andrew Duggan <[email protected]");
 MODULE_DESCRIPTION("RMI bus");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(RMI_DRIVER_VERSION);

drivers/input/rmi4/rmi_driver.h +0 -2

index f1a2a2266022..d31793ae83f0 100644
@@ -16,8 +16,6 @@
 #include <linux/input.h>
 #include "rmi_bus.h"
 
-#define RMI_DRIVER_VERSION "2.0"
-
 #define SYNAPTICS_INPUT_DEVICE_NAME "Synaptics RMI4 Touch Sensor"
 #define SYNAPTICS_VENDOR_ID 0x06cb

drivers/input/rmi4/rmi_i2c.c +0 -1

index e28663ef9e5a..d4b3f9d0dc2e 100644
@@ -391,4 +391,3 @@ MODULE_AUTHOR("Christopher Heiny <[email protected]>");
 MODULE_AUTHOR("Andrew Duggan <[email protected]>");
 MODULE_DESCRIPTION("RMI I2C driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(RMI_DRIVER_VERSION);

drivers/input/rmi4/rmi_spi.c +0 -1

index d97a85907ed6..76edbf2c1bce 100644
@@ -528,4 +528,3 @@ MODULE_AUTHOR("Christopher Heiny <[email protected]>");
 MODULE_AUTHOR("Andrew Duggan <[email protected]>");
 MODULE_DESCRIPTION("RMI SPI driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(RMI_DRIVER_VERSION);

Signature · 1 line

2.15.0

Greg Kroah-Hartman

author

2017-11-22 17:49 UTC #2 lore raw

PATCH 2/6 Input: keyboard: pmic8xxx: remove unneeded MODULE_VERSION() usage

In reply to Greg Kroah-Hartman

MODULE_VERSION is useless for in-kernel drivers, so remove the use of it in the pmic8xxx-keyboard driver.

Cc Dmitry Torokhov <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 drivers/input/keyboard/pmic8xxx-keypad.c | 1 -
 1 file changed, 1 deletion(-)

drivers/input/keyboard/pmic8xxx-keypad.c +0 -1

index 97c5424f49b9..98b24ed18752 100644
@@ -697,6 +697,5 @@ module_platform_driver(pmic8xxx_kp_driver);
 
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("PMIC8XXX keypad driver");
-MODULE_VERSION("1.0");
 MODULE_ALIAS("platform:pmic8xxx_keypad");
 MODULE_AUTHOR("Trilok Soni <[email protected]>");

Signature · 1 line

2.15.0

Greg Kroah-Hartman

author

2017-11-22 17:49 UTC #3 lore raw

PATCH 3/6 Input: mouse: elan_i2c: remove unneeded MODULE_VERSION() usage

In reply to Greg Kroah-Hartman

MODULE_VERSION is useless for in-kernel drivers, so just remove all usage of it in the elan_i2c mouse driver. Now that this is gone, the ELAN_DRIVER_VERSION define was also removed as it was pointless.

Cc Dmitry Torokhov <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 drivers/input/mouse/elan_i2c_core.c | 2 --
 1 file changed, 2 deletions(-)

drivers/input/mouse/elan_i2c_core.c +0 -2

index 2111a85d0b17..75e757520ef0 100644
@@ -42,7 +42,6 @@
 #include "elan_i2c.h"
 
 #define DRIVER_NAME		"elan_i2c"
-#define ELAN_DRIVER_VERSION	"1.6.3"
 #define ELAN_VENDOR_ID		0x04f3
 #define ETP_MAX_PRESSURE	255
 #define ETP_FWIDTH_REDUCE	90

@@ -1294,4 +1293,3 @@ module_i2c_driver(elan_driver);
 MODULE_AUTHOR("Duson Lin <[email protected]>");
 MODULE_DESCRIPTION("Elan I2C/SMBus Touchpad driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(ELAN_DRIVER_VERSION);

Signature · 1 line

2.15.0

Greg Kroah-Hartman

author

2017-11-22 17:49 UTC #4 lore raw

PATCH 4/6 Input: touchscreen: remove unneeded MODULE_VERSION() usage

In reply to Greg Kroah-Hartman

MODULE_VERSION is useless for in-kernel drivers, so just remove all usage of it in the touchscreen drivers. Along with this, some DRV_VERSION macros were removed as they are also pointless.

Cc Dmitry Torokhov <[email protected]>

Cc Sangwon Jee <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 drivers/input/touchscreen/colibri-vf50-ts.c | 2 --
 drivers/input/touchscreen/elants_i2c.c      | 2 --
 drivers/input/touchscreen/melfas_mip4.c     | 1 -
 drivers/input/touchscreen/wdt87xx_i2c.c     | 2 --
 4 files changed, 7 deletions(-)

drivers/input/touchscreen/colibri-vf50-ts.c +0 -2

index 69c08acae264..82ca5ab65cec 100644
@@ -28,7 +28,6 @@
 #include <linux/types.h>
 
 #define DRIVER_NAME			"colibri-vf50-ts"
-#define DRV_VERSION			"1.0"
 
 #define VF_ADC_MAX			((1 << 12) - 1)

@@ -382,4 +381,3 @@ module_platform_driver(vf50_touch_driver);
 MODULE_AUTHOR("Sanchayan Maity");
 MODULE_DESCRIPTION("Colibri VF50 Touchscreen driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);

drivers/input/touchscreen/elants_i2c.c +0 -2

index e102d7764bc2..a174b8c79ef5 100644
@@ -44,7 +44,6 @@
 
 /* Device, Driver information */
 #define DEVICE_NAME	"elants_i2c"
-#define DRV_VERSION	"1.0.9"
 
 /* Convert from rows or columns into resolution */
 #define ELAN_TS_RESOLUTION(n, m)   (((n) - 1) * (m))

@@ -1402,5 +1401,4 @@ module_i2c_driver(elants_i2c_driver);
 
 MODULE_AUTHOR("Scott Liu <[email protected]>");
 MODULE_DESCRIPTION("Elan I2c Touchscreen driver");
-MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL");

drivers/input/touchscreen/melfas_mip4.c +0 -1

index 6892f0e28918..430a2bc5f7ca 100644
@@ -1611,6 +1611,5 @@ static struct i2c_driver mip4_driver = {
 module_i2c_driver(mip4_driver);
 
 MODULE_DESCRIPTION("MELFAS MIP4 Touchscreen");
-MODULE_VERSION("2016.10.31");
 MODULE_AUTHOR("Sangwon Jee <[email protected]>");
 MODULE_LICENSE("GPL");

drivers/input/touchscreen/wdt87xx_i2c.c +0 -2

index d351efd18f89..20f7f3902757 100644
@@ -23,7 +23,6 @@
 #include <asm/unaligned.h>
 
 #define WDT87XX_NAME		"wdt87xx_i2c"
-#define WDT87XX_DRV_VER		"0.9.8"
 #define WDT87XX_FW_NAME		"wdt87xx_fw.bin"
 #define WDT87XX_CFG_NAME	"wdt87xx_cfg.bin"

@@ -1183,5 +1182,4 @@ module_i2c_driver(wdt87xx_driver);
 
 MODULE_AUTHOR("HN Chen <[email protected]>");
 MODULE_DESCRIPTION("WeidaHiTech WDT87XX Touchscreen driver");
-MODULE_VERSION(WDT87XX_DRV_VER);
 MODULE_LICENSE("GPL");

Signature · 1 line

2.15.0

Greg Kroah-Hartman

author

2017-11-22 17:49 UTC #5 lore raw

PATCH 5/6 Input: misc: remove unneeded MODULE_VERSION() usage

In reply to Greg Kroah-Hartman

MODULE_VERSION is useless for in-kernel drivers, so just remove all usage of it in the misc input drivers. Along with this, some DRIVER_VERSION macros were removed as they are also pointless.

Cc Dmitry Torokhov <[email protected]>

Cc Ville Syrjala <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 drivers/input/misc/apanel.c      | 2 --
 drivers/input/misc/ati_remote2.c | 2 --
 drivers/input/misc/uinput.c      | 1 -
 3 files changed, 5 deletions(-)

drivers/input/misc/apanel.c +0 -2

index aad1df04c854..094bddf56755 100644
@@ -26,7 +26,6 @@
 #include <linux/leds.h>
 
 #define APANEL_NAME	"Fujitsu Application Panel"
-#define APANEL_VERSION	"1.3.1"
 #define APANEL		"apanel"
 
 /* How often we poll keys - msecs */

@@ -345,7 +344,6 @@ module_exit(apanel_cleanup);
 MODULE_AUTHOR("Stephen Hemminger <[email protected]>");
 MODULE_DESCRIPTION(APANEL_NAME " driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(APANEL_VERSION);
 
 MODULE_ALIAS("dmi:*:svnFUJITSU:pnLifeBook*:pvr*:rvnFUJITSU:*");
 MODULE_ALIAS("dmi:*:svnFUJITSU:pnLifebook*:pvr*:rvnFUJITSU:*");

drivers/input/misc/ati_remote2.c +0 -2

index ebf4448b31b9..ded5b84e336d 100644
@@ -14,10 +14,8 @@
 #include <linux/module.h>
 
 #define DRIVER_DESC    "ATI/Philips USB RF remote driver"
-#define DRIVER_VERSION "0.3"
 
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_VERSION(DRIVER_VERSION);
 MODULE_AUTHOR("Ville Syrjala <[email protected]>");
 MODULE_LICENSE("GPL");

drivers/input/misc/uinput.c +0 -1

index 39ddd9a73feb..91586193115f 100644
@@ -1085,4 +1085,3 @@ MODULE_ALIAS("devname:" UINPUT_NAME);
 MODULE_AUTHOR("Aristeu Sergio Rozanski Filho");
 MODULE_DESCRIPTION("User level driver support for input subsystem");
 MODULE_LICENSE("GPL");
-MODULE_VERSION("0.3");

Signature · 1 line

2.15.0

Greg Kroah-Hartman

author

2017-11-22 17:49 UTC #6 lore raw

PATCH 6/6 Input: remove remaining unneeded MODULE_VERSION() usage

In reply to Greg Kroah-Hartman

MODULE_VERSION is useless for in-kernel drivers, so just remove all usage of it in the remaining few input drivers that still used it (input-polldev and sparse-keymap).

Cc Dmitry Torokhov <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 drivers/input/input-polldev.c | 1 -
 drivers/input/sparse-keymap.c | 1 -
 2 files changed, 2 deletions(-)

drivers/input/input-polldev.c +0 -1

index 3664f81655ca..78df5a74822e 100644
@@ -20,7 +20,6 @@
 MODULE_AUTHOR("Dmitry Torokhov <[email protected]>");
 MODULE_DESCRIPTION("Generic implementation of a polled input device");
 MODULE_LICENSE("GPL v2");
-MODULE_VERSION("0.1");
 
 static void input_polldev_queue_work(struct input_polled_dev *dev)
 {

drivers/input/sparse-keymap.c +0 -1

index fd03e55768c9..0cad5e7c559b 100644
@@ -21,7 +21,6 @@
 MODULE_AUTHOR("Dmitry Torokhov <[email protected]>");
 MODULE_DESCRIPTION("Generic support for sparse keymaps");
 MODULE_LICENSE("GPL v2");
-MODULE_VERSION("0.1");
 
 static unsigned int sparse_keymap_get_key_index(struct input_dev *dev,
 						const struct key_entry *k)

Signature · 1 line

2.15.0

Dmitry Torokhov

maintainer

2018-01-17 00:45 UTC #7 lore raw

In reply to Greg Kroah-Hartman

Quoted 11 lines · Greg Kroah-Hartman

Here's a short patch series against linux-next at the moment, that removes all of the MODULE_VERSION() usage in drivers/input/ as it's not needed at all.
Greg Kroah-Hartman (6):
Input: rmi4: remove unneeded MODULE_VERSION() usage
Input: keyboard: pmic8xxx: remove unneeded MODULE_VERSION() usage
Input: mouse: elan_i2c: remove unneeded MODULE_VERSION() usage
Input: touchscreen: remove unneeded MODULE_VERSION() usage
Input: misc: remove unneeded MODULE_VERSION() usage
Input: remove remaining unneeded MODULE_VERSION() usage

Applied the lot, thank you Greg.

Quoted 21 lines

 drivers/input/input-polldev.c               | 1 -
 drivers/input/keyboard/pmic8xxx-keypad.c    | 1 -
 drivers/input/misc/apanel.c                 | 2 --
 drivers/input/misc/ati_remote2.c            | 2 --
 drivers/input/misc/uinput.c                 | 1 -
 drivers/input/mouse/elan_i2c_core.c         | 2 --
 drivers/input/rmi4/rmi_bus.c                | 1 -
 drivers/input/rmi4/rmi_driver.h             | 2 --
 drivers/input/rmi4/rmi_i2c.c                | 1 -
 drivers/input/rmi4/rmi_spi.c                | 1 -
 drivers/input/sparse-keymap.c               | 1 -
 drivers/input/touchscreen/colibri-vf50-ts.c | 2 --
 drivers/input/touchscreen/elants_i2c.c      | 2 --
 drivers/input/touchscreen/melfas_mip4.c     | 1 -
 drivers/input/touchscreen/wdt87xx_i2c.c     | 2 --
 15 files changed, 22 deletions(-)

Signature · 1 line

2.15.0

Signature · 1 line

Dmitry