Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[linux-2.6-omap-h63xx.git] / drivers / usb / gadget / m66592-udc.c

diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index 3a8879ec2061495f7abdd5c28ede45dfdf23e11d..43dcf9e1af6b06bc46379ccfe1bcfb05aa25f524 100644 (file)
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -1546,8 +1546,6 @@ static void nop_completion(struct usb_ep *ep, struct usb_request *r)
 {
 }
 
-#define resource_len(r) (((r)->end - (r)->start) + 1)
-
 static int __init m66592_probe(struct platform_device *pdev)
 {
        struct resource *res;
@@ -1560,11 +1558,10 @@ static int __init m66592_probe(struct platform_device *pdev)
        int ret = 0;
        int i;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-                       (char *)udc_name);
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {
                ret = -ENODEV;
-               pr_err("platform_get_resource_byname error.\n");
+               pr_err("platform_get_resource error.\n");
                goto clean_up;
        }
 
@@ -1575,7 +1572,7 @@ static int __init m66592_probe(struct platform_device *pdev)
                goto clean_up;
        }
 
-       reg = ioremap(res->start, resource_len(res));
+       reg = ioremap(res->start, resource_size(res));
        if (reg == NULL) {
                ret = -ENOMEM;
                pr_err("ioremap error.\n");