diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-06 14:45:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-06 14:45:51 +0200 |
| commit | 6e287ace225948565fdcbe3c5cc75d3843af79d0 (patch) | |
| tree | c8da80c9a0686704f6abacaf5677087bff5e8370 /p18.patch | |
| parent | 40a2bc5b5c03c7219f40be1f5be51089a156b974 (diff) | |
| download | patches-6e287ace225948565fdcbe3c5cc75d3843af79d0.tar.gz | |
cleaned up the bus_type.dev_attrs patch series
Diffstat (limited to 'p18.patch')
| -rw-r--r-- | p18.patch | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/p18.patch b/p18.patch deleted file mode 100644 index 131a0ad359c701..00000000000000 --- a/p18.patch +++ /dev/null @@ -1,95 +0,0 @@ - - - ---- - arch/arm/mach-rpc/ecard.c | 38 ++++++++++++++++++++++---------------- - 1 file changed, 22 insertions(+), 16 deletions(-) - ---- a/arch/arm/mach-rpc/ecard.c -+++ b/arch/arm/mach-rpc/ecard.c -@@ -761,19 +761,21 @@ static struct expansion_card *__init eca - return ec; - } - --static ssize_t ecard_show_irq(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t irq_show(struct device *dev, struct device_attribute *attr, char *buf) - { - struct expansion_card *ec = ECARD_DEV(dev); - return sprintf(buf, "%u\n", ec->irq); - } -+static DEVICE_ATTR_RO(irq); - --static ssize_t ecard_show_dma(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t dma_show(struct device *dev, struct device_attribute *attr, char *buf) - { - struct expansion_card *ec = ECARD_DEV(dev); - return sprintf(buf, "%u\n", ec->dma); - } -+static DEVICE_ATTR_RO(dma); - --static ssize_t ecard_show_resources(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t resource_show(struct device *dev, struct device_attribute *attr, char *buf) - { - struct expansion_card *ec = ECARD_DEV(dev); - char *str = buf; -@@ -787,35 +789,39 @@ static ssize_t ecard_show_resources(stru - - return str - buf; - } -+static DEVICE_ATTR_RO(resource_show) - --static ssize_t ecard_show_vendor(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t vendor_show(struct device *dev, struct device_attribute *attr, char *buf) - { - struct expansion_card *ec = ECARD_DEV(dev); - return sprintf(buf, "%u\n", ec->cid.manufacturer); - } -+static DEVICE_ATTR_RO(vendor); - --static ssize_t ecard_show_device(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t device_show(struct device *dev, struct device_attribute *attr, char *buf) - { - struct expansion_card *ec = ECARD_DEV(dev); - return sprintf(buf, "%u\n", ec->cid.product); - } -+static DEVICE_ATTR_RO(device); - --static ssize_t ecard_show_type(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t type_show(struct device *dev, struct device_attribute *attr, char *buf) - { - struct expansion_card *ec = ECARD_DEV(dev); - return sprintf(buf, "%s\n", ec->easi ? "EASI" : "IOC"); - } -+static DEVICE_ATTR_RO(type); - --static struct device_attribute ecard_dev_attrs[] = { -- __ATTR(device, S_IRUGO, ecard_show_device, NULL), -- __ATTR(dma, S_IRUGO, ecard_show_dma, NULL), -- __ATTR(irq, S_IRUGO, ecard_show_irq, NULL), -- __ATTR(resource, S_IRUGO, ecard_show_resources, NULL), -- __ATTR(type, S_IRUGO, ecard_show_type, NULL), -- __ATTR(vendor, S_IRUGO, ecard_show_vendor, NULL), -- __ATTR_NULL, -+static struct attribute *ecard_dev_attrs[] = { -+ &dev_attr_device.attr, -+ &dev_attr_dma.attr, -+ &dev_attr_irq.attr, -+ &dev_attr_resource.attr, -+ &dev_attr_type.attr, -+ &dev_attr_vendor.attr, -+ NULL, - }; -- -+ATTRIBUTE_GROUPS(ecard_dev); - - int ecard_request_resources(struct expansion_card *ec) - { -@@ -1120,7 +1126,7 @@ static int ecard_match(struct device *_d - - struct bus_type ecard_bus_type = { - .name = "ecard", -- .dev_attrs = ecard_dev_attrs, -+ .dev_groups = ecard_dev_groups, - .match = ecard_match, - .probe = ecard_drv_probe, - .remove = ecard_drv_remove, |