Merge branch 'pci/misc' into next

[~andy/linux] / drivers / pci / pci-sysfs.c

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index d9252dd89ea9d61a43d399bd912c1cf5f155989d..2aaa83c85a4edbfa9d587b05a79507292ea7c751 100644 (file)
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -42,7 +42,8 @@ field##_show(struct device *dev, struct device_attribute *attr, char *buf)                            \
                                                                        \
        pdev = to_pci_dev (dev);                                        \
        return sprintf (buf, format_string, pdev->field);               \
-}
+}                                                                      \
+static DEVICE_ATTR_RO(field)
 
 pci_config_attr(vendor, "0x%04x\n");
 pci_config_attr(device, "0x%04x\n");
@@ -73,6 +74,7 @@ static ssize_t broken_parity_status_store(struct device *dev,
 
        return count;
 }
+static DEVICE_ATTR_RW(broken_parity_status);
 
 static ssize_t pci_dev_show_local_cpu(struct device *dev,
                int type,
@@ -102,12 +104,14 @@ static ssize_t local_cpus_show(struct device *dev,
 {
        return pci_dev_show_local_cpu(dev, 1, attr, buf);
 }
+static DEVICE_ATTR_RO(local_cpus);
 
 static ssize_t local_cpulist_show(struct device *dev,
                        struct device_attribute *attr, char *buf)
 {
        return pci_dev_show_local_cpu(dev, 0, attr, buf);
 }
+static DEVICE_ATTR_RO(local_cpulist);
 
 /*
  * PCI Bus Class Devices
@@ -168,6 +172,7 @@ resource_show(struct device * dev, struct device_attribute *attr, char * buf)
        }
        return (str - buf);
 }
+static DEVICE_ATTR_RO(resource);
 
 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
@@ -179,10 +184,11 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
                       (u8)(pci_dev->class >> 16), (u8)(pci_dev->class >> 8),
                       (u8)(pci_dev->class));
 }
+static DEVICE_ATTR_RO(modalias);
 
-static ssize_t is_enabled_store(struct device *dev,
-                               struct device_attribute *attr, const char *buf,
-                               size_t count)
+static ssize_t enabled_store(struct device *dev,
+                            struct device_attribute *attr, const char *buf,
+                            size_t count)
 {
        struct pci_dev *pdev = to_pci_dev(dev);
        unsigned long val;
@@ -206,14 +212,15 @@ static ssize_t is_enabled_store(struct device *dev,
        return result < 0 ? result : count;
 }
 
-static ssize_t is_enabled_show(struct device *dev,
-                              struct device_attribute *attr, char *buf)
+static ssize_t enabled_show(struct device *dev,
+                           struct device_attribute *attr, char *buf)
 {
        struct pci_dev *pdev;
 
        pdev = to_pci_dev (dev);
        return sprintf (buf, "%u\n", atomic_read(&pdev->enable_cnt));
 }
+static DEVICE_ATTR_RW(enabled);
 
 #ifdef CONFIG_NUMA
 static ssize_t
@@ -221,6 +228,7 @@ numa_node_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
        return sprintf (buf, "%d\n", dev->numa_node);
 }
+static DEVICE_ATTR_RO(numa_node);
 #endif
 
 static ssize_t
@@ -230,6 +238,7 @@ dma_mask_bits_show(struct device *dev, struct device_attribute *attr, char *buf)
 
        return sprintf (buf, "%d\n", fls64(pdev->dma_mask));
 }
+static DEVICE_ATTR_RO(dma_mask_bits);
 
 static ssize_t
 consistent_dma_mask_bits_show(struct device *dev, struct device_attribute *attr,
@@ -237,6 +246,7 @@ consistent_dma_mask_bits_show(struct device *dev, struct device_attribute *attr,
 {
        return sprintf (buf, "%d\n", fls64(dev->coherent_dma_mask));
 }
+static DEVICE_ATTR_RO(consistent_dma_mask_bits);
 
 static ssize_t
 msi_bus_show(struct device *dev, struct device_attribute *attr, char *buf)
@@ -281,6 +291,7 @@ msi_bus_store(struct device *dev, struct device_attribute *attr,
 
        return count;
 }
+static DEVICE_ATTR_RW(msi_bus);
 
 static DEFINE_MUTEX(pci_remove_rescan_mutex);
 static ssize_t bus_rescan_store(struct bus_type *bus, const char *buf,
@@ -300,10 +311,20 @@ static ssize_t bus_rescan_store(struct bus_type *bus, const char *buf,
        }
        return count;
 }
+static BUS_ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, bus_rescan_store);
+
+static struct attribute *pci_bus_attrs[] = {
+       &bus_attr_rescan.attr,
+       NULL,
+};
+
+static const struct attribute_group pci_bus_group = {
+       .attrs = pci_bus_attrs,
+};
 
-struct bus_attribute pci_bus_attrs[] = {
-       __ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, bus_rescan_store),
-       __ATTR_NULL
+const struct attribute_group *pci_bus_groups[] = {
+       &pci_bus_group,
+       NULL,
 };
 
 static ssize_t
@@ -323,8 +344,9 @@ dev_rescan_store(struct device *dev, struct device_attribute *attr,
        }
        return count;
 }
-struct device_attribute dev_rescan_attr = __ATTR(rescan, (S_IWUSR|S_IWGRP),
-                                                NULL, dev_rescan_store);
+static struct device_attribute dev_rescan_attr = __ATTR(rescan,
+                                                       (S_IWUSR|S_IWGRP),
+                                                       NULL, dev_rescan_store);
 
 static void remove_callback(struct device *dev)
 {
@@ -354,8 +376,9 @@ remove_store(struct device *dev, struct device_attribute *dummy,
                count = ret;
        return count;
 }
-struct device_attribute dev_remove_attr = __ATTR(remove, (S_IWUSR|S_IWGRP),
-                                                NULL, remove_store);
+static struct device_attribute dev_remove_attr = __ATTR(remove,
+                                                       (S_IWUSR|S_IWGRP),
+                                                       NULL, remove_store);
 
 static ssize_t
 dev_bus_rescan_store(struct device *dev, struct device_attribute *attr,
@@ -402,6 +425,7 @@ static ssize_t d3cold_allowed_show(struct device *dev,
        struct pci_dev *pdev = to_pci_dev(dev);
        return sprintf (buf, "%u\n", pdev->d3cold_allowed);
 }
+static DEVICE_ATTR_RW(d3cold_allowed);
 #endif
 
 #ifdef CONFIG_PCI_IOV
@@ -487,30 +511,38 @@ static struct device_attribute sriov_numvfs_attr =
                       sriov_numvfs_show, sriov_numvfs_store);
 #endif /* CONFIG_PCI_IOV */
 
-struct device_attribute pci_dev_attrs[] = {
-       __ATTR_RO(resource),
-       __ATTR_RO(vendor),
-       __ATTR_RO(device),
-       __ATTR_RO(subsystem_vendor),
-       __ATTR_RO(subsystem_device),
-       __ATTR_RO(class),
-       __ATTR_RO(irq),
-       __ATTR_RO(local_cpus),
-       __ATTR_RO(local_cpulist),
-       __ATTR_RO(modalias),
+static struct attribute *pci_dev_attrs[] = {
+       &dev_attr_resource.attr,
+       &dev_attr_vendor.attr,
+       &dev_attr_device.attr,
+       &dev_attr_subsystem_vendor.attr,
+       &dev_attr_subsystem_device.attr,
+       &dev_attr_class.attr,
+       &dev_attr_irq.attr,
+       &dev_attr_local_cpus.attr,
+       &dev_attr_local_cpulist.attr,
+       &dev_attr_modalias.attr,
 #ifdef CONFIG_NUMA
-       __ATTR_RO(numa_node),
+       &dev_attr_numa_node.attr,
 #endif
-       __ATTR_RO(dma_mask_bits),
-       __ATTR_RO(consistent_dma_mask_bits),
-       __ATTR(enable, 0600, is_enabled_show, is_enabled_store),
-       __ATTR(broken_parity_status,(S_IRUGO|S_IWUSR),
-               broken_parity_status_show,broken_parity_status_store),
-       __ATTR(msi_bus, 0644, msi_bus_show, msi_bus_store),
+       &dev_attr_dma_mask_bits.attr,
+       &dev_attr_consistent_dma_mask_bits.attr,
+       &dev_attr_enabled.attr,
+       &dev_attr_broken_parity_status.attr,
+       &dev_attr_msi_bus.attr,
 #if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)
-       __ATTR(d3cold_allowed, 0644, d3cold_allowed_show, d3cold_allowed_store),
+       &dev_attr_d3cold_allowed.attr,
 #endif
-       __ATTR_NULL,
+       NULL,
+};
+
+static const struct attribute_group pci_dev_group = {
+       .attrs = pci_dev_attrs,
+};
+
+const struct attribute_group *pci_dev_groups[] = {
+       &pci_dev_group,
+       NULL,
 };
 
 static struct attribute *pcibus_attrs[] = {
@@ -542,7 +574,7 @@ boot_vga_show(struct device *dev, struct device_attribute *attr, char *buf)
                !!(pdev->resource[PCI_ROM_RESOURCE].flags &
                   IORESOURCE_ROM_SHADOW));
 }
-struct device_attribute vga_attr = __ATTR_RO(boot_vga);
+static struct device_attribute vga_attr = __ATTR_RO(boot_vga);
 
 static ssize_t
 pci_read_config(struct file *filp, struct kobject *kobj,