Commit 6d77987f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull hwmon fixes from Guenter Roeck:
 - Add missing 'name' sysfs attributes to ad7314 and ads7871 drivers
 - Bump maximum wait time for applesmc driver (again)
 - Fix build warning seen with W=1 in include/linux/kernel.h, introduced
   with commit b6d86d3d ("Fix DIV_ROUND_CLOSEST to support negative
   dividends")

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  linux/kernel.h: Fix warning seen with W=1 due to change in DIV_ROUND_CLOSEST
  hwmon: (applesmc) Bump max wait
  hwmon: (ad7314) Add 'name' sysfs attribute
  hwmon: (ads7871) Add 'name' sysfs attribute
parents 06b050eb 263a523d

drivers/hwmon/ad7314.c

+8 −0
Original line number Diff line number Diff line
@@ -87,10 +87,18 @@ static ssize_t ad7314_show_temperature(struct device *dev, 
	}

}



static ssize_t ad7314_show_name(struct device *dev,

				struct device_attribute *devattr, char *buf)

{

	return sprintf(buf, "%s\n", to_spi_device(dev)->modalias);

}



static DEVICE_ATTR(name, S_IRUGO, ad7314_show_name, NULL);

static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO,

			  ad7314_show_temperature, NULL, 0);



static struct attribute *ad7314_attributes[] = {

	&dev_attr_name.attr,

	&sensor_dev_attr_temp1_input.dev_attr.attr,

	NULL,

};

drivers/hwmon/ads7871.c

+9 −0
Original line number Diff line number Diff line
@@ -139,6 +139,12 @@ static ssize_t show_voltage(struct device *dev, 
	}

}



static ssize_t ads7871_show_name(struct device *dev,

				 struct device_attribute *devattr, char *buf)

{

	return sprintf(buf, "%s\n", to_spi_device(dev)->modalias);

}



static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, show_voltage, NULL, 0);

static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_voltage, NULL, 1);

static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_voltage, NULL, 2);
@@ -148,6 +154,8 @@ static SENSOR_DEVICE_ATTR(in5_input, S_IRUGO, show_voltage, NULL, 5); 
static SENSOR_DEVICE_ATTR(in6_input, S_IRUGO, show_voltage, NULL, 6);

static SENSOR_DEVICE_ATTR(in7_input, S_IRUGO, show_voltage, NULL, 7);



static DEVICE_ATTR(name, S_IRUGO, ads7871_show_name, NULL);



static struct attribute *ads7871_attributes[] = {

	&sensor_dev_attr_in0_input.dev_attr.attr,

	&sensor_dev_attr_in1_input.dev_attr.attr,
@@ -157,6 +165,7 @@ static struct attribute *ads7871_attributes[] = { 
	&sensor_dev_attr_in5_input.dev_attr.attr,

	&sensor_dev_attr_in6_input.dev_attr.attr,

	&sensor_dev_attr_in7_input.dev_attr.attr,

	&dev_attr_name.attr,

	NULL

};

drivers/hwmon/applesmc.c

+2 −2
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ 


#define APPLESMC_MAX_DATA_LENGTH 32



/* wait up to 32 ms for a status change. */

/* wait up to 128 ms for a status change. */

#define APPLESMC_MIN_WAIT	0x0010

#define APPLESMC_RETRY_WAIT	0x0100

#define APPLESMC_MAX_WAIT	0x8000

#define APPLESMC_MAX_WAIT	0x20000



#define APPLESMC_READ_CMD	0x10

#define APPLESMC_WRITE_CMD	0x11

include/linux/kernel.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
{							\

	typeof(x) __x = x;				\

	typeof(divisor) __d = divisor;			\

	(((typeof(x))-1) >= 0 || (__x) >= 0) ?		\

	(((typeof(x))-1) > 0 || (__x) > 0) ?		\

		(((__x) + ((__d) / 2)) / (__d)) :	\

		(((__x) - ((__d) / 2)) / (__d));	\

}							\

CRA Git | Maintained and supported by SUSTech CRA and CCSE