Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging (516f7b3f) · Commits · 戴 / test

Pull hwmon cleanups from Guenter Roeck: "Minor cleanup in ina2xx and hwmon-vid drivers; no functional changes" * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (ina2xx) Remove casting the return value which is a void pointer hwmon: (hwmon-vid) Add __maybe_unused attribute to dummy variable

drivers/hwmon/hwmon-vid.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -246,7 +246,7 @@ static struct vrm_model vrm_models[] = {
		*/
		static u8 get_via_model_d_vrm(void)
		{
		unsigned int vid, brand, dummy;
		unsigned int vid, brand, __maybe_unused dummy;
		static const char *brands[4] = {
		"C7-M", "C7", "Eden", "C7-D"
		};

drivers/hwmon/ina2xx.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -233,8 +233,7 @@ static int ina2xx_probe(struct i2c_client *client,
		return -ENOMEM;

		if (dev_get_platdata(&client->dev)) {
		pdata =
		(struct ina2xx_platform_data *)dev_get_platdata(&client->dev);
		pdata = dev_get_platdata(&client->dev);
		shunt = pdata->shunt_uohms;
		} else if (!of_property_read_u32(client->dev.of_node,
		"shunt-resistor", &val)) {

Admin message