Moonstone driver compatible issues fix for bullseye platform

sonic-net · Jun 28, 2024 · 18fbab9 · 18fbab9
1 parent 98c5589
commit 18fbab9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 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
@@ -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
@@ -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
@@ -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");
+MODULE_LICENSE("GPL");