Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI hotplug: SGI hotplug: do not use hotplug_slot_attr
PCI hotplug: SGI hotplug: fix build failure
+3
-4
+3
-4
drivers/pci/hotplug/sgi_hotplug.c
+3
-4
drivers/pci/hotplug/sgi_hotplug.c
···
90
90
91
91
static DEFINE_MUTEX(sn_hotplug_mutex);
92
92
93
-
static ssize_t path_show (struct hotplug_slot *bss_hotplug_slot,
94
-
char *buf)
93
+
static ssize_t path_show(struct pci_slot *pci_slot, char *buf)
95
94
{
96
95
int retval = -ENOENT;
97
-
struct slot *slot = bss_hotplug_slot->private;
96
+
struct slot *slot = pci_slot->hotplug->private;
98
97
99
98
if (!slot)
100
99
return retval;
···
102
103
return retval;
103
104
}
104
105
105
-
static struct hotplug_slot_attribute sn_slot_path_attr = __ATTR_RO(path);
106
+
static struct pci_slot_attribute sn_slot_path_attr = __ATTR_RO(path);
106
107
107
108
static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device)
108
109
{