Commit c9be0a36 authored by Andi Kleen's avatar Andi Kleen Committed by Greg Kroah-Hartman
Browse files

sysdev: Pass attribute in sysdev_class attributes show/store 



Passing the attribute to the low level IO functions allows all kinds
of cleanups, by sharing low level IO code without requiring
an own function for every piece of data.

Also drivers can extend the attributes with own data fields
and use that in the low level function.

Similar to sysdev_attributes and normal attributes.

This is a tree-wide sweep, converting everything in one go.

No functional changes in this patch other than passing the new
argument everywhere.

Tested on x86, the non x86 parts are uncompiled.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3d03ba4d

arch/mips/txx9/generic/7segled.c

+4 −1
Original line number Diff line number Diff line
@@ -58,13 +58,16 @@ static ssize_t raw_store(struct sys_device *dev, 
static SYSDEV_ATTR(ascii, 0200, NULL, ascii_store);

static SYSDEV_ATTR(raw, 0200, NULL, raw_store);



static ssize_t map_seg7_show(struct sysdev_class *class, char *buf)

static ssize_t map_seg7_show(struct sysdev_class *class,

			     struct sysdev_class_attribute *attr,

			     char *buf)

{

	memcpy(buf, &txx9_seg7map, sizeof(txx9_seg7map));

	return sizeof(txx9_seg7map);

}



static ssize_t map_seg7_store(struct sysdev_class *class,

			      struct sysdev_class_attribute *attr,

			      const char *buf, size_t size)

{

	if (size != sizeof(txx9_seg7map))

arch/s390/kernel/smp.c

+6 −2
Original line number Diff line number Diff line
@@ -1020,7 +1020,9 @@ out: 
	return rc;

}



static ssize_t __ref rescan_store(struct sysdev_class *class, const char *buf,

static ssize_t __ref rescan_store(struct sysdev_class *class,

				  struct sysdev_class_attribute *attr,

				  const char *buf,

				  size_t count)

{

	int rc;
@@ -1041,7 +1043,9 @@ static ssize_t dispatching_show(struct sysdev_class *class, char *buf) 
	return count;

}



static ssize_t dispatching_store(struct sysdev_class *dev, const char *buf,

static ssize_t dispatching_store(struct sysdev_class *dev,

				 struct sysdev_class_attribute *attr,

				 const char *buf,

				 size_t count)

{

	int val, rc;

arch/s390/kernel/time.c

+37 −12
Original line number Diff line number Diff line
@@ -1116,14 +1116,18 @@ static struct sys_device etr_port1_dev = { 
/*

 * ETR class attributes

 */

static ssize_t etr_stepping_port_show(struct sysdev_class *class, char *buf)

static ssize_t etr_stepping_port_show(struct sysdev_class *class,

					struct sysdev_class_attribute *attr,

					char *buf)

{

	return sprintf(buf, "%i\n", etr_port0.esw.p);

}



static SYSDEV_CLASS_ATTR(stepping_port, 0400, etr_stepping_port_show, NULL);



static ssize_t etr_stepping_mode_show(struct sysdev_class *class, char *buf)

static ssize_t etr_stepping_mode_show(struct sysdev_class *class,

				      	struct sysdev_class_attribute *attr,

					char *buf)

{

	char *mode_str;
@@ -1584,7 +1588,9 @@ static struct sysdev_class stp_sysclass = { 
	.name	= "stp",

};



static ssize_t stp_ctn_id_show(struct sysdev_class *class, char *buf)

static ssize_t stp_ctn_id_show(struct sysdev_class *class,

				struct sysdev_class_attribute *attr,

				char *buf)

{

	if (!stp_online)

		return -ENODATA;
@@ -1594,7 +1600,9 @@ static ssize_t stp_ctn_id_show(struct sysdev_class *class, char *buf) 


static SYSDEV_CLASS_ATTR(ctn_id, 0400, stp_ctn_id_show, NULL);



static ssize_t stp_ctn_type_show(struct sysdev_class *class, char *buf)

static ssize_t stp_ctn_type_show(struct sysdev_class *class,

				struct sysdev_class_attribute *attr,

				char *buf)

{

	if (!stp_online)

		return -ENODATA;
@@ -1603,7 +1611,9 @@ static ssize_t stp_ctn_type_show(struct sysdev_class *class, char *buf) 


static SYSDEV_CLASS_ATTR(ctn_type, 0400, stp_ctn_type_show, NULL);



static ssize_t stp_dst_offset_show(struct sysdev_class *class, char *buf)

static ssize_t stp_dst_offset_show(struct sysdev_class *class,

				   struct sysdev_class_attribute *attr,

				   char *buf)

{

	if (!stp_online || !(stp_info.vbits & 0x2000))

		return -ENODATA;
@@ -1612,7 +1622,9 @@ static ssize_t stp_dst_offset_show(struct sysdev_class *class, char *buf) 


static SYSDEV_CLASS_ATTR(dst_offset, 0400, stp_dst_offset_show, NULL);



static ssize_t stp_leap_seconds_show(struct sysdev_class *class, char *buf)

static ssize_t stp_leap_seconds_show(struct sysdev_class *class,

					struct sysdev_class_attribute *attr,

					char *buf)

{

	if (!stp_online || !(stp_info.vbits & 0x8000))

		return -ENODATA;
@@ -1621,7 +1633,9 @@ static ssize_t stp_leap_seconds_show(struct sysdev_class *class, char *buf) 


static SYSDEV_CLASS_ATTR(leap_seconds, 0400, stp_leap_seconds_show, NULL);



static ssize_t stp_stratum_show(struct sysdev_class *class, char *buf)

static ssize_t stp_stratum_show(struct sysdev_class *class,

				struct sysdev_class_attribute *attr,

				char *buf)

{

	if (!stp_online)

		return -ENODATA;
@@ -1630,7 +1644,9 @@ static ssize_t stp_stratum_show(struct sysdev_class *class, char *buf) 


static SYSDEV_CLASS_ATTR(stratum, 0400, stp_stratum_show, NULL);



static ssize_t stp_time_offset_show(struct sysdev_class *class, char *buf)

static ssize_t stp_time_offset_show(struct sysdev_class *class,

				struct sysdev_class_attribute *attr,

				char *buf)

{

	if (!stp_online || !(stp_info.vbits & 0x0800))

		return -ENODATA;
@@ -1639,7 +1655,9 @@ static ssize_t stp_time_offset_show(struct sysdev_class *class, char *buf) 


static SYSDEV_CLASS_ATTR(time_offset, 0400, stp_time_offset_show, NULL);



static ssize_t stp_time_zone_offset_show(struct sysdev_class *class, char *buf)

static ssize_t stp_time_zone_offset_show(struct sysdev_class *class,

				struct sysdev_class_attribute *attr,

				char *buf)

{

	if (!stp_online || !(stp_info.vbits & 0x4000))

		return -ENODATA;
@@ -1649,7 +1667,9 @@ static ssize_t stp_time_zone_offset_show(struct sysdev_class *class, char *buf) 
static SYSDEV_CLASS_ATTR(time_zone_offset, 0400,

			 stp_time_zone_offset_show, NULL);



static ssize_t stp_timing_mode_show(struct sysdev_class *class, char *buf)

static ssize_t stp_timing_mode_show(struct sysdev_class *class,

				struct sysdev_class_attribute *attr,

				char *buf)

{

	if (!stp_online)

		return -ENODATA;
@@ -1658,7 +1678,9 @@ static ssize_t stp_timing_mode_show(struct sysdev_class *class, char *buf) 


static SYSDEV_CLASS_ATTR(timing_mode, 0400, stp_timing_mode_show, NULL);



static ssize_t stp_timing_state_show(struct sysdev_class *class, char *buf)

static ssize_t stp_timing_state_show(struct sysdev_class *class,

				struct sysdev_class_attribute *attr,

				char *buf)

{

	if (!stp_online)

		return -ENODATA;
@@ -1667,12 +1689,15 @@ static ssize_t stp_timing_state_show(struct sysdev_class *class, char *buf) 


static SYSDEV_CLASS_ATTR(timing_state, 0400, stp_timing_state_show, NULL);



static ssize_t stp_online_show(struct sysdev_class *class, char *buf)

static ssize_t stp_online_show(struct sysdev_class *class,

				struct sysdev_class_attribute *attr,

				char *buf)

{

	return sprintf(buf, "%i\n", stp_online);

}



static ssize_t stp_online_store(struct sysdev_class *class,

				struct sysdev_class_attribute *attr,

				const char *buf, size_t count)

{

	unsigned int value;

drivers/base/cpu.c

+6 −3
Original line number Diff line number Diff line
@@ -151,7 +151,8 @@ static ssize_t print_cpus_map(char *buf, const struct cpumask *map) 
}



#define	print_cpus_func(type) \

static ssize_t print_cpus_##type(struct sysdev_class *class, char *buf)	\

static ssize_t print_cpus_##type(struct sysdev_class *class, 		\

	 		struct sysdev_class_attribute *attr, char *buf)	\

{									\

	return print_cpus_map(buf, cpu_##type##_mask);			\

}									\
@@ -165,7 +166,8 @@ print_cpus_func(present); 
/*

 * Print values for NR_CPUS and offlined cpus

 */

static ssize_t print_cpus_kernel_max(struct sysdev_class *class, char *buf)

static ssize_t print_cpus_kernel_max(struct sysdev_class *class,

				     struct sysdev_class_attribute *attr, char *buf)

{

	int n = snprintf(buf, PAGE_SIZE-2, "%d\n", NR_CPUS - 1);

	return n;
@@ -175,7 +177,8 @@ static SYSDEV_CLASS_ATTR(kernel_max, 0444, print_cpus_kernel_max, NULL); 
/* arch-optional setting to enable display of offline cpus >= nr_cpu_ids */

unsigned int total_cpus;



static ssize_t print_cpus_offline(struct sysdev_class *class, char *buf)

static ssize_t print_cpus_offline(struct sysdev_class *class,

				  struct sysdev_class_attribute *attr, char *buf)

{

	int n = 0, len = PAGE_SIZE-2;

	cpumask_var_t offline;

drivers/base/node.c

+12 −5
Original line number Diff line number Diff line
@@ -544,23 +544,29 @@ static ssize_t print_nodes_state(enum node_states state, char *buf) 
	return n;

}



static ssize_t print_nodes_possible(struct sysdev_class *class, char *buf)

static ssize_t print_nodes_possible(struct sysdev_class *class,

				    struct sysdev_class_attribute *attr, char *buf)

{

	return print_nodes_state(N_POSSIBLE, buf);

}



static ssize_t print_nodes_online(struct sysdev_class *class, char *buf)

static ssize_t print_nodes_online(struct sysdev_class *class,

				  struct sysdev_class_attribute *attr,

				  char *buf)

{

	return print_nodes_state(N_ONLINE, buf);

}



static ssize_t print_nodes_has_normal_memory(struct sysdev_class *class,

					     struct sysdev_class_attribute *attr,

					     char *buf)

{

	return print_nodes_state(N_NORMAL_MEMORY, buf);

}



static ssize_t print_nodes_has_cpu(struct sysdev_class *class, char *buf)

static ssize_t print_nodes_has_cpu(struct sysdev_class *class,

				   struct sysdev_class_attribute *attr,

				   char *buf)

{

	return print_nodes_state(N_CPU, buf);

}
@@ -573,6 +579,7 @@ static SYSDEV_CLASS_ATTR(has_cpu, 0444, print_nodes_has_cpu, NULL); 


#ifdef CONFIG_HIGHMEM

static ssize_t print_nodes_has_high_memory(struct sysdev_class *class,

					   struct sysdev_class_attribute *attr,

					   char *buf)

{

	return print_nodes_state(N_HIGH_MEMORY, buf);

CRA Git | Maintained and supported by SUSTech CRA and CCSE