From 18fbab92abc9f3d6a5e76876ba0006cd4bc36df7 Mon Sep 17 00:00:00 2001 From: Eric Zhu Date: Tue, 25 Jun 2024 02:41:37 -0500 Subject: [PATCH] Moonstone driver compatible issues fix for bullseye platform --- .../moonstone/modules/i2c-mux-pca954x.c | 3 +-- .../sonic-platform-modules-cel/moonstone/modules/isl68137.c | 2 ++ .../moonstone/modules/psu_driver/pddf_psu_driver.c | 5 ++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/broadcom/sonic-platform-modules-cel/moonstone/modules/i2c-mux-pca954x.c b/platform/broadcom/sonic-platform-modules-cel/moonstone/modules/i2c-mux-pca954x.c index 3d4299ba9ff..71c5f45bd09 100644 --- a/platform/broadcom/sonic-platform-modules-cel/moonstone/modules/i2c-mux-pca954x.c +++ b/platform/broadcom/sonic-platform-modules-cel/moonstone/modules/i2c-mux-pca954x.c @@ -534,14 +534,13 @@ static int pca954x_probe(struct i2c_client *client, 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/moonstone/modules/isl68137.c b/platform/broadcom/sonic-platform-modules-cel/moonstone/modules/isl68137.c index 789242ed72e..2058f1d7c19 100644 --- a/platform/broadcom/sonic-platform-modules-cel/moonstone/modules/isl68137.c +++ b/platform/broadcom/sonic-platform-modules-cel/moonstone/modules/isl68137.c @@ -18,6 +18,8 @@ #include "pmbus.h" +MODULE_IMPORT_NS(PMBUS); + #define ISL68137_VOUT_AVS 0x30 #define RAA_DMPVR2_READ_VMON 0xc8 diff --git a/platform/broadcom/sonic-platform-modules-cel/moonstone/modules/psu_driver/pddf_psu_driver.c b/platform/broadcom/sonic-platform-modules-cel/moonstone/modules/psu_driver/pddf_psu_driver.c index 14c3bcfef5c..def7b8fca7d 100644 --- a/platform/broadcom/sonic-platform-modules-cel/moonstone/modules/psu_driver/pddf_psu_driver.c +++ b/platform/broadcom/sonic-platform-modules-cel/moonstone/modules/psu_driver/pddf_psu_driver.c @@ -279,7 +279,7 @@ static int psu_probe(struct i2c_client *client, return status; } -static int psu_remove(struct i2c_client *client) +static void psu_remove(struct i2c_client *client) { int i=0, ret = 0; struct psu_data *data = i2c_get_clientdata(client); @@ -320,7 +320,6 @@ static int psu_remove(struct i2c_client *client) printk(KERN_ERR "FAN post_remove function failed\n"); } - return ret; } enum psu_intf @@ -397,4 +396,4 @@ module_exit(psu_exit); MODULE_AUTHOR("Broadcom"); MODULE_DESCRIPTION("psu driver"); -MODULE_LICENSE("GPL"); \ No newline at end of file +MODULE_LICENSE("GPL");