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

Commit 34b51f39 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

dmi-id: Possible cleanup 



The DEFINE_DMI_ATTR macro has a single user left so we can expand it
for slightly shorter/simpler code.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarLennart Poettering <mzxreary@0pointer.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 63744756

drivers/firmware/dmi-id.c

+2 −5
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ struct dmi_device_attribute{ 
#define to_dmi_dev_attr(_dev_attr) \

	container_of(_dev_attr, struct dmi_device_attribute, dev_attr)



#define DEFINE_DMI_ATTR(_name, _mode, _show)		\

static struct device_attribute sys_dmi_##_name##_attr =	\

	__ATTR(_name, _mode, _show, NULL);



static ssize_t sys_dmi_field_show(struct device *dev,

				  struct device_attribute *attr,

				  char *page)
@@ -135,7 +131,8 @@ static ssize_t sys_dmi_modalias_show(struct device *dev, 
	return r+1;

}



DEFINE_DMI_ATTR(modalias, 0444, sys_dmi_modalias_show);

static struct device_attribute sys_dmi_modalias_attr =

	__ATTR(modalias, 0444, sys_dmi_modalias_show, NULL);



static struct attribute *sys_dmi_attributes[DMI_STRING_MAX+2];