Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/pci/hotplug/sgi_hotplug.c

+3 −10
Original line number Diff line number Diff line
@@ -90,11 +90,10 @@ static struct hotplug_slot_ops sn_hotplug_slot_ops = { 


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_slot *bss_hotplug_slot, 
	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)

{