diff mbox series

[2/7] power: supply: sbs-battery: prefix module param variable

Message ID 20191101190705.13393-2-jeff.dagenais@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show
Series [1/7] power: supply: sbs-battery: use octal permissions on module param | expand

Commit Message

Jean-François Dagenais Nov. 1, 2019, 7:07 p.m. UTC 
This is to prevent confusion with the upcoming devicetree binding for
force_load.

Signed-off-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
---
 drivers/power/supply/sbs-battery.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c
index 0e66968dabc3..f9e8c14ac830 100644
--- a/drivers/power/supply/sbs-battery.c
+++ b/drivers/power/supply/sbs-battery.c
@@ -168,7 +168,7 @@  struct sbs_info {
 
 static char model_name[I2C_SMBUS_BLOCK_MAX + 1];
 static char manufacturer[I2C_SMBUS_BLOCK_MAX + 1];
-static bool force_load;
+static bool param_force_load;
 
 static int sbs_read_word_data(struct i2c_client *client, u8 address)
 {
@@ -890,7 +890,7 @@  static int sbs_probe(struct i2c_client *client,
 	 * Before we register, we might need to make sure we can actually talk
 	 * to the battery.
 	 */
-	if (!(force_load || chip->gpio_detect)) {
+	if (!(param_force_load || chip->gpio_detect)) {
 		rc = sbs_read_word_data(client, sbs_data[REG_STATUS].addr);
 
 		if (rc < 0) {
@@ -994,6 +994,6 @@  module_i2c_driver(sbs_battery_driver);
 MODULE_DESCRIPTION("SBS battery monitor driver");
 MODULE_LICENSE("GPL");
 
-module_param(force_load, bool, 0444);
-MODULE_PARM_DESC(force_load,
+module_param(param_force_load, bool, 0444);
+MODULE_PARM_DESC(param_force_load,
 		 "Attempt to load the driver even if no battery is connected");