diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/control b/platform/broadcom/sonic-platform-modules-cel/debian/control index cef0dfd391..93a049626f 100644 --- a/platform/broadcom/sonic-platform-modules-cel/debian/control +++ b/platform/broadcom/sonic-platform-modules-cel/debian/control @@ -28,7 +28,7 @@ Description: kernel modules for platform devices such as led, sfp. Package: platform-modules-ds1000 Architecture: amd64 -Depends: linux-image-5.10.0-23-2-amd64-unsigned +Depends: linux-image-6.1.0-11-2-amd64-unsigned Description: kernel modules for platform devices such as led, sfp Package: platform-modules-questone2 diff --git a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-questone2.install b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-questone2.install index 1b6114d360..b08bfe00d4 100644 --- a/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-questone2.install +++ b/platform/broadcom/sonic-platform-modules-cel/debian/platform-modules-questone2.install @@ -7,4 +7,3 @@ questone2/scripts/questone2_platform_shutdown.sh usr/local/bin questone2/scripts/sensors usr/bin questone2/scripts/platform_sensors.py usr/local/bin services/platform_api/platform_api_mgnt.sh usr/local/bin -services/platform_api/ps_mem.py usr/local/bin diff --git a/platform/broadcom/sonic-platform-modules-cel/questone2/modules/mc24lc64t.c b/platform/broadcom/sonic-platform-modules-cel/questone2/modules/mc24lc64t.c index ae79770a4d..4603b3d410 100644 --- a/platform/broadcom/sonic-platform-modules-cel/questone2/modules/mc24lc64t.c +++ b/platform/broadcom/sonic-platform-modules-cel/questone2/modules/mc24lc64t.c @@ -142,12 +142,10 @@ static int mc24lc64t_probe(struct i2c_client *client, return err; } -static int mc24lc64t_remove(struct i2c_client *client) +static void mc24lc64t_remove(struct i2c_client *client) { struct mc24lc64t_data *drvdata = i2c_get_clientdata(client); sysfs_remove_bin_file(&client->dev.kobj, &mc24lc64t_bit_attr); - - return 0; } static const struct i2c_device_id mc24lc64t_id[] = { diff --git a/platform/broadcom/sonic-platform-modules-cel/questone2/modules/optoe.c b/platform/broadcom/sonic-platform-modules-cel/questone2/modules/optoe.c index a16bdfc96a..cfddaa07cb 100644 --- a/platform/broadcom/sonic-platform-modules-cel/questone2/modules/optoe.c +++ b/platform/broadcom/sonic-platform-modules-cel/questone2/modules/optoe.c @@ -780,7 +780,7 @@ static ssize_t optoe_bin_write(struct file *filp, struct kobject *kobj, return optoe_read_write(optoe, buf, off, count, OPTOE_WRITE_OP); } -static int optoe_remove(struct i2c_client *client) +static void optoe_remove(struct i2c_client *client) { struct optoe_data *optoe; int i; @@ -798,7 +798,6 @@ static int optoe_remove(struct i2c_client *client) kfree(optoe->writebuf); kfree(optoe); - return 0; } static ssize_t show_dev_class(struct device *dev, diff --git a/platform/broadcom/sonic-platform-modules-cel/questone2/modules/sff_8436_eeprom.c b/platform/broadcom/sonic-platform-modules-cel/questone2/modules/sff_8436_eeprom.c index 6779ccee5e..70dc2ba272 100644 --- a/platform/broadcom/sonic-platform-modules-cel/questone2/modules/sff_8436_eeprom.c +++ b/platform/broadcom/sonic-platform-modules-cel/questone2/modules/sff_8436_eeprom.c @@ -777,7 +777,7 @@ static ssize_t sff_8436_bin_write(struct file *filp, struct kobject *kobj, /*-------------------------------------------------------------------------*/ -static int sff_8436_remove(struct i2c_client *client) +static void sff_8436_remove(struct i2c_client *client) { struct sff_8436_data *sff_8436; @@ -786,7 +786,6 @@ static int sff_8436_remove(struct i2c_client *client) kfree(sff_8436->writebuf); kfree(sff_8436); - return 0; } static int sff_8436_eeprom_probe(struct i2c_client *client, const struct i2c_device_id *id) diff --git a/platform/broadcom/sonic-platform-modules-cel/silverstone/modules/cls-i2c-mux-pca954x.c b/platform/broadcom/sonic-platform-modules-cel/silverstone/modules/cls-i2c-mux-pca954x.c index 71b635f326..87c51c15ad 100644 --- a/platform/broadcom/sonic-platform-modules-cel/silverstone/modules/cls-i2c-mux-pca954x.c +++ b/platform/broadcom/sonic-platform-modules-cel/silverstone/modules/cls-i2c-mux-pca954x.c @@ -533,14 +533,13 @@ fail_cleanup: return ret; } -static int pca954x_remove(struct i2c_client *client) +static void pca954x_remove(struct i2c_client *client) { struct i2c_mux_core *muxc = i2c_get_clientdata(client); device_remove_file(&client->dev, &dev_attr_idle_state); pca954x_cleanup(muxc); - return 0; } #ifdef CONFIG_PM_SLEEP diff --git a/platform/broadcom/sonic-platform-modules-cel/silverstone/modules/switch_cpld.c b/platform/broadcom/sonic-platform-modules-cel/silverstone/modules/switch_cpld.c index 7a0abc27e5..b1900d0324 100644 --- a/platform/broadcom/sonic-platform-modules-cel/silverstone/modules/switch_cpld.c +++ b/platform/broadcom/sonic-platform-modules-cel/silverstone/modules/switch_cpld.c @@ -381,7 +381,7 @@ exit: return err; } -static int switch_cpld_remove(struct i2c_client *client) +static void switch_cpld_remove(struct i2c_client *client) { struct switch_cpld_data *data = i2c_get_clientdata(client); @@ -389,7 +389,6 @@ static int switch_cpld_remove(struct i2c_client *client) sysfs_remove_link(&data->client2->dev.kobj, "CPLD2"); sysfs_remove_link(&client->dev.kobj, "CPLD1"); i2c_unregister_device(data->client2); - return 0; } static const struct i2c_device_id switch_cpld_ids[] = {