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

Commit c828a892 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

treewide: Use DEVICE_ATTR_RO 



Convert DEVICE_ATTR uses to DEVICE_ATTR_RO where possible.

Done with perl script:

$ git grep -w --name-only DEVICE_ATTR | \
  xargs perl -i -e 'local $/; while (<>) { s/\bDEVICE_ATTR\s*\(\s*(\w+)\s*,\s*\(?(?:\s*S_IRUGO\s*|\s*0444\s*)\)?\s*,\s*\1_show\s*,\s*NULL\s*\)/DEVICE_ATTR_RO(\1)/g; print;}'

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Acked-by: default avatarSagi Grimberg <sagi@grimberg.me>
Acked-by: default avatarZhang Rui <rui.zhang@intel.com>
Acked-by: default avatarHarald Freudenberger <freude@linux.vnet.ibm.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarCorey Minyard <cminyard@mvista.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b6b996b6

arch/arm/mach-pxa/sharpsl_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -802,8 +802,8 @@ static ssize_t battery_voltage_show(struct device *dev, struct device_attribute 
	return sprintf(buf, "%d\n", sharpsl_pm.battstat.mainbat_voltage);

}



static DEVICE_ATTR(battery_percentage, 0444, battery_percentage_show, NULL);

static DEVICE_ATTR(battery_voltage, 0444, battery_voltage_show, NULL);

static DEVICE_ATTR_RO(battery_percentage);

static DEVICE_ATTR_RO(battery_voltage);



extern void (*apm_get_power_status)(struct apm_power_info *);

arch/sh/drivers/push-switch.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static ssize_t switch_show(struct device *dev, 
	struct push_switch_platform_info *psw_info = dev->platform_data;

	return sprintf(buf, "%s\n", psw_info->name);

}

static DEVICE_ATTR(switch, S_IRUGO, switch_show, NULL);

static DEVICE_ATTR_RO(switch);



static void switch_timer(struct timer_list *t)

{

arch/tile/kernel/sysfs.c

+5 −5
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static ssize_t chip_width_show(struct device *dev, 
{

	return sprintf(page, "%u\n", smp_width);

}

static DEVICE_ATTR(chip_width, 0444, chip_width_show, NULL);

static DEVICE_ATTR_RO(chip_width);



static ssize_t chip_height_show(struct device *dev,

				struct device_attribute *attr,
@@ -46,7 +46,7 @@ static ssize_t chip_height_show(struct device *dev, 
{

	return sprintf(page, "%u\n", smp_height);

}

static DEVICE_ATTR(chip_height, 0444, chip_height_show, NULL);

static DEVICE_ATTR_RO(chip_height);



static ssize_t chip_serial_show(struct device *dev,

				struct device_attribute *attr,
@@ -54,7 +54,7 @@ static ssize_t chip_serial_show(struct device *dev, 
{

	return get_hv_confstr(page, HV_CONFSTR_CHIP_SERIAL_NUM);

}

static DEVICE_ATTR(chip_serial, 0444, chip_serial_show, NULL);

static DEVICE_ATTR_RO(chip_serial);



static ssize_t chip_revision_show(struct device *dev,

				  struct device_attribute *attr,
@@ -62,7 +62,7 @@ static ssize_t chip_revision_show(struct device *dev, 
{

	return get_hv_confstr(page, HV_CONFSTR_CHIP_REV);

}

static DEVICE_ATTR(chip_revision, 0444, chip_revision_show, NULL);

static DEVICE_ATTR_RO(chip_revision);





static ssize_t type_show(struct device *dev,
@@ -71,7 +71,7 @@ static ssize_t type_show(struct device *dev, 
{

	return sprintf(page, "tilera\n");

}

static DEVICE_ATTR(type, 0444, type_show, NULL);

static DEVICE_ATTR_RO(type);



#define HV_CONF_ATTR(name, conf)					\

	static ssize_t name ## _show(struct device *dev,		\

drivers/acpi/device_sysfs.c

+3 −3
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ static ssize_t real_power_state_show(struct device *dev, 
	return sprintf(buf, "%s\n", acpi_power_state_string(state));

}



static DEVICE_ATTR(real_power_state, 0444, real_power_state_show, NULL);

static DEVICE_ATTR_RO(real_power_state);



static ssize_t power_state_show(struct device *dev,

				struct device_attribute *attr, char *buf)
@@ -367,7 +367,7 @@ static ssize_t power_state_show(struct device *dev, 
	return sprintf(buf, "%s\n", acpi_power_state_string(adev->power.state));

}



static DEVICE_ATTR(power_state, 0444, power_state_show, NULL);

static DEVICE_ATTR_RO(power_state);



static ssize_t

acpi_eject_store(struct device *d, struct device_attribute *attr,
@@ -462,7 +462,7 @@ static ssize_t description_show(struct device *dev, 


	return result;

}

static DEVICE_ATTR(description, 0444, description_show, NULL);

static DEVICE_ATTR_RO(description);



static ssize_t

acpi_device_sun_show(struct device *dev, struct device_attribute *attr,

drivers/char/ipmi/ipmi_msghandler.c

+8 −9
Original line number Diff line number Diff line
@@ -2588,7 +2588,7 @@ static ssize_t device_id_show(struct device *dev, 


	return snprintf(buf, 10, "%u\n", id.device_id);

}

static DEVICE_ATTR(device_id, S_IRUGO, device_id_show, NULL);

static DEVICE_ATTR_RO(device_id);



static ssize_t provides_device_sdrs_show(struct device *dev,

					 struct device_attribute *attr,
@@ -2604,8 +2604,7 @@ static ssize_t provides_device_sdrs_show(struct device *dev, 


	return snprintf(buf, 10, "%u\n", (id.device_revision & 0x80) >> 7);

}

static DEVICE_ATTR(provides_device_sdrs, S_IRUGO, provides_device_sdrs_show,

		   NULL);

static DEVICE_ATTR_RO(provides_device_sdrs);



static ssize_t revision_show(struct device *dev, struct device_attribute *attr,

			     char *buf)
@@ -2620,7 +2619,7 @@ static ssize_t revision_show(struct device *dev, struct device_attribute *attr, 


	return snprintf(buf, 20, "%u\n", id.device_revision & 0x0F);

}

static DEVICE_ATTR(revision, S_IRUGO, revision_show, NULL);

static DEVICE_ATTR_RO(revision);



static ssize_t firmware_revision_show(struct device *dev,

				      struct device_attribute *attr,
@@ -2637,7 +2636,7 @@ static ssize_t firmware_revision_show(struct device *dev, 
	return snprintf(buf, 20, "%u.%x\n", id.firmware_revision_1,

			id.firmware_revision_2);

}

static DEVICE_ATTR(firmware_revision, S_IRUGO, firmware_revision_show, NULL);

static DEVICE_ATTR_RO(firmware_revision);



static ssize_t ipmi_version_show(struct device *dev,

				 struct device_attribute *attr,
@@ -2655,7 +2654,7 @@ static ssize_t ipmi_version_show(struct device *dev, 
			ipmi_version_major(&id),

			ipmi_version_minor(&id));

}

static DEVICE_ATTR(ipmi_version, S_IRUGO, ipmi_version_show, NULL);

static DEVICE_ATTR_RO(ipmi_version);



static ssize_t add_dev_support_show(struct device *dev,

				    struct device_attribute *attr,
@@ -2688,7 +2687,7 @@ static ssize_t manufacturer_id_show(struct device *dev, 


	return snprintf(buf, 20, "0x%6.6x\n", id.manufacturer_id);

}

static DEVICE_ATTR(manufacturer_id, S_IRUGO, manufacturer_id_show, NULL);

static DEVICE_ATTR_RO(manufacturer_id);



static ssize_t product_id_show(struct device *dev,

			       struct device_attribute *attr,
@@ -2704,7 +2703,7 @@ static ssize_t product_id_show(struct device *dev, 


	return snprintf(buf, 10, "0x%4.4x\n", id.product_id);

}

static DEVICE_ATTR(product_id, S_IRUGO, product_id_show, NULL);

static DEVICE_ATTR_RO(product_id);



static ssize_t aux_firmware_rev_show(struct device *dev,

				     struct device_attribute *attr,
@@ -2742,7 +2741,7 @@ static ssize_t guid_show(struct device *dev, struct device_attribute *attr, 


	return snprintf(buf, 38, "%pUl\n", guid.b);

}

static DEVICE_ATTR(guid, S_IRUGO, guid_show, NULL);

static DEVICE_ATTR_RO(guid);



static struct attribute *bmc_dev_attrs[] = {

	&dev_attr_device_id.attr,