Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b55f3757 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

hwmon: Fix checkpatch warning 'quoted string split across lines' 



Cc: Corentin Labbe <corentin.labbe@geomatys.fr>
Cc: Mark M. Hoffman <mhoffman@lightlink.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Juerg Haefliger <juergh@gmail.com>
Cc: Andreas Herrmann <herrmann.der.user@googlemail.com>
Cc: Rudolf Marek <r.marek@assembler.cz>
Cc: Jim Cromie <jim.cromie@gmail.com>
Cc: Roger Lucas <vt8231@hiddenengine.co.uk>
Cc: Marc Hulsman <m.hulsman@tudelft.nl>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 088ce2ac

drivers/hwmon/ad7314.c

+1 −2
Original line number Diff line number Diff line
@@ -166,6 +166,5 @@ static struct spi_driver ad7314_driver = { 
module_spi_driver(ad7314_driver);



MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");

MODULE_DESCRIPTION("Analog Devices AD7314, ADT7301 and ADT7302 digital"

			" temperature sensor driver");

MODULE_DESCRIPTION("Analog Devices AD7314, ADT7301 and ADT7302 digital temperature sensor driver");

MODULE_LICENSE("GPL v2");

drivers/hwmon/adm1021.c

+4 −7
Original line number Diff line number Diff line
@@ -312,8 +312,7 @@ static int adm1021_detect(struct i2c_client *client, 
	int conv_rate, status, config, man_id, dev_id;



	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {

		pr_debug("adm1021: detect failed, "

			 "smbus byte data not supported!\n");

		pr_debug("detect failed, smbus byte data not supported!\n");

		return -ENODEV;

	}
@@ -324,7 +323,7 @@ static int adm1021_detect(struct i2c_client *client, 


	/* Check unused bits */

	if ((status & 0x03) || (config & 0x3F) || (conv_rate & 0xF8)) {

		pr_debug("adm1021: detect failed, chip not detected!\n");

		pr_debug("detect failed, chip not detected!\n");

		return -ENODEV;

	}
@@ -353,7 +352,7 @@ static int adm1021_detect(struct i2c_client *client, 
	else

		type_name = "max1617";



	pr_debug("adm1021: Detected chip %s at adapter %d, address 0x%02x.\n",

	pr_debug("Detected chip %s at adapter %d, address 0x%02x.\n",

		 type_name, i2c_adapter_id(adapter), client->addr);

	strlcpy(info->type, type_name, I2C_NAME_SIZE);
@@ -368,10 +367,8 @@ static int adm1021_probe(struct i2c_client *client, 


	data = devm_kzalloc(&client->dev, sizeof(struct adm1021_data),

			    GFP_KERNEL);

	if (!data) {

		pr_debug("adm1021: detect failed, devm_kzalloc failed!\n");

	if (!data)

		return -ENOMEM;

	}



	i2c_set_clientdata(client, data);

	data->type = id->driver_data;

drivers/hwmon/adm1026.c

+27 −26
Original line number Diff line number Diff line
@@ -49,14 +49,14 @@ static int gpio_fan[8] = { -1, -1, -1, -1, -1, -1, -1, -1 }; 
module_param_array(gpio_input, int, NULL, 0);

MODULE_PARM_DESC(gpio_input, "List of GPIO pins (0-16) to program as inputs");

module_param_array(gpio_output, int, NULL, 0);

MODULE_PARM_DESC(gpio_output, "List of GPIO pins (0-16) to program as "

	"outputs");

MODULE_PARM_DESC(gpio_output,

		 "List of GPIO pins (0-16) to program as outputs");

module_param_array(gpio_inverted, int, NULL, 0);

MODULE_PARM_DESC(gpio_inverted, "List of GPIO pins (0-16) to program as "

	"inverted");

MODULE_PARM_DESC(gpio_inverted,

		 "List of GPIO pins (0-16) to program as inverted");

module_param_array(gpio_normal, int, NULL, 0);

MODULE_PARM_DESC(gpio_normal, "List of GPIO pins (0-16) to program as "

	"normal/non-inverted");

MODULE_PARM_DESC(gpio_normal,

		 "List of GPIO pins (0-16) to program as normal/non-inverted");

module_param_array(gpio_fan, int, NULL, 0);

MODULE_PARM_DESC(gpio_fan, "List of GPIO pins (0-7) to program as fan tachs");
@@ -372,31 +372,31 @@ static void adm1026_init_client(struct i2c_client *client) 
	dev_dbg(&client->dev, "ADM1026_REG_CONFIG1 is: 0x%02x\n",

		data->config1);

	if ((data->config1 & CFG1_MONITOR) == 0) {

		dev_dbg(&client->dev, "Monitoring not currently "

			"enabled.\n");

		dev_dbg(&client->dev,

			"Monitoring not currently enabled.\n");

	}

	if (data->config1 & CFG1_INT_ENABLE) {

		dev_dbg(&client->dev, "SMBALERT interrupts are "

			"enabled.\n");

		dev_dbg(&client->dev,

			"SMBALERT interrupts are enabled.\n");

	}

	if (data->config1 & CFG1_AIN8_9) {

		dev_dbg(&client->dev, "in8 and in9 enabled. "

			"temp3 disabled.\n");

		dev_dbg(&client->dev,

			"in8 and in9 enabled. temp3 disabled.\n");

	} else {

		dev_dbg(&client->dev, "temp3 enabled.  in8 and "

			"in9 disabled.\n");

		dev_dbg(&client->dev,

			"temp3 enabled.  in8 and in9 disabled.\n");

	}

	if (data->config1 & CFG1_THERM_HOT) {

		dev_dbg(&client->dev, "Automatic THERM, PWM, "

			"and temp limits enabled.\n");

		dev_dbg(&client->dev,

			"Automatic THERM, PWM, and temp limits enabled.\n");

	}



	if (data->config3 & CFG3_GPIO16_ENABLE) {

		dev_dbg(&client->dev, "GPIO16 enabled.  THERM "

			"pin disabled.\n");

		dev_dbg(&client->dev,

			"GPIO16 enabled.  THERM pin disabled.\n");

	} else {

		dev_dbg(&client->dev, "THERM pin enabled.  "

			"GPIO16 disabled.\n");

		dev_dbg(&client->dev,

			"THERM pin enabled.  GPIO16 disabled.\n");

	}

	if (data->config3 & CFG3_VREF_250)

		dev_dbg(&client->dev, "Vref is 2.50 Volts.\n");
@@ -1798,8 +1798,8 @@ static int adm1026_detect(struct i2c_client *client, 
	company = adm1026_read_value(client, ADM1026_REG_COMPANY);

	verstep = adm1026_read_value(client, ADM1026_REG_VERSTEP);



	dev_dbg(&adapter->dev, "Detecting device at %d,0x%02x with"

		" COMPANY: 0x%02x and VERSTEP: 0x%02x\n",

	dev_dbg(&adapter->dev,

		"Detecting device at %d,0x%02x with COMPANY: 0x%02x and VERSTEP: 0x%02x\n",

		i2c_adapter_id(client->adapter), client->addr,

		company, verstep);
@@ -1811,11 +1811,12 @@ static int adm1026_detect(struct i2c_client *client, 
		/* Analog Devices ADM1026 */

	} else if (company == ADM1026_COMPANY_ANALOG_DEV

		&& (verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) {

		dev_err(&adapter->dev, "Unrecognized stepping "

			"0x%02x. Defaulting to ADM1026.\n", verstep);

		dev_err(&adapter->dev,

			"Unrecognized stepping 0x%02x. Defaulting to ADM1026.\n",

			verstep);

	} else if ((verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) {

		dev_err(&adapter->dev, "Found version/stepping "

			"0x%02x. Assuming generic ADM1026.\n",

		dev_err(&adapter->dev,

			"Found version/stepping 0x%02x. Assuming generic ADM1026.\n",

			verstep);

	} else {

		dev_dbg(&adapter->dev, "Autodetection failed\n");

drivers/hwmon/adm1029.c

+5 −4
Original line number Diff line number Diff line
@@ -224,8 +224,9 @@ static ssize_t set_fan_div(struct device *dev, 
		break;

	default:

		mutex_unlock(&data->update_lock);

		dev_err(&client->dev, "fan_div value %ld not "

			"supported. Choose one of 1, 2 or 4!\n", val);

		dev_err(&client->dev,

			"fan_div value %ld not supported. Choose one of 1, 2 or 4!\n",

			val);

		return -EINVAL;

	}

	/* Update the value */
@@ -326,8 +327,8 @@ static int adm1029_detect(struct i2c_client *client, 
		 * There are no "official" CHIP ID, so actually

		 * we use Major/Minor revision for that

		 */

		pr_info("adm1029: Unknown major revision %x, "

			"please let us know\n", chip_id);

		pr_info("Unknown major revision %x, please let us know\n",

			chip_id);

		return -ENODEV;

	}

drivers/hwmon/adm9240.c

+5 −4
Original line number Diff line number Diff line
@@ -351,8 +351,9 @@ static void adm9240_write_fan_div(struct i2c_client *client, int nr, 
	reg &= ~(3 << shift);

	reg |= (fan_div << shift);

	i2c_smbus_write_byte_data(client, ADM9240_REG_VID_FAN_DIV, reg);

	dev_dbg(&client->dev, "fan%d clock divider changed from %u "

			"to %u\n", nr + 1, 1 << old, 1 << fan_div);

	dev_dbg(&client->dev,

		"fan%d clock divider changed from %u to %u\n",

		nr + 1, 1 << old, 1 << fan_div);

}



/*
@@ -699,8 +700,8 @@ static void adm9240_init_client(struct i2c_client *client) 
		/* start measurement cycle */

		i2c_smbus_write_byte_data(client, ADM9240_REG_CONFIG, 1);



		dev_info(&client->dev, "cold start: config was 0x%02x "

				"mode %u\n", conf, mode);

		dev_info(&client->dev,

			 "cold start: config was 0x%02x mode %u\n", conf, mode);

	}

}