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

Commit b346953d authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/pci: use macro for attribute creation 



Introduce the zpci_attr macro to create read only sysfs attributes
to avoid duplicate code.

Reviewed-by: default avatarGerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent ca25f564

arch/s390/pci/pci_sysfs.c

+17 −38
Original line number Original line Diff line number Diff line
@@ -12,43 +12,22 @@ 
#include <linux/stat.h>

#include <linux/stat.h>

#include <linux/pci.h>

#include <linux/pci.h>





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

#define zpci_attr(name, fmt, member)					\

			char *buf)

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

{

			   struct device_attribute *attr, char *buf)	\

	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));

{									\



	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));		\

	return sprintf(buf, "0x%08x\n", zdev->fid);

									\

}

	return sprintf(buf, fmt, zdev->member);				\

static DEVICE_ATTR(function_id, S_IRUGO, show_fid, NULL);

}									\



static DEVICE_ATTR_RO(name)

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



		       char *buf)

zpci_attr(function_id, "0x%08x\n", fid);

{

zpci_attr(function_handle, "0x%08x\n", fh);

	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));

zpci_attr(pchid, "0x%04x\n", pchid);



zpci_attr(pfgid, "0x%02x\n", pfgid);

	return sprintf(buf, "0x%08x\n", zdev->fh);



}

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

static DEVICE_ATTR(function_handle, S_IRUGO, show_fh, NULL);



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

			  char *buf)

{

	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));



	return sprintf(buf, "0x%04x\n", zdev->pchid);

}

static DEVICE_ATTR(pchid, S_IRUGO, show_pchid, NULL);



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

			  char *buf)

{

	struct zpci_dev *zdev = get_zdev(to_pci_dev(dev));



	return sprintf(buf, "0x%02x\n", zdev->pfgid);

}

static DEVICE_ATTR(pfgid, S_IRUGO, show_pfgid, NULL);



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

			     const char *buf, size_t count)

			     const char *buf, size_t count)

{

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct pci_dev *pdev = to_pci_dev(dev);
@@ -70,7 +49,7 @@ static ssize_t store_recover(struct device *dev, struct device_attribute *attr, 
	pci_rescan_bus(zdev->bus);

	pci_rescan_bus(zdev->bus);

	return count;

	return count;

}

}

static DEVICE_ATTR(recover, S_IWUSR, NULL, store_recover);

static DEVICE_ATTR_WO(recover);





static struct device_attribute *zpci_dev_attrs[] = {

static struct device_attribute *zpci_dev_attrs[] = {

	&dev_attr_function_id,

	&dev_attr_function_id,