cxgb3: Wait longer for control packets on initialization

[safe/jmp/linux-2.6] / drivers / tc / tc.c

diff --git a/drivers/tc/tc.c b/drivers/tc/tc.c
index 5514e52..a8aaf6a 100644 (file)
--- a/drivers/tc/tc.c
+++ b/drivers/tc/tc.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/tc.h>
 #include <linux/types.h>
@@ -86,7 +87,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus)
                               slot);
                        goto out_err;
                }
-               sprintf(tdev->dev.bus_id, "tc%x", slot);
+               dev_set_name(&tdev->dev, "tc%x", slot);
                tdev->bus = tbus;
                tdev->dev.parent = &tbus->dev;
                tdev->dev.bus = &tc_bus_type;
@@ -104,7 +105,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus)
                tdev->vendor[8] = 0;
                tdev->name[8] = 0;
 
-               pr_info("%s: %s %s %s\n", tdev->dev.bus_id, tdev->vendor,
+               pr_info("%s: %s %s %s\n", dev_name(&tdev->dev), tdev->vendor,
                        tdev->name, tdev->firmware);
 
                devsize = readb(module + offset + TC_SLOT_SIZE);
@@ -118,7 +119,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus)
                } else {
                        printk(KERN_ERR "%s: Cannot provide slot space "
                               "(%dMiB required, up to %dMiB supported)\n",
-                              tdev->dev.bus_id, devsize >> 20,
+                              dev_name(&tdev->dev), devsize >> 20,
                               max(slotsize, extslotsize) >> 20);
                        kfree(tdev);
                        goto out_err;
@@ -146,7 +147,7 @@ static int __init tc_init(void)
                return 0;
 
        INIT_LIST_HEAD(&tc_bus.devices);
-       strcpy(tc_bus.dev.bus_id, "tc");
+       dev_set_name(&tc_bus.dev, "tc");
        device_register(&tc_bus.dev);
 
        if (tc_bus.info.slot_size) {
@@ -160,7 +161,7 @@ static int __init tc_init(void)
                tc_bus.resource[0].start = tc_bus.slot_base;
                tc_bus.resource[0].end = tc_bus.slot_base +
                                         (tc_bus.info.slot_size << 20) *
-                                        tc_bus.num_tcslots;
+                                        tc_bus.num_tcslots - 1;
                tc_bus.resource[0].name = tc_bus.name;
                tc_bus.resource[0].flags = IORESOURCE_MEM;
                if (request_resource(&iomem_resource,
@@ -172,7 +173,7 @@ static int __init tc_init(void)
                        tc_bus.resource[1].start = tc_bus.ext_slot_base;
                        tc_bus.resource[1].end = tc_bus.ext_slot_base +
                                                 tc_bus.ext_slot_size *
-                                                tc_bus.num_tcslots;
+                                                tc_bus.num_tcslots - 1;
                        tc_bus.resource[1].name = tc_bus.name;
                        tc_bus.resource[1].flags = IORESOURCE_MEM;
                        if (request_resource(&iomem_resource,