Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / usb / gadget / amd5536udc.c

diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index ce337cb5d13706a763b42193adf872efe38b309b..abf8192f89e845696c6e1a32df16db86e926e387 100644 (file)
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -44,7 +44,6 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/sched.h>
@@ -3251,7 +3250,7 @@ static int udc_pci_probe(
        /* pci setup */
        if (pci_enable_device(pdev) < 0) {
                kfree(dev);
-               dev = 0;
+               dev = NULL;
                retval = -ENODEV;
                goto finished;
        }
@@ -3264,7 +3263,7 @@ static int udc_pci_probe(
        if (!request_mem_region(resource, len, name)) {
                dev_dbg(&pdev->dev, "pci device used already\n");
                kfree(dev);
-               dev = 0;
+               dev = NULL;
                retval = -EBUSY;
                goto finished;
        }
@@ -3274,7 +3273,7 @@ static int udc_pci_probe(
        if (dev->virt_addr == NULL) {
                dev_dbg(&pdev->dev, "start address cannot be mapped\n");
                kfree(dev);
-               dev = 0;
+               dev = NULL;
                retval = -EFAULT;
                goto finished;
        }
@@ -3282,7 +3281,7 @@ static int udc_pci_probe(
        if (!pdev->irq) {
                dev_err(&dev->pdev->dev, "irq not set\n");
                kfree(dev);
-               dev = 0;
+               dev = NULL;
                retval = -ENODEV;
                goto finished;
        }
@@ -3290,7 +3289,7 @@ static int udc_pci_probe(
        if (request_irq(pdev->irq, udc_irq, IRQF_SHARED, name, dev) != 0) {
                dev_dbg(&dev->pdev->dev, "request_irq(%d) fail\n", pdev->irq);
                kfree(dev);
-               dev = 0;
+               dev = NULL;
                retval = -EBUSY;
                goto finished;
        }
@@ -3342,7 +3341,7 @@ static int udc_probe(struct udc *dev)
        spin_lock_init(&dev->lock);
        dev->gadget.ops = &udc_ops;
 
-       strcpy(dev->gadget.dev.bus_id, "gadget");
+       dev_set_name(&dev->gadget.dev, "gadget");
        dev->gadget.dev.release = gadget_release;
        dev->gadget.name = name;
        dev->gadget.name = name;