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

Commit 1d240875 authored by Vivien Didelot's avatar Vivien Didelot Committed by Ingo Molnar
Browse files

x86/platform/ts5500: Use the DEVICE_ATTR_RO() macro 



Use the DEVICE_ATTR_RO() helper macro to simplify the declaration
of read-only sysfs attributes in the TS5500 code..

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Savoir-faire Linux Inc. <kernel@savoirfairelinux.com>
Link: http://lkml.kernel.org/r/1404860269-11837-2-git-send-email-vivien.didelot@savoirfairelinux.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1795cd9b

arch/x86/platform/ts5500/ts5500.c

+22 −28
Original line number Diff line number Diff line
@@ -147,45 +147,39 @@ static int __init ts5500_detect_config(struct ts5500_sbc *sbc) 
	return ret;

}



static ssize_t ts5500_show_id(struct device *dev,

			      struct device_attribute *attr, char *buf)

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

		char *buf)

{

	struct ts5500_sbc *sbc = dev_get_drvdata(dev);



	return sprintf(buf, "0x%.2x\n", sbc->id);

}

static DEVICE_ATTR_RO(id);



static ssize_t ts5500_show_jumpers(struct device *dev,

				   struct device_attribute *attr,

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

		char *buf)

{

	struct ts5500_sbc *sbc = dev_get_drvdata(dev);



	return sprintf(buf, "0x%.2x\n", sbc->jumpers >> 1);

}

static DEVICE_ATTR_RO(jumpers);



#define TS5500_SHOW(field)					\

	static ssize_t ts5500_show_##field(struct device *dev,	\

			struct device_attribute *attr,		\

			char *buf)				\

#define TS5500_ATTR_BOOL(_field)					\

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

			struct device_attribute *attr, char *buf)	\

	{								\

		struct ts5500_sbc *sbc = dev_get_drvdata(dev);		\

		return sprintf(buf, "%d\n", sbc->field);	\

	}



TS5500_SHOW(sram)

TS5500_SHOW(rs485)

TS5500_SHOW(adc)

TS5500_SHOW(ereset)

TS5500_SHOW(itr)



static DEVICE_ATTR(id, S_IRUGO, ts5500_show_id, NULL);

static DEVICE_ATTR(jumpers, S_IRUGO, ts5500_show_jumpers, NULL);

static DEVICE_ATTR(sram, S_IRUGO, ts5500_show_sram, NULL);

static DEVICE_ATTR(rs485, S_IRUGO, ts5500_show_rs485, NULL);

static DEVICE_ATTR(adc, S_IRUGO, ts5500_show_adc, NULL);

static DEVICE_ATTR(ereset, S_IRUGO, ts5500_show_ereset, NULL);

static DEVICE_ATTR(itr, S_IRUGO, ts5500_show_itr, NULL);

									\

		return sprintf(buf, "%d\n", sbc->_field);		\

	}								\

	static DEVICE_ATTR_RO(_field)



TS5500_ATTR_BOOL(sram);

TS5500_ATTR_BOOL(rs485);

TS5500_ATTR_BOOL(adc);

TS5500_ATTR_BOOL(ereset);

TS5500_ATTR_BOOL(itr);



static struct attribute *ts5500_attributes[] = {

	&dev_attr_id.attr,