diff options
Diffstat (limited to 'drivers/pci/hotplug')
-rw-r--r-- | drivers/pci/hotplug/cpqphp_sysfs.c | 4 | ||||
-rw-r--r-- | drivers/pci/hotplug/pci_hotplug_core.c | 4 | ||||
-rw-r--r-- | drivers/pci/hotplug/rpadlpar_sysfs.c | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/shpchp_sysfs.c | 4 |
4 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/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c index c802f6270b89..c4282902cb52 100644 --- a/drivers/pci/hotplug/pci_hotplug_core.c +++ b/drivers/pci/hotplug/pci_hotplug_core.c | |||
@@ -73,7 +73,7 @@ static ssize_t hotplug_slot_attr_show(struct kobject *kobj, | |||
73 | { | 73 | { |
74 | struct hotplug_slot *slot = to_hotplug_slot(kobj); | 74 | struct hotplug_slot *slot = to_hotplug_slot(kobj); |
75 | struct hotplug_slot_attribute *attribute = to_hotplug_attr(attr); | 75 | struct hotplug_slot_attribute *attribute = to_hotplug_attr(attr); |
76 | return attribute->show ? attribute->show(slot, buf) : 0; | 76 | return attribute->show ? attribute->show(slot, buf) : -EIO; |
77 | } | 77 | } |
78 | 78 | ||
79 | static ssize_t hotplug_slot_attr_store(struct kobject *kobj, | 79 | static ssize_t hotplug_slot_attr_store(struct kobject *kobj, |
@@ -81,7 +81,7 @@ static ssize_t hotplug_slot_attr_store(struct kobject *kobj, | |||
81 | { | 81 | { |
82 | struct hotplug_slot *slot = to_hotplug_slot(kobj); | 82 | struct hotplug_slot *slot = to_hotplug_slot(kobj); |
83 | struct hotplug_slot_attribute *attribute = to_hotplug_attr(attr); | 83 | struct hotplug_slot_attribute *attribute = to_hotplug_attr(attr); |
84 | return attribute->store ? attribute->store(slot, buf, len) : 0; | 84 | return attribute->store ? attribute->store(slot, buf, len) : -EIO; |
85 | } | 85 | } |
86 | 86 | ||
87 | static struct sysfs_ops hotplug_slot_sysfs_ops = { | 87 | static struct sysfs_ops hotplug_slot_sysfs_ops = { |
diff --git a/drivers/pci/hotplug/rpadlpar_sysfs.c b/drivers/pci/hotplug/rpadlpar_sysfs.c index 3285b822478d..752e6513c447 100644 --- a/drivers/pci/hotplug/rpadlpar_sysfs.c +++ b/drivers/pci/hotplug/rpadlpar_sysfs.c | |||
@@ -48,7 +48,7 @@ dlpar_attr_store(struct kobject * kobj, struct attribute * attr, | |||
48 | struct dlpar_io_attr *dlpar_attr = container_of(attr, | 48 | struct dlpar_io_attr *dlpar_attr = container_of(attr, |
49 | struct dlpar_io_attr, attr); | 49 | struct dlpar_io_attr, attr); |
50 | return dlpar_attr->store ? | 50 | return dlpar_attr->store ? |
51 | dlpar_attr->store(dlpar_attr, buf, nbytes) : 0; | 51 | dlpar_attr->store(dlpar_attr, buf, nbytes) : -EIO; |
52 | } | 52 | } |
53 | 53 | ||
54 | static struct sysfs_ops dlpar_attr_sysfs_ops = { | 54 | static struct sysfs_ops dlpar_attr_sysfs_ops = { |
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; |