diff options
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/cpqphp_sysfs.c | 4 | ||||
-rw-r--r-- | drivers/pci/hotplug/shpchp_sysfs.c | 4 | ||||
-rw-r--r-- | drivers/pci/pci-sysfs.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/pci/hotplug/cpqphp_sysfs.c b/drivers/pci/hotplug/cpqphp_sysfs.c index 41c7971d06c5..4c11048ad51b 100644 --- a/drivers/pci/hotplug/cpqphp_sysfs.c +++ b/drivers/pci/hotplug/cpqphp_sysfs.c | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | /* A few routines that create sysfs entries for the hot plug controller */ | 39 | /* A few routines that create sysfs entries for the hot plug controller */ |
40 | 40 | ||
41 | static ssize_t show_ctrl (struct device *dev, char *buf) | 41 | static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, char *buf) |
42 | { | 42 | { |
43 | struct pci_dev *pci_dev; | 43 | struct pci_dev *pci_dev; |
44 | struct controller *ctrl; | 44 | struct controller *ctrl; |
@@ -82,7 +82,7 @@ static ssize_t show_ctrl (struct device *dev, char *buf) | |||
82 | } | 82 | } |
83 | static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL); | 83 | static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL); |
84 | 84 | ||
85 | static ssize_t show_dev (struct device *dev, char *buf) | 85 | static ssize_t show_dev (struct device *dev, struct device_attribute *attr, char *buf) |
86 | { | 86 | { |
87 | struct pci_dev *pci_dev; | 87 | struct pci_dev *pci_dev; |
88 | struct controller *ctrl; | 88 | struct controller *ctrl; |
diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpchp_sysfs.c index 9a1ee132d12c..c9445ebda5c7 100644 --- a/drivers/pci/hotplug/shpchp_sysfs.c +++ b/drivers/pci/hotplug/shpchp_sysfs.c | |||
@@ -38,7 +38,7 @@ | |||
38 | 38 | ||
39 | /* A few routines that create sysfs entries for the hot plug controller */ | 39 | /* A few routines that create sysfs entries for the hot plug controller */ |
40 | 40 | ||
41 | static ssize_t show_ctrl (struct device *dev, char *buf) | 41 | static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, char *buf) |
42 | { | 42 | { |
43 | struct pci_dev *pci_dev; | 43 | struct pci_dev *pci_dev; |
44 | struct controller *ctrl; | 44 | struct controller *ctrl; |
@@ -82,7 +82,7 @@ static ssize_t show_ctrl (struct device *dev, char *buf) | |||
82 | } | 82 | } |
83 | static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL); | 83 | static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL); |
84 | 84 | ||
85 | static ssize_t show_dev (struct device *dev, char *buf) | 85 | static ssize_t show_dev (struct device *dev, struct device_attribute *attr, char *buf) |
86 | { | 86 | { |
87 | struct pci_dev *pci_dev; | 87 | struct pci_dev *pci_dev; |
88 | struct controller *ctrl; | 88 | struct controller *ctrl; |
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index e8aad151175f..8b79609a3a03 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c | |||
@@ -29,7 +29,7 @@ static int sysfs_initialized; /* = 0 */ | |||
29 | /* show configuration fields */ | 29 | /* show configuration fields */ |
30 | #define pci_config_attr(field, format_string) \ | 30 | #define pci_config_attr(field, format_string) \ |
31 | static ssize_t \ | 31 | static ssize_t \ |
32 | field##_show(struct device *dev, char *buf) \ | 32 | field##_show(struct device *dev, struct device_attribute *attr, char *buf) \ |
33 | { \ | 33 | { \ |
34 | struct pci_dev *pdev; \ | 34 | struct pci_dev *pdev; \ |
35 | \ | 35 | \ |
@@ -44,7 +44,7 @@ pci_config_attr(subsystem_device, "0x%04x\n"); | |||
44 | pci_config_attr(class, "0x%06x\n"); | 44 | pci_config_attr(class, "0x%06x\n"); |
45 | pci_config_attr(irq, "%u\n"); | 45 | pci_config_attr(irq, "%u\n"); |
46 | 46 | ||
47 | static ssize_t local_cpus_show(struct device *dev, char *buf) | 47 | static ssize_t local_cpus_show(struct device *dev, struct device_attribute *attr, char *buf) |
48 | { | 48 | { |
49 | cpumask_t mask = pcibus_to_cpumask(to_pci_dev(dev)->bus); | 49 | cpumask_t mask = pcibus_to_cpumask(to_pci_dev(dev)->bus); |
50 | int len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask); | 50 | int len = cpumask_scnprintf(buf, PAGE_SIZE-2, mask); |
@@ -54,7 +54,7 @@ static ssize_t local_cpus_show(struct device *dev, char *buf) | |||
54 | 54 | ||
55 | /* show resources */ | 55 | /* show resources */ |
56 | static ssize_t | 56 | static ssize_t |
57 | resource_show(struct device * dev, char * buf) | 57 | resource_show(struct device * dev, struct device_attribute *attr, char * buf) |
58 | { | 58 | { |
59 | struct pci_dev * pci_dev = to_pci_dev(dev); | 59 | struct pci_dev * pci_dev = to_pci_dev(dev); |
60 | char * str = buf; | 60 | char * str = buf; |