Skip to contentSkip to conversation

Input: cap11xx - fix module alias

PATCH In review Axel Lin 3 participants 4 messages Jan 30, 2015

Subsystems (2)
HID Input drivers
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 Input: cap11xx - fix module alias

This is a I2C driver, so use i2c prefix for the module alias.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/input/keyboard/cap11xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/keyboard/cap11xx.c +1 -1
index 4f59f0b..938f0d5 100644
@@ -370,7 +370,7 @@ static struct i2c_driver cap11xx_i2c_driver = {
 
 module_i2c_driver(cap11xx_i2c_driver);
 
-MODULE_ALIAS("platform:cap11xx");
+MODULE_ALIAS("i2c:cap11xx");
 MODULE_DESCRIPTION("Microchip CAP11XX driver");
 MODULE_AUTHOR("Daniel Mack <[email protected]>");
 MODULE_LICENSE("GPL v2");
Signature · 1 line
1.9.1
#1 lore raw
Signed-off-by Matt Ranostay <[email protected]>
Quoted 25 lines · Axel Lin

This is a I2C driver, so use i2c prefix for the module alias.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/input/keyboard/cap11xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/input/keyboard/cap11xx.c +1 -2
index 4f59f0b..938f0d5 100644
@@ -370,7 +370,7 @@ static struct i2c_driver cap11xx_i2c_driver = {
 
 module_i2c_driver(cap11xx_i2c_driver);
 
-MODULE_ALIAS("platform:cap11xx");
+MODULE_ALIAS("i2c:cap11xx");
 MODULE_DESCRIPTION("Microchip CAP11XX driver");
 MODULE_AUTHOR("Daniel Mack <[email protected]>");
 MODULE_LICENSE("GPL v2");
--

1.9.1

maintainer
#2 lore raw

Hi,

Quoted 1 line · Matt Ranostay
Signed-off-by Matt Ranostay <[email protected]>

Why signed off? Were you involved in writing this code? Reviewed-by or Acked- by are more appropriate here I think.

Quoted 16 lines · Axel Lin
Quoted 14 lines

This is a I2C driver, so use i2c prefix for the module alias.

Signed-off-by Axel Lin <[email protected]>

---

 drivers/input/keyboard/cap11xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/input/keyboard/cap11xx.c index 4f59f0b..938f0d5 100644

drivers/input/keyboard/cap11xx.c +0 -0
@@ -370,7 +370,7 @@ static struct i2c_driver cap11xx_i2c_driver = {
Quoted 3 lines

drivers/input/keyboard/cap11xx.c static struct i2c_driver cap11xx_i2c_driver = { · line 373

Quoted 3 lines
drivers/input/keyboard/cap11xx.c +0 -1
 module_i2c_driver(cap11xx_i2c_driver);
 
-MODULE_ALIAS("platform:cap11xx");

This is clearly incorrect.

Quoted 1 line

drivers/input/keyboard/cap11xx.c static struct i2c_driver cap11xx_i2c_driver = { · line 373

Quoted 1 line
drivers/input/keyboard/cap11xx.c +1 -0
+MODULE_ALIAS("i2c:cap11xx");

However I do not see what this gives us. I see:

dtor@dtor-ws:~/kernel/work$ modinfo drivers/input/keyboard/cap11xx.ko 
filename:       
/usr/local/google/home/dtor/kernel/work/drivers/input/keyboard/cap11xx.ko
license:        GPL v2
author:         Daniel Mack <[email protected]>
description:    Microchip CAP11XX driver
alias:          platform:cap11xx
alias:          of:N*T*Cmicrochip,cap1188*
alias:          of:N*T*Cmicrochip,cap1126*
alias:          of:N*T*Cmicrochip,cap1106*
alias:          i2c:cap1188
alias:          i2c:cap1126
alias:          i2c:cap1106
depends:        i2c-core,regmap-i2c
intree:         Y
vermagic:       3.19.0-rc6+ SMP preempt mod_unload

So it looks like we have all needed i2c aliases coming form MODULE_DEVICE_TABLE.

Quoted 7 lines
Quoted 7 lines
drivers/input/keyboard/cap11xx.c +0 -1
 MODULE_DESCRIPTION("Microchip CAP11XX driver");
 MODULE_AUTHOR("Daniel Mack <[email protected]>");
 MODULE_LICENSE("GPL v2");
 
--

1.9.1

Thanks.

Signature · 1 line
Dmitry
Reviewed-by
#3 lore raw

Oops sorry been awhile since I have been CC'ed on patchsets upstream. Forgot the etiquette on this :/. Fixed

Reviewed-by Matt Ranostay <[email protected]>
Quoted 66 lines · Dmitry Torokhov

Hi,

Quoted 1 line · Matt Ranostay
Signed-off-by Matt Ranostay <[email protected]>

Why signed off? Were you involved in writing this code? Reviewed-by or Acked- by are more appropriate here I think.

Quoted 16 lines · Axel Lin
Quoted 14 lines

This is a I2C driver, so use i2c prefix for the module alias.

Signed-off-by Axel Lin <[email protected]>

---

 drivers/input/keyboard/cap11xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/input/keyboard/cap11xx.c index 4f59f0b..938f0d5 100644

drivers/input/keyboard/cap11xx.c +0 -0
@@ -370,7 +370,7 @@ static struct i2c_driver cap11xx_i2c_driver = {
Quoted 3 lines

drivers/input/keyboard/cap11xx.c static struct i2c_driver cap11xx_i2c_driver = { · line 373

Quoted 3 lines
drivers/input/keyboard/cap11xx.c +0 -1
 module_i2c_driver(cap11xx_i2c_driver);
 
-MODULE_ALIAS("platform:cap11xx");

This is clearly incorrect.

Quoted 1 line

drivers/input/keyboard/cap11xx.c static struct i2c_driver cap11xx_i2c_driver = { · line 373

Quoted 1 line
drivers/input/keyboard/cap11xx.c +1 -0
+MODULE_ALIAS("i2c:cap11xx");

However I do not see what this gives us. I see:

dtor@dtor-ws:~/kernel/work$ modinfo drivers/input/keyboard/cap11xx.ko
filename:
/usr/local/google/home/dtor/kernel/work/drivers/input/keyboard/cap11xx.ko
license:        GPL v2
author:         Daniel Mack <[email protected]>
description:    Microchip CAP11XX driver
alias:          platform:cap11xx
alias:          of:N*T*Cmicrochip,cap1188*
alias:          of:N*T*Cmicrochip,cap1126*
alias:          of:N*T*Cmicrochip,cap1106*
alias:          i2c:cap1188
alias:          i2c:cap1126
alias:          i2c:cap1106
depends:        i2c-core,regmap-i2c
intree:         Y
vermagic:       3.19.0-rc6+ SMP preempt mod_unload

So it looks like we have all needed i2c aliases coming form MODULE_DEVICE_TABLE.

Quoted 7 lines
Quoted 7 lines
drivers/input/keyboard/cap11xx.c +0 -1
 MODULE_DESCRIPTION("Microchip CAP11XX driver");
 MODULE_AUTHOR("Daniel Mack <[email protected]>");
 MODULE_LICENSE("GPL v2");
 
--

1.9.1

Thanks.

--
Dmitry