Hi Greg, Jesse,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/pci/hotplug/fakephp.c: In function 'legacy_add_slot':
drivers/pci/hotplug/fakephp.c:91: error: 'struct device' has no member named 'bus_id'
Caused by commit 83dbf66f04b96e65c6c18436c16d40f9cf8630aa ("PCI Hotplug:
restore fakephp interface with complete reimplementation") from the pci
tree which added another use of bus_id. (Commit
c32e967b935450c5178ebeaabb9ed889b14ed197 ("driver core: get rid of struct
device's bus_id string array") removes bus_id.)
I applied the batch below. Jesse, this is suitable for the pci tree as
the dev_name() interface already exists in Linus' tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 26 Mar 2009 18:25:06 +1100
Subject: [PATCH] pci: update fakephp for bus_id removal
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/pci/hotplug/fakephp.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index 2dc7828..21c2f5d 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -18,6 +18,7 @@
#include <linux/sysfs.h>
#include <linux/init.h>
#include <linux/pci.h>
+#include <linux/device.h>
#include "../pci.h"
struct legacy_slot {
@@ -88,7 +89,7 @@ static int legacy_add_slot(struct pci_dev *pdev)
if (kobject_init_and_add(&slot->kobj, &legacy_ktype,
&pci_slots_kset->kobj, "%s",
- pdev->dev.bus_id)) {
+ dev_name(&pdev->dev))) {
dev_warn(&pdev->dev, "Failed to created legacy fake slot\n");
return -EINVAL;
}
--
1.6.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
