Commit 94f81a47 authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Jesse Barnes

PCI hotplug: SGI hotplug: do not use hotplug_slot_attr

By the pci slot changes, callbacks of attributes under slot directory
(/sys/bus/pci/slots) had been changed to get the pointer to struct
pci_slot instead of struct hotplug_slot. So the path_show() that
assumes the parameter is a pointer to struct hotplug_slot seems
broken.
Tested-by: default avatarMike Habeck <habeck@sgi.com>
Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent d25f1438
...@@ -90,11 +90,10 @@ static struct hotplug_slot_ops sn_hotplug_slot_ops = { ...@@ -90,11 +90,10 @@ static struct hotplug_slot_ops sn_hotplug_slot_ops = {
static DEFINE_MUTEX(sn_hotplug_mutex); static DEFINE_MUTEX(sn_hotplug_mutex);
static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot, static ssize_t path_show(struct pci_slot *pci_slot, char *buf)
char *buf)
{ {
int retval = -ENOENT; int retval = -ENOENT;
struct slot *slot = bss_hotplug_slot->private; struct slot *slot = pci_slot->hotplug->private;
if (!slot) if (!slot)
return retval; return retval;
...@@ -103,13 +102,7 @@ static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot, ...@@ -103,13 +102,7 @@ static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot,
return retval; return retval;
} }
struct hotplug_slot_attribute { static struct pci_slot_attribute sn_slot_path_attr = __ATTR_RO(path);
struct attribute attr;
ssize_t (*show)(struct hotplug_slot *, char *);
ssize_t (*store)(struct hotplug_slot *, const char *, size_t);
};
static struct hotplug_slot_attribute sn_slot_path_attr = __ATTR_RO(path);
static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device) static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment