diff mbox

[2/2] SGI hotplug: do not use hotplug_slot_attr

Message ID 4A6D19C6.1030903@jp.fujitsu.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Kenji Kaneshige July 27, 2009, 3:06 a.m. UTC
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

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>

 drivers/pci/hotplug/sgi_hotplug.c |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox


Index: 20090721/drivers/pci/hotplug/sgi_hotplug.c
--- 20090721.orig/drivers/pci/hotplug/sgi_hotplug.c
+++ 20090721/drivers/pci/hotplug/sgi_hotplug.c
@@ -90,11 +90,10 @@  static struct hotplug_slot_ops sn_hotplu
 static DEFINE_MUTEX(sn_hotplug_mutex);
-static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot,
-	       		  char *buf)
+static ssize_t path_show(struct pci_slot *pci_slot, char *buf)
 	int retval = -ENOENT;
-	struct slot *slot = bss_hotplug_slot->private;
+	struct slot *slot = pci_slot->hotplug->private;
 	if (!slot)
 		return retval;
@@ -103,13 +102,7 @@  static ssize_t path_show (struct hotplug
 	return retval;
-struct hotplug_slot_attribute {
-	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 struct pci_slot_attribute sn_slot_path_attr = __ATTR_RO(path);
 static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device)