[PATCH] power: Remove unnecessary MODULE_ALIAS() for I2C drivers

[PATCH] power: Remove unnecessary MODULE_ALIAS() for I2C drivers

[Javier Martinez Canillas]

These drivers already have an I2C device id table that is used to create
module aliases and the used MODULE_ALIAS() was either already in the I2C
table so it was redundant or wasn't a valid I2C id so it was never used.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

---

 drivers/power/bq24190_charger.c | 1 -
 drivers/power/bq27x00_battery.c | 4 ----
 drivers/power/pm2301_charger.c  | 1 -
 drivers/power/rt9455_charger.c  | 1 -
 drivers/power/smb347-charger.c  | 1 -
 5 files changed, 8 deletions(-)

diff --git a/drivers/power/bq24190_charger.c b/drivers/power/bq24190_charger.c
index 469a452cbe10..f5746b9f4e83 100644
--- a/drivers/power/bq24190_charger.c
+++ b/drivers/power/bq24190_charger.c
@@ -1543,5 +1543,4 @@ module_i2c_driver(bq24190_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Mark A. Greer <mgreer@animalcreek.com>");
-MODULE_ALIAS("i2c:bq24190-charger");
 MODULE_DESCRIPTION("TI BQ24190 Charger Driver");
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 8287261fd978..d0b2f3b47b8f 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -1120,10 +1120,6 @@ module_exit(bq27x00_battery_exit);
 MODULE_ALIAS("platform:bq27000-battery");
 #endif
 
-#ifdef CONFIG_BATTERY_BQ27X00_I2C
-MODULE_ALIAS("i2c:bq27000-battery");
-#endif
-
 MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
 MODULE_DESCRIPTION("BQ27x00 battery monitor driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c
index 3a45cc0c4dce..8f9bd1d0eeb6 100644
--- a/drivers/power/pm2301_charger.c
+++ b/drivers/power/pm2301_charger.c
@@ -1264,5 +1264,4 @@ module_exit(pm2xxx_charger_exit);
 
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Rajkumar kasirajan, Olivier Launay");
-MODULE_ALIAS("i2c:pm2xxx-charger");
 MODULE_DESCRIPTION("PM2xxx charger management driver");
diff --git a/drivers/power/rt9455_charger.c b/drivers/power/rt9455_charger.c
index a49a9d44bdda..cfdbde9daf94 100644
--- a/drivers/power/rt9455_charger.c
+++ b/drivers/power/rt9455_charger.c
@@ -1760,5 +1760,4 @@ module_i2c_driver(rt9455_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Anda-Maria Nicolae <anda-maria.nicolae@intel.com>");
-MODULE_ALIAS("i2c:rt9455-charger");
 MODULE_DESCRIPTION("Richtek RT9455 Charger Driver");
diff --git a/drivers/power/smb347-charger.c b/drivers/power/smb347-charger.c
index 0b60a0b5878b..072c5189bd6d 100644
--- a/drivers/power/smb347-charger.c
+++ b/drivers/power/smb347-charger.c
@@ -1332,4 +1332,3 @@ MODULE_AUTHOR("Bruce E. Robertson <bruce.e.robertson@intel.com>");
 MODULE_AUTHOR("Mika Westerberg <mika.westerberg@linux.intel.com>");
 MODULE_DESCRIPTION("SMB347 battery charger driver");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("i2c:smb347");
-- 
2.4.3

Re: [PATCH] power: Remove unnecessary MODULE_ALIAS() for I2C drivers

[Javier Martinez Canillas]

[adding cc list again]

Hello Pali,

On 08/31/2015 09:17 AM, Pali Rohár wrote:
> On Monday 31 August 2015 01:18:35 Javier Martinez Canillas wrote:
>> These drivers already have an I2C device id table that is used to create
>> module aliases and the used MODULE_ALIAS() was either already in the I2C
>> table so it was redundant or wasn't a valid I2C id so it was never used.
>>
>> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
>>
>> ---
>>
>> diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
>> index 8287261fd978..d0b2f3b47b8f 100644
>> --- a/drivers/power/bq27x00_battery.c
>> +++ b/drivers/power/bq27x00_battery.c
>> @@ -1120,10 +1120,6 @@ module_exit(bq27x00_battery_exit);
>>  MODULE_ALIAS("platform:bq27000-battery");
>>  #endif
>>  
>> -#ifdef CONFIG_BATTERY_BQ27X00_I2C
>> -MODULE_ALIAS("i2c:bq27000-battery");
>> -#endif
>> -
>>  MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
>>  MODULE_DESCRIPTION("BQ27x00 battery monitor driver");
>>  MODULE_LICENSE("GPL");
> 
> Hi! This part of patch is already in queue list. So then your patch will
> conflict with other pending patches...
>

Sorry, with which patch it will conflict? It applies cleanly on top of
the power supply git tree next branch:

https://git.kernel.org/cgit/linux/kernel/git/sre/linux-power-supply.git/log/?h=next

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America

Re: [PATCH] power: Remove unnecessary MODULE_ALIAS() for I2C drivers

[Pali Rohár]

On Monday 31 August 2015 10:17:11 Javier Martinez Canillas wrote:
> [adding cc list again]
> 
> Hello Pali,
> 
> On 08/31/2015 09:17 AM, Pali Rohár wrote:
> > On Monday 31 August 2015 01:18:35 Javier Martinez Canillas wrote:
> >> These drivers already have an I2C device id table that is used to create
> >> module aliases and the used MODULE_ALIAS() was either already in the I2C
> >> table so it was redundant or wasn't a valid I2C id so it was never used.
> >>
> >> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
> >>
> >> ---
> >>
> >> diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
> >> index 8287261fd978..d0b2f3b47b8f 100644
> >> --- a/drivers/power/bq27x00_battery.c
> >> +++ b/drivers/power/bq27x00_battery.c
> >> @@ -1120,10 +1120,6 @@ module_exit(bq27x00_battery_exit);
> >>  MODULE_ALIAS("platform:bq27000-battery");
> >>  #endif
> >>  
> >> -#ifdef CONFIG_BATTERY_BQ27X00_I2C
> >> -MODULE_ALIAS("i2c:bq27000-battery");
> >> -#endif
> >> -
> >>  MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
> >>  MODULE_DESCRIPTION("BQ27x00 battery monitor driver");
> >>  MODULE_LICENSE("GPL");
> > 
> > Hi! This part of patch is already in queue list. So then your patch will
> > conflict with other pending patches...
> >
> 
> Sorry, with which patch it will conflict? It applies cleanly on top of
> the power supply git tree next branch:
> 
> https://git.kernel.org/cgit/linux/kernel/git/sre/linux-power-supply.git/log/?h=next
> 
> Best regards,

There are bq27x00 patches waiting on mailing list...

v1: https://lkml.org/lkml/2015/7/22/705
v2: https://lkml.org/lkml/2015/7/28/929
v3: https://lkml.org/lkml/2015/8/5/597

Your patch will conflict with this (v2) patch:
https://lkml.org/lkml/2015/7/28/923

Some of v1 patches are already merged into tree, some v2 are Acked by
me, but not merged yet... Probably Sebastian (maintainer) did not have
time to review all patches yet.

-- 
Pali Rohár
pali.rohar@gmail.com

Re: [PATCH] power: Remove unnecessary MODULE_ALIAS() for I2C drivers

[Javier Martinez Canillas]

Hello Pali,

On 08/31/2015 10:35 AM, Pali Rohár wrote:
> On Monday 31 August 2015 10:17:11 Javier Martinez Canillas wrote:
>> [adding cc list again]
>>
>> Hello Pali,
>>
>> On 08/31/2015 09:17 AM, Pali Rohár wrote:
>>> On Monday 31 August 2015 01:18:35 Javier Martinez Canillas wrote:
>>>> These drivers already have an I2C device id table that is used to create
>>>> module aliases and the used MODULE_ALIAS() was either already in the I2C
>>>> table so it was redundant or wasn't a valid I2C id so it was never used.
>>>>
>>>> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
>>>>
>>>> ---
>>>>
>>>> diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
>>>> index 8287261fd978..d0b2f3b47b8f 100644
>>>> --- a/drivers/power/bq27x00_battery.c
>>>> +++ b/drivers/power/bq27x00_battery.c
>>>> @@ -1120,10 +1120,6 @@ module_exit(bq27x00_battery_exit);
>>>>  MODULE_ALIAS("platform:bq27000-battery");
>>>>  #endif
>>>>  
>>>> -#ifdef CONFIG_BATTERY_BQ27X00_I2C
>>>> -MODULE_ALIAS("i2c:bq27000-battery");
>>>> -#endif
>>>> -
>>>>  MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
>>>>  MODULE_DESCRIPTION("BQ27x00 battery monitor driver");
>>>>  MODULE_LICENSE("GPL");
>>>
>>> Hi! This part of patch is already in queue list. So then your patch will
>>> conflict with other pending patches...
>>>
>>
>> Sorry, with which patch it will conflict? It applies cleanly on top of
>> the power supply git tree next branch:
>>
>> https://git.kernel.org/cgit/linux/kernel/git/sre/linux-power-supply.git/log/?h=next
>>
>> Best regards,
> 
> There are bq27x00 patches waiting on mailing list...
> 
> v1: https://lkml.org/lkml/2015/7/22/705
> v2: https://lkml.org/lkml/2015/7/28/929
> v3: https://lkml.org/lkml/2015/8/5/597
> 

Thanks for the pointer, I didn't see those patches before.

> Your patch will conflict with this (v2) patch:
> https://lkml.org/lkml/2015/7/28/923
>

Great, in fact that's exactly the same patch.
So this one patch can be discarded indeed.
 
> Some of v1 patches are already merged into tree, some v2 are Acked by
> me, but not merged yet... Probably Sebastian (maintainer) did not have
> time to review all patches yet.
>

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America