[platform-modules]: fix compile issues for platform driver under 4.19

1. undefine led_classdev_register as it is defined in leds.h 2. header file location change a. linux/i2c/pmbus.h -> linux/pmbus.h b. linux/i2c-mux-gpio.h -> linux/platform_data/i2c-mux-gpio.h c. linux/i2c/pca954x.h -> linux/platform_data/pca954x.h
2020-02-03 01:01:10 +00:00 · 2020-02-03 01:01:10 +00:00 · 207e32a9f2
commit 207e32a9f2
parent 7f7212d8a8
45 changed files with 47 additions and 58 deletions
--- a/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/modules/x86-64-accton-as4630-54pe-cpld.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as4630-54pe/modules/x86-64-accton-as4630-54pe-cpld.c
@ -36,6 +36,7 @@
 #include <linux/delay.h>
 #include <linux/jiffies.h>
 #include <linux/kernel.h>
+#include <linux/fs.h>
 #include <asm/uaccess.h>


--- a/platform/broadcom/sonic-platform-modules-accton/as5712-54x/modules/leds-accton_as5712_54x.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as5712-54x/modules/leds-accton_as5712_54x.c
@ -34,7 +34,6 @@ extern int as5712_54x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as5712_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as5812-54x/modules/leds-accton_as5812_54x.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as5812-54x/modules/leds-accton_as5812_54x.c
@ -34,7 +34,6 @@ extern int as5812_54x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as5812_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as6712-32x/modules/leds-accton_as6712_32x.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as6712-32x/modules/leds-accton_as6712_32x.c
@ -33,7 +33,6 @@ extern int as6712_32x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as6712_32x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7312-54x/modules/accton_as7312_54x_leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7312-54x/modules/accton_as7312_54x_leds.c
@ -34,7 +34,6 @@ extern int as7312_54x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as7312_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7312-54xs/modules/accton_as7312_54x_leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7312-54xs/modules/accton_as7312_54x_leds.c
@ -34,7 +34,6 @@ extern int as7312_54x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as7312_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7326-56x/modules/accton_as7326_56x_leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7326-56x/modules/accton_as7326_56x_leds.c
@ -34,7 +34,6 @@ extern int as7326_56x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as7326_56x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7712-32x/modules/leds-accton_as7712_32x.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7712-32x/modules/leds-accton_as7712_32x.c
@ -34,7 +34,6 @@ extern int accton_i2c_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int accton_i2c_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7716-32x/modules/accton_as7716_32x_leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7716-32x/modules/accton_as7716_32x_leds.c
@ -34,7 +34,6 @@ extern int as7716_32x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as7716_32x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7716-32xb/modules/accton_as7716_32xb_leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7716-32xb/modules/accton_as7716_32xb_leds.c
@ -31,7 +31,6 @@
 #include <linux/dmi.h>

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7726-32x/modules/accton_as7726_32x_leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7726-32x/modules/accton_as7726_32x_leds.c
@ -34,7 +34,6 @@ extern int as7726_32x_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int as7726_32x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/as7816-64x/modules/x86-64-accton-as7816-64x-leds.c
+++ b/platform/broadcom/sonic-platform-modules-accton/as7816-64x/modules/x86-64-accton-as7816-64x-leds.c
@ -34,7 +34,6 @@ extern int accton_i2c_cpld_read (u8 cpld_addr, u8 reg);
 extern int accton_i2c_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-accton/common/modules/accton_pmbus_3y.c
+++ b/platform/broadcom/sonic-platform-modules-accton/common/modules/accton_pmbus_3y.c
@ -31,7 +31,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/jiffies.h>
-#include <linux/i2c/pmbus.h>
+#include <linux/pmbus.h>
 #include "pmbus.h"


--- a/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/dps200.c
+++ b/platform/broadcom/sonic-platform-modules-cel/haliburton/modules/dps200.c
@ -26,7 +26,7 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pmbus.h>
+#include <linux/pmbus.h>
 #include "pmbus.h"


--- a/platform/broadcom/sonic-platform-modules-dell/s6000/modules/dell_s6000_platform.c
+++ b/platform/broadcom/sonic-platform-modules-dell/s6000/modules/dell_s6000_platform.c
@ -5,7 +5,7 @@
 #include <linux/stat.h>
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/platform_device.h>
 #include <linux/i2c/sff-8436.h>
 #include <linux/delay.h>
--- a/platform/broadcom/sonic-platform-modules-dell/z9332f/modules/cls-switchboard.c
+++ b/platform/broadcom/sonic-platform-modules-dell/z9332f/modules/cls-switchboard.c
@ -21,7 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include "cls-i2c-ocore.h"

 #define MOD_VERSION "2.1.0-1"
--- a/platform/broadcom/sonic-platform-modules-delta/ag5648/modules/delta_ag5648_platform.c
+++ b/platform/broadcom/sonic-platform-modules-delta/ag5648/modules/delta_ag5648_platform.c
@ -9,9 +9,9 @@
 #include <linux/ctype.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/i2c/sff-8436.h>

 #define BUS4_DEV_NUM    54
--- a/platform/broadcom/sonic-platform-modules-delta/ag9032v1/modules/delta_ag9032v1_platform.c
+++ b/platform/broadcom/sonic-platform-modules-delta/ag9032v1/modules/delta_ag9032v1_platform.c
@ -9,9 +9,9 @@
 #include <linux/ctype.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/i2c/sff-8436.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
--- a/platform/broadcom/sonic-platform-modules-delta/ag9032v2a/modules/delta_ag9032v2a_platform.c
+++ b/platform/broadcom/sonic-platform-modules-delta/ag9032v2a/modules/delta_ag9032v2a_platform.c
@ -1,6 +1,6 @@
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/i2c-mux.h>
 #include <linux/device.h>
 #include <linux/module.h>
--- a/platform/broadcom/sonic-platform-modules-delta/ag9064/modules/delta_ag9064_platform.c
+++ b/platform/broadcom/sonic-platform-modules-delta/ag9064/modules/delta_ag9064_platform.c
@ -3,9 +3,9 @@
 #include <linux/dmi.h>
 #include <linux/version.h>
 #include <linux/ctype.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/i2c/sff-8436.h>
 #include <linux/fs.h>
 #include <asm/segment.h>
--- a/platform/broadcom/sonic-platform-modules-delta/ag9064/modules/i2c-mei_main.c
+++ b/platform/broadcom/sonic-platform-modules-delta/ag9064/modules/i2c-mei_main.c
@ -28,7 +28,7 @@
 #if (defined CONFIG_I2C_MUX_GPIO || defined CONFIG_I2C_MUX_GPIO_MODULE) && \
 		defined CONFIG_DMI
 #include <linux/gpio.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #endif

 /* PCI Address Constants */
--- a/platform/broadcom/sonic-platform-modules-delta/et-6248brb/modules/delta_et-6248brb_platform.c
+++ b/platform/broadcom/sonic-platform-modules-delta/et-6248brb/modules/delta_et-6248brb_platform.c
@ -9,11 +9,11 @@
 #include <linux/ctype.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/platform_data/pca953x.h>

 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/i2c/sff-8436.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
--- a/platform/broadcom/sonic-platform-modules-ingrasys/s8900-64xc/modules/qsfp_cpld.c
+++ b/platform/broadcom/sonic-platform-modules-ingrasys/s8900-64xc/modules/qsfp_cpld.c
@ -28,7 +28,7 @@
 #include <linux/mutex.h>
 #include <linux/interrupt.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>

--- a/platform/broadcom/sonic-platform-modules-ingrasys/s9200-64x/modules/cpld.c
+++ b/platform/broadcom/sonic-platform-modules-ingrasys/s9200-64x/modules/cpld.c
@ -5,7 +5,7 @@
 #include <linux/stat.h>
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>

--- a/platform/broadcom/sonic-platform-modules-inventec/d6254qs/modules/inv_platform.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d6254qs/modules/inv_platform.c
@ -6,13 +6,13 @@
 */

 #include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
+#include <linux/platform_data/i2c-gpio.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>

-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>

 struct inv_i2c_board_info {
    int ch;
--- a/platform/broadcom/sonic-platform-modules-inventec/d6356/modules/i2c-mux-pca9541.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d6356/modules/i2c-mux-pca9541.c
@ -24,7 +24,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>

-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>

 /*
 * The PCA9541 is a bus master selector. It supports two I2C masters connected
--- a/platform/broadcom/sonic-platform-modules-inventec/d6356/modules/inv_platform.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d6356/modules/inv_platform.c
@ -1,11 +1,11 @@
 #include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
+#include <linux/platform_data/i2c-gpio.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>

 struct inv_i2c_board_info {
    int ch;
--- a/platform/broadcom/sonic-platform-modules-inventec/d6356/modules/ucd9000.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d6356/modules/ucd9000.c
@ -25,7 +25,7 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pmbus.h>
+#include <linux/pmbus.h>
 #include "pmbus.h"

 enum chips { ucd9000, ucd90120, ucd90124, ucd90160, ucd9090, ucd90910 };
--- a/platform/broadcom/sonic-platform-modules-inventec/d6556/modules/inv_platform.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d6556/modules/inv_platform.c
@ -5,13 +5,13 @@
 * (at your option) any later version.
 */
 #include <linux/i2c.h>
-#include <linux/i2c-gpio.h>
+#include <linux/platform_data/i2c-gpio.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>

 struct inv_i2c_board_info {
    int ch;
--- a/platform/broadcom/sonic-platform-modules-inventec/d7032q28b/modules/inv_platform.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d7032q28b/modules/inv_platform.c
@ -1,12 +1,12 @@
 #include <linux/i2c.h>
 //#include <linux/i2c-algo-bit.h>
-#include <linux/i2c-gpio.h>
+#include <linux/platform_data/i2c-gpio.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>

-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/platform_data/pca953x.h>
 #include <linux/platform_data/at24.h>

--- a/platform/broadcom/sonic-platform-modules-inventec/d7054q28b/modules/inv_platform.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d7054q28b/modules/inv_platform.c
@ -1,12 +1,12 @@
 #include <linux/i2c.h>
 //#include <linux/i2c-algo-bit.h>
-#include <linux/i2c-gpio.h>
+#include <linux/platform_data/i2c-gpio.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>

-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 //#include <linux/i2c/pca953x.h>
 //#include <linux/i2c/at24.h>

--- a/platform/broadcom/sonic-platform-modules-inventec/d7264q28b/modules/inv_platform.c
+++ b/platform/broadcom/sonic-platform-modules-inventec/d7264q28b/modules/inv_platform.c
@ -1,12 +1,12 @@
 #include <linux/i2c.h>
 //#include <linux/i2c-algo-bit.h>
-#include <linux/i2c-gpio.h>
+#include <linux/platform_data/i2c-gpio.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 //#include <linux/i2c/pca953x.h>
 //#include <linux/i2c/at24.h>

--- a/platform/broadcom/sonic-platform-modules-juniper/qfx5200/modules/jnx-refpga-lpcm.c
+++ b/platform/broadcom/sonic-platform-modules-juniper/qfx5200/modules/jnx-refpga-lpcm.c
@ -22,6 +22,7 @@
 #include <linux/delay.h>
 #include <asm/io.h>
 #include <linux/errno.h>
+#include <linux/ioport.h>

 #define REFPGA_LPC_BASE_ADDRESS		0xFED50000
 #define REFPGA_LPC_WINDOW_SIZE		0x00000400
@ -68,10 +69,10 @@ static int __init refpga_lpcm_init(void)
 	u8 minor_version = 0x00;

 	if (!request_mem_region(REFPGA_LPC_BASE_ADDRESS, REFPGA_LPC_WINDOW_SIZE, "refpga-lpc")) {
-		printk(KERN_ERR "Cannot allocate Re-fpga memory region\n"); 
+		printk(KERN_ERR "Cannot allocate Re-fpga memory region\n");
 		return -ENODEV;
 	}
-	
+
 	if ((fpga = ioremap(REFPGA_LPC_BASE_ADDRESS, REFPGA_LPC_WINDOW_SIZE)) == NULL) {
 		release_mem_region(REFPGA_LPC_BASE_ADDRESS, REFPGA_LPC_WINDOW_SIZE);
 		printk(KERN_ERR "Re-Fpga address mapping failed\n");
@ -81,14 +82,14 @@ static int __init refpga_lpcm_init(void)
 	major_version = ioread8((u8 *)fpga + REFPGA_MAJOR_VERSION);
 	minor_version = ioread8((u8 *)fpga + REFPGA_MINOR_VERSION);
 	printk(KERN_INFO "Re-Fpga major version: %x minor version: %x\n", major_version, minor_version);
-	
+
 	/*
 	 * Register the cpld soft reset handler
 	 */
 	if(register_reboot_notifier(&qfx5200_nb)) {
 		printk(KERN_ALERT "Restart handler registration failed\n");
 	}
-	
+
 	iowrite8(REFPGA_MGMT1_PHY_RESET, (u8 *)fpga + REFPGA_MRE_LPCM_RST_CTL_REG);

 	return 0;
--- a/platform/broadcom/sonic-platform-modules-juniper/qfx5210/modules/x86-64-juniper-qfx5210-64x-leds.c
+++ b/platform/broadcom/sonic-platform-modules-juniper/qfx5210/modules/x86-64-juniper-qfx5210-64x-leds.c
@ -37,7 +37,6 @@ extern int juniper_i2c_cpld_read (u8 cpld_addr, u8 reg);
 extern int juniper_i2c_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);

--- a/platform/broadcom/sonic-platform-modules-mitac/ly1200-32x/modules/mitac_ly1200_32x_fse000.c
+++ b/platform/broadcom/sonic-platform-modules-mitac/ly1200-32x/modules/mitac_ly1200_32x_fse000.c
@ -8,7 +8,7 @@
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/jiffies.h>
-#include <linux/i2c/pmbus.h>
+#include <linux/pmbus.h>
 #include "pmbus.h"
 #include <linux/version.h>

--- a/platform/broadcom/sonic-platform-modules-mitac/ly1200-32x/modules/mitac_ly1200_32x_sb_i2c.c
+++ b/platform/broadcom/sonic-platform-modules-mitac/ly1200-32x/modules/mitac_ly1200_32x_sb_i2c.c
@ -1,7 +1,7 @@
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/platform_data/pca953x.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/platform_data/at24.h>
 #include <linux/delay.h>
 #include "bms_i2c.h"
--- a/platform/broadcom/sonic-platform-modules-quanta/ix1b-32x/modules/qci_platform_ix1b.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix1b-32x/modules/qci_platform_ix1b.c
@ -39,7 +39,7 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #if LINUX_VERSION_CODE > KERNEL_VERSION(3,12,0)
 #include <linux/platform_data/pca953x.h>
 #else
--- a/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/quanta_platform_ix7.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix7-32x/modules/quanta_platform_ix7.c
@ -39,7 +39,7 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
 #include <linux/i2c/pca953x.h>
 #else
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_platform_ix8.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8-56x/modules/qci_platform_ix8.c
@ -39,7 +39,7 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
 #include <linux/i2c/pca953x.h>
 #else
--- a/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_platform_ix8c.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix8c-56x/modules/qci_platform_ix8c.c
@ -39,7 +39,7 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0))
 #include <linux/i2c/pca953x.h>
 #else
--- a/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_platform_ix9.c
+++ b/platform/broadcom/sonic-platform-modules-quanta/ix9-32x/modules/qci_platform_ix9.c
@ -39,7 +39,7 @@
 #include <linux/input-polldev.h>
 #include <linux/rfkill.h>
 #include <linux/slab.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #if LINUX_VERSION_CODE > KERNEL_VERSION(3,12,0)
 #include <linux/platform_data/pca953x.h>
 #else
--- a/platform/centec/sonic-platform-modules-e582/48x2q4z/modules/centec_e582_48x2q4z_platform.c
+++ b/platform/centec/sonic-platform-modules-e582/48x2q4z/modules/centec_e582_48x2q4z_platform.c
@ -1,7 +1,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/device.h>
 #include <linux/kdev_t.h>
 #include <linux/leds.h>
--- a/platform/centec/sonic-platform-modules-e582/48x6q/modules/centec_e582_48x6q_platform.c
+++ b/platform/centec/sonic-platform-modules-e582/48x6q/modules/centec_e582_48x6q_platform.c
@ -1,7 +1,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/device.h>
 #include <linux/kdev_t.h>
 #include <linux/leds.h>
--- a/platform/innovium/sonic-platform-modules-delta/et-c032if/modules/delta_et-c032if_platform.c
+++ b/platform/innovium/sonic-platform-modules-delta/et-c032if/modules/delta_et-c032if_platform.c
@ -9,9 +9,9 @@
 #include <linux/ctype.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pca954x.h>
+#include <linux/platform_data/pca954x.h>
 #include <linux/i2c-mux.h>
-#include <linux/i2c-mux-gpio.h>
+#include <linux/platform_data/i2c-mux-gpio.h>
 #include <linux/i2c/sff-8436.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
--- a/platform/nephos/sonic-platform-modules-cig/cs6436-56p/modules/x86-64-cig-cs6436-56p-led.c
+++ b/platform/nephos/sonic-platform-modules-cig/cs6436-56p/modules/x86-64-cig-cs6436-56p-led.c
@ -35,7 +35,6 @@ extern  int cig_cpld_write_register(u8 reg_off, u8 val);
 extern int cig_cpld_read_register(u8 reg_off, u8 *val);

 extern void led_classdev_unregister(struct led_classdev *led_cdev);
-extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
 extern void led_classdev_resume(struct led_classdev *led_cdev);
 extern void led_classdev_suspend(struct led_classdev *led_cdev);