diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-29 15:42:51 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-29 15:42:51 -0700 |
| commit | fe8069ab64007b5ca27db3e0f608e1ac0a6bb5b4 (patch) | |
| tree | 27b712f56eb79833fa0628dd95ae79a284cdd2c1 | |
| parent | 5edf9bc84c7c03dd62ba7dd547bc08af9a0f66ee (diff) | |
| download | patches-fe8069ab64007b5ca27db3e0f608e1ac0a6bb5b4.tar.gz | |
sparc build fixes for dev_name stuff
5 files changed, 185 insertions, 18 deletions
diff --git a/driver-core/driver-core-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch b/driver-core/driver-core-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch index a1e47ed25ee562..fd4e2536fed0f8 100644 --- a/driver-core/driver-core-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch +++ b/driver-core/driver-core-convert-to-new-device-api-to-allow-names-longer-than-20-chars.patch @@ -1212,7 +1212,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> INFO(fsg, "failed to register LUN%d: %d\n", i, rc); --- a/drivers/usb/gadget/fsl_usb2_udc.c +++ b/drivers/usb/gadget/fsl_usb2_udc.c -@@ -2329,7 +2329,7 @@ static int __init fsl_udc_probe(struct p +@@ -2331,7 +2331,7 @@ static int __init fsl_udc_probe(struct p udc_controller->gadget.name = driver_name; /* Setup gadget.dev and register with kernel */ diff --git a/driver-core/driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch b/driver-core/driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch index 36578ad1e9679f..3ad85718113473 100644 --- a/driver-core/driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch +++ b/driver-core/driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch @@ -256,7 +256,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> include/linux/mmc/sdio_func.h | 2 include/linux/mtd/map.h | 2 include/linux/mtd/mtd.h | 2 - include/linux/pci.h | 4 include/linux/phy.h | 6 include/linux/rio_drv.h | 2 include/linux/usb.h | 2 @@ -275,7 +274,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> sound/isa/gus/gusclassic.c | 8 sound/isa/gus/gusextreme.c | 12 - sound/isa/sb/sb8.c | 4 - 261 files changed, 763 insertions(+), 750 deletions(-) + 260 files changed, 761 insertions(+), 748 deletions(-) --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c @@ -6450,20 +6449,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int index; /* ecc layout structure pointer - read only ! */ ---- a/include/linux/pci.h -+++ b/include/linux/pci.h -@@ -976,9 +976,9 @@ static inline void pci_set_drvdata(struc - /* If you want to know what to call your pci_dev, ask this function. - * Again, it's a wrapper around the generic device. - */ --static inline char *pci_name(struct pci_dev *pdev) -+static inline const char *pci_name(struct pci_dev *pdev) - { -- return pdev->dev.bus_id; -+ return dev_name(&pdev->dev); - } - - --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -76,10 +76,10 @@ typedef enum { diff --git a/driver-core/pci-make-pci_name-use-dev_name.patch b/driver-core/pci-make-pci_name-use-dev_name.patch new file mode 100644 index 00000000000000..2bd1cb0b81f3ce --- /dev/null +++ b/driver-core/pci-make-pci_name-use-dev_name.patch @@ -0,0 +1,42 @@ +From kay.sievers@vrfy.org Fri May 2 09:28:43 2008 +From: Greg Kroah-Hartman <gregkh@suse.de> +Date: Fri, 02 May 2008 06:02:41 +0200 +Subject: PCI: make pci_name use dev_name +Message-ID: <1209700961.3100.6.camel@linux.site> + + +Also fixes up the sparc code that was assuming this is not a constant. + +Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + arch/sparc64/kernel/pci.c | 2 +- + include/linux/pci.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/arch/sparc64/kernel/pci.c ++++ b/arch/sparc64/kernel/pci.c +@@ -408,7 +408,7 @@ struct pci_dev *of_create_pci_dev(struct + dev->class = class >> 8; + dev->revision = class & 0xff; + +- sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus), ++ sprintf(dev->dev.bus_id, "%04x:%02x:%02x.%d", pci_domain_nr(bus), + dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn)); + + if (ofpci_verbose) +--- a/include/linux/pci.h ++++ b/include/linux/pci.h +@@ -976,9 +976,9 @@ static inline void pci_set_drvdata(struc + /* If you want to know what to call your pci_dev, ask this function. + * Again, it's a wrapper around the generic device. + */ +-static inline char *pci_name(struct pci_dev *pdev) ++static inline const char *pci_name(struct pci_dev *pdev) + { +- return pdev->dev.bus_id; ++ return dev_name(&pdev->dev); + } + + diff --git a/driver-core/sparc64-fix-up-bus_id-changes-in-sparc-core-code.patch b/driver-core/sparc64-fix-up-bus_id-changes-in-sparc-core-code.patch new file mode 100644 index 00000000000000..d3e981c27633c1 --- /dev/null +++ b/driver-core/sparc64-fix-up-bus_id-changes-in-sparc-core-code.patch @@ -0,0 +1,139 @@ +From kay.sievers@vrfy.org Fri May 2 09:28:43 2008 +From: Greg Kroah-Hartman <gregkh@suse.de> +Date: Fri, 02 May 2008 06:02:41 +0200 +Subject: sparc64: fix up bus_id changes in sparc core code + +This converts all instances of bus_id in the sparc core kernel to use +either dev_set_name(), or dev_name() depending on the need. + +This is done in anticipation of removing the bus_id field from struct +driver. + +Cc: Kay Sievers <kay.sievers@vrfy.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + arch/sparc64/kernel/ebus.c | 4 ++-- + arch/sparc64/kernel/of_device.c | 4 ++-- + arch/sparc64/kernel/pci.c | 2 +- + arch/sparc64/kernel/vio.c | 16 +++++++--------- + drivers/sbus/sbus.c | 6 +++--- + 5 files changed, 15 insertions(+), 17 deletions(-) + +--- a/arch/sparc64/kernel/ebus.c ++++ b/arch/sparc64/kernel/ebus.c +@@ -401,7 +401,7 @@ static void __init fill_ebus_device(stru + dev->ofdev.node = dp; + dev->ofdev.dev.parent = &dev->bus->ofdev.dev; + dev->ofdev.dev.bus = &ebus_bus_type; +- sprintf(dev->ofdev.dev.bus_id, "ebus[%08x]", dp->node); ++ dev_set_name(&dev->ofdev.dev, "ebus[%08x]", dp->node); + + /* Register with core */ + if (of_device_register(&dev->ofdev) != 0) +@@ -501,7 +501,7 @@ void __init ebus_init(void) + ebus->ofdev.node = dp; + ebus->ofdev.dev.parent = &pdev->dev; + ebus->ofdev.dev.bus = &ebus_bus_type; +- sprintf(ebus->ofdev.dev.bus_id, "ebus%d", num_ebus); ++ dev_set_name(&ebus->ofdev.dev, "ebus%d", num_ebus); + + /* Register with core */ + if (of_device_register(&ebus->ofdev) != 0) +--- a/arch/sparc64/kernel/of_device.c ++++ b/arch/sparc64/kernel/of_device.c +@@ -797,9 +797,9 @@ static struct of_device * __init scan_on + op->dev.parent = parent; + op->dev.bus = &of_platform_bus_type; + if (!parent) +- strcpy(op->dev.bus_id, "root"); ++ dev_set_name(&op->dev, "root"); + else +- sprintf(op->dev.bus_id, "%08x", dp->node); ++ dev_set_name(&op->dev, "%08x", dp->node); + + if (of_device_register(op)) { + printk("%s: Could not register of device.\n", +--- a/arch/sparc64/kernel/pci.c ++++ b/arch/sparc64/kernel/pci.c +@@ -408,7 +408,7 @@ struct pci_dev *of_create_pci_dev(struct + dev->class = class >> 8; + dev->revision = class & 0xff; + +- sprintf(dev->dev.bus_id, "%04x:%02x:%02x.%d", pci_domain_nr(bus), ++ dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(bus), + dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn)); + + if (ofpci_verbose) +--- a/arch/sparc64/kernel/vio.c ++++ b/arch/sparc64/kernel/vio.c +@@ -260,16 +260,14 @@ static struct vio_dev *vio_create_one(st + vio_fill_channel_info(hp, mp, vdev); + + if (!id) { +- snprintf(vdev->dev.bus_id, BUS_ID_SIZE, "%s", +- bus_id_name); ++ dev_set_name(&vdev->dev, "%s", bus_id_name); + vdev->dev_no = ~(u64)0; + } else if (!cfg_handle) { +- snprintf(vdev->dev.bus_id, BUS_ID_SIZE, "%s-%lu", +- bus_id_name, *id); ++ dev_set_name(&vdev->dev, "%s-%lu", bus_id_name, *id); + vdev->dev_no = *id; + } else { +- snprintf(vdev->dev.bus_id, BUS_ID_SIZE, "%s-%lu-%lu", +- bus_id_name, *cfg_handle, *id); ++ dev_set_name(&vdev->dev, "%s-%lu-%lu", bus_id_name, ++ *cfg_handle, *id); + vdev->dev_no = *cfg_handle; + } + +@@ -292,12 +290,12 @@ static struct vio_dev *vio_create_one(st + } + vdev->dp = dp; + +- printk(KERN_INFO "VIO: Adding device %s\n", vdev->dev.bus_id); ++ printk(KERN_INFO "VIO: Adding device %s\n", dev_name(&vdev->dev)); + + err = device_register(&vdev->dev); + if (err) { + printk(KERN_ERR "VIO: Could not register device %s, err=%d\n", +- vdev->dev.bus_id, err); ++ dev_name(&vdev->dev), err); + kfree(vdev); + return NULL; + } +@@ -330,7 +328,7 @@ static void vio_remove(struct mdesc_hand + dev = device_find_child(&root_vdev->dev, (void *) node, + vio_md_node_match); + if (dev) { +- printk(KERN_INFO "VIO: Removing device %s\n", dev->bus_id); ++ printk(KERN_INFO "VIO: Removing device %s\n", dev_name(dev)); + + device_unregister(dev); + } +--- a/drivers/sbus/sbus.c ++++ b/drivers/sbus/sbus.c +@@ -78,7 +78,7 @@ static void __init fill_sbus_device(stru + else + sdev->ofdev.dev.parent = &sdev->bus->ofdev.dev; + sdev->ofdev.dev.bus = &sbus_bus_type; +- sprintf(sdev->ofdev.dev.bus_id, "sbus[%08x]", dp->node); ++ dev_set_name(&sdev->ofdev.dev, "sbus[%08x]", dp->node); + + if (of_device_register(&sdev->ofdev) != 0) + printk(KERN_DEBUG "sbus: device registration error for %s!\n", +@@ -257,11 +257,11 @@ static void __init build_one_sbus(struct + sbus->ofdev.node = dp; + sbus->ofdev.dev.parent = NULL; + sbus->ofdev.dev.bus = &sbus_bus_type; +- sprintf(sbus->ofdev.dev.bus_id, "sbus%d", num_sbus); ++ dev_set_name(&sbus->ofdev.dev, "sbus%d", num_sbus); + + if (of_device_register(&sbus->ofdev) != 0) + printk(KERN_DEBUG "sbus: device registration error for %s!\n", +- sbus->ofdev.dev.bus_id); ++ dev_name(&sbus->ofdev.dev)); + + dev_dp = dp->child; + while (dev_dp) { @@ -105,6 +105,8 @@ driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch driver-core/pnp-add-acpi-modalias-entries.patch # bus_id fun +driver-core/pci-make-pci_name-use-dev_name.patch +driver-core/sparc64-fix-up-bus_id-changes-in-sparc-core-code.patch driver-core/driver-core-prepare-for-removal-of-20-char-limit-from-struct-device.patch driver-core/s390-more-bus_id-dev_name-conversions.patch driver-core/s390-use-s390_root_dev_-in-kvm_virtio.patch @@ -255,4 +257,3 @@ ldp/oms-add-oms-maxp-driver.patch kill-bus_id.patch - |