From cc3223856487d351f12b1959b471bc2310f7c7a4 Mon Sep 17 00:00:00 2001
From: Jostar Yang <jostar_yang@accton.com>
Date: Tue, 28 Aug 2018 16:31:21 +0800
Subject: [PATCH] 1. Let csp9250 support kernel-4.14. 2. Remove not need debug
 log

---
 .../x86-64/x86-64-accton-csp9250/modules/PKG.yml    |  2 +-
 .../modules/builds/x86-64-accton-csp9250-leds.c     |  4 ----
 .../modules/builds/x86-64-accton-csp9250-sfp.c      | 13 +------------
 .../r0/src/lib/x86-64-accton-csp9250-r0.yml         |  2 +-
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/packages/platforms/accton/x86-64/x86-64-accton-csp9250/modules/PKG.yml b/packages/platforms/accton/x86-64/x86-64-accton-csp9250/modules/PKG.yml
index 3f59762e..d857a900 100755
--- a/packages/platforms/accton/x86-64/x86-64-accton-csp9250/modules/PKG.yml
+++ b/packages/platforms/accton/x86-64/x86-64-accton-csp9250/modules/PKG.yml
@@ -1 +1 @@
-!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-csp9250 ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
+!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-csp9250 ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-csp9250/modules/builds/x86-64-accton-csp9250-leds.c b/packages/platforms/accton/x86-64/x86-64-accton-csp9250/modules/builds/x86-64-accton-csp9250-leds.c
index f3a2f878..c6237ccd 100755
--- a/packages/platforms/accton/x86-64/x86-64-accton-csp9250/modules/builds/x86-64-accton-csp9250-leds.c
+++ b/packages/platforms/accton/x86-64/x86-64-accton-csp9250/modules/builds/x86-64-accton-csp9250-leds.c
@@ -33,10 +33,6 @@
 extern int csp9250_i2c_cpld_read (unsigned short cpld_addr, u8 reg);
 extern int csp9250_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);
 
 #define DRVNAME "accton_csp9250_led"
 
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-csp9250/modules/builds/x86-64-accton-csp9250-sfp.c b/packages/platforms/accton/x86-64/x86-64-accton-csp9250/modules/builds/x86-64-accton-csp9250-sfp.c
index d13bf7c9..1a3f1775 100755
--- a/packages/platforms/accton/x86-64/x86-64-accton-csp9250/modules/builds/x86-64-accton-csp9250-sfp.c
+++ b/packages/platforms/accton/x86-64/x86-64-accton-csp9250/modules/builds/x86-64-accton-csp9250-sfp.c
@@ -1005,9 +1005,8 @@ static ssize_t sfp_port_read(struct sfp_port_data *data,
                              char *buf, loff_t off, size_t count)
 {
     ssize_t retval = 0;
-    printk("acc trace %s:%d\n", __FUNCTION__, __LINE__);
+    
     if (unlikely(!count)) {
-        printk("acc trace %s:%d\n", __FUNCTION__, __LINE__);
         DEBUG_PRINT("Count = 0, return");
         return count;
     }
@@ -1017,7 +1016,6 @@ static ssize_t sfp_port_read(struct sfp_port_data *data,
      * from this host, but not from other I2C masters.
      */
     mutex_lock(&data->update_lock);
-    printk("acc trace %s:%d, off=0x%x,data->client->addr=0x%x\n", __FUNCTION__, __LINE__, off,data->client->addr);
     while (count) {
         ssize_t status;
 
@@ -1026,7 +1024,6 @@ static ssize_t sfp_port_read(struct sfp_port_data *data,
             if (retval == 0) {
                 retval = status;
             }
-            printk("acc trace %s:%d\n", __FUNCTION__, __LINE__);
             break;
         }
 
@@ -1049,13 +1046,10 @@ static ssize_t sfp_bin_read(struct file *filp, struct kobject *kobj,
     struct sfp_port_data *data;
     DEBUG_PRINT("offset = (%d), count = (%d)", off, count);
     data = dev_get_drvdata(container_of(kobj, struct device, kobj));
-    printk("acc trace %s:%d, data->port=%d\n", __FUNCTION__, __LINE__, data->port);
-    printk("offset = (%d), count = (%d)", off, count);
     present = sfp_is_port_present(data->client, data->port);
     if (IS_ERR_VALUE(present)) {
         return present;
     }
-    printk("Acc trace %s:%d, present=%d\n", __FUNCTION__, __LINE__, present);
     if (present == 0) {
         /* port is not present */
         return -ENODEV;
@@ -1331,11 +1325,6 @@ static struct i2c_driver sfp_driver = {
 
 static int __init csp9250_sfp_init(void)
 {
-    //extern int platform_accton_csp9250(void);
-    //if(!platform_accton_csp9250()) {
-     //   return -ENODEV;
-    //}
-    printk("Acc trace %s\n", __FUNCTION__);
     return i2c_add_driver(&sfp_driver);
 }
 
diff --git a/packages/platforms/accton/x86-64/x86-64-accton-csp9250/platform-config/r0/src/lib/x86-64-accton-csp9250-r0.yml b/packages/platforms/accton/x86-64/x86-64-accton-csp9250/platform-config/r0/src/lib/x86-64-accton-csp9250-r0.yml
index 8425af5c..5ff7bf95 100755
--- a/packages/platforms/accton/x86-64/x86-64-accton-csp9250/platform-config/r0/src/lib/x86-64-accton-csp9250-r0.yml
+++ b/packages/platforms/accton/x86-64/x86-64-accton-csp9250/platform-config/r0/src/lib/x86-64-accton-csp9250-r0.yml
@@ -12,7 +12,7 @@ x86-64-accton-csp9250-r0:
     serial: >-
       console=tty0  
     kernel:
-      <<: *kernel-3-16
+      <<: *kernel-4-14
 
     args: >-
       console=tty0,