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

Commit c21ee12f authored by Darren Hart (VMware)'s avatar Darren Hart (VMware)
Browse files

platform/x86: hp-wmi: Use DEVICE_ATTR_(RO|RW) helper macros 



Use the DEVICE_ATTR_(RO|RW) macros, ranaming the show and store
functions accordingly.

Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
Tested-by: default avatarCarlo Caione <carlo@endlessm.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
parent f9cf3b28

drivers/platform/x86/hp-wmi.c

+18 −18
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static int hp_wmi_rfkill2_refresh(void) 
	return 0;

}



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

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

			    char *buf)

{

	int value = hp_wmi_read_int(HPWMI_DISPLAY_QUERY);
@@ -412,7 +412,7 @@ static ssize_t show_display(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%d\n", value);

}



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

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

			    char *buf)

{

	int value = hp_wmi_read_int(HPWMI_HDDTEMP_QUERY);
@@ -421,7 +421,7 @@ static ssize_t show_hddtemp(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%d\n", value);

}



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

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

			char *buf)

{

	int value = hp_wmi_read_int(HPWMI_ALS_QUERY);
@@ -430,7 +430,7 @@ static ssize_t show_als(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%d\n", value);

}



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

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

			 char *buf)

{

	int value = hp_wmi_hw_state(HPWMI_DOCK_MASK);
@@ -439,7 +439,7 @@ static ssize_t show_dock(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%d\n", value);

}



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

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

			   char *buf)

{

	int value = hp_wmi_hw_state(HPWMI_TABLET_MASK);
@@ -448,7 +448,7 @@ static ssize_t show_tablet(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "%d\n", value);

}



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

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

			     char *buf)

{

	/* Get the POST error code of previous boot failure. */
@@ -458,7 +458,7 @@ static ssize_t show_postcode(struct device *dev, struct device_attribute *attr, 
	return sprintf(buf, "0x%x\n", value);

}



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

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

			 const char *buf, size_t count)

{

	u32 tmp = simple_strtoul(buf, NULL, 10);
@@ -470,7 +470,7 @@ static ssize_t set_als(struct device *dev, struct device_attribute *attr, 
	return count;

}



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

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

			      const char *buf, size_t count)

{

	long unsigned int tmp2;
@@ -491,12 +491,12 @@ static ssize_t set_postcode(struct device *dev, struct device_attribute *attr, 
	return count;

}



static DEVICE_ATTR(display, S_IRUGO, show_display, NULL);

static DEVICE_ATTR(hddtemp, S_IRUGO, show_hddtemp, NULL);

static DEVICE_ATTR(als, S_IRUGO | S_IWUSR, show_als, set_als);

static DEVICE_ATTR(dock, S_IRUGO, show_dock, NULL);

static DEVICE_ATTR(tablet, S_IRUGO, show_tablet, NULL);

static DEVICE_ATTR(postcode, S_IRUGO | S_IWUSR, show_postcode, set_postcode);

static DEVICE_ATTR_RO(display);

static DEVICE_ATTR_RO(hddtemp);

static DEVICE_ATTR_RW(als);

static DEVICE_ATTR_RO(dock);

static DEVICE_ATTR_RO(tablet);

static DEVICE_ATTR_RW(postcode);



static void hp_wmi_notify(u32 value, void *context)

{