Skip to contentSkip to conversation

i2c: designware-platform: Drop duplicate module information

PATCH Applied Jean Delvare 3 participants 3 messages Feb 2, 2016 – Feb 12, 2016

Subsystems (3)
I2C subsystem host drivers Intel LPSS (Low Power SubSystem) drivers Synopsys DesignWare I2C driver
lore
Share & tools
lore

Jean Delvare

author
#0 lore raw

PATCH 1/1 i2c: designware-platform: Drop duplicate module information

The i2c-designware-platform module has duplicate module information when CONFIG_I2C_DESIGNWARE_BAYTRAIL is set. It gets the information from both i2c-designware-platdrv and i2c-designware-baytrail. The latter is optional extra code which ends up in the same module so it should not export module information.

Signed-off-by Jean Delvare <[email protected]>
Cc David E. Box <[email protected]>
Cc Mika Westerberg <[email protected]>
Cc Wolfram Sang <[email protected]>
---
 drivers/i2c/busses/i2c-designware-baytrail.c |    5 -----
 1 file changed, 5 deletions(-)
drivers/i2c/busses/i2c-designware-baytrail.c +0 -5
@@ -11,7 +11,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  */
-#include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/acpi.h>

@@ -151,7 +150,3 @@ int i2c_dw_eval_lock_support(struct dw_i
 
 	return 0;
 }
-
-MODULE_AUTHOR("David E. Box <[email protected]>");
-MODULE_DESCRIPTION("Baytrail I2C Semaphore driver");
-MODULE_LICENSE("GPL v2");
Signature · 2 lines
Jean Delvare
SUSE L3 Support
Acked-by on v1 1/1
#1 lore raw
Quoted 26 lines · Jean Delvare

The i2c-designware-platform module has duplicate module information when CONFIG_I2C_DESIGNWARE_BAYTRAIL is set. It gets the information from both i2c-designware-platdrv and i2c-designware-baytrail. The latter is optional extra code which ends up in the same module so it should not export module information.

Signed-off-by Jean Delvare <[email protected]>
Cc David E. Box <[email protected]>
Cc Mika Westerberg <[email protected]>
Cc Wolfram Sang <[email protected]>
---
  drivers/i2c/busses/i2c-designware-baytrail.c |    5 -----
  1 file changed, 5 deletions(-)
drivers/i2c/busses/i2c-designware-baytrail.c +0 -1
@@ -11,7 +11,6 @@
   * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
   * more details.
   */
-#include <linux/module.h>
  #include <linux/delay.h>
  #include <linux/device.h>
  #include <linux/acpi.h>

drivers/i2c/busses/i2c-designware-baytrail.c int i2c_dw_eval_lock_support(struct dw_i · line 157

Quoted 7 lines
drivers/i2c/busses/i2c-designware-baytrail.c +0 -4
@@ -151,7 +150,3 @@ int i2c_dw_eval_lock_support(struct dw_i
 
  	return 0;
  }
-
-MODULE_AUTHOR("David E. Box <[email protected]>");
-MODULE_DESCRIPTION("Baytrail I2C Semaphore driver");
-MODULE_LICENSE("GPL v2");
Acked-by Jarkko Nikula <[email protected]>
Applied
#2 lore raw
In reply to Jean Delvare
Quoted 10 lines · Jean Delvare

The i2c-designware-platform module has duplicate module information when CONFIG_I2C_DESIGNWARE_BAYTRAIL is set. It gets the information from both i2c-designware-platdrv and i2c-designware-baytrail. The latter is optional extra code which ends up in the same module so it should not export module information.

Signed-off-by Jean Delvare <[email protected]>
Cc David E. Box <[email protected]>
Cc Mika Westerberg <[email protected]>
Cc Wolfram Sang <[email protected]>

Applied to for-next, thanks!