提交 0a2e5b9b 编写于 作者: M Magnus Damm 提交者: Greg Kroah-Hartman

USB: m66592 and r8a66597 resource changes

Use the more common platform_get_resource() together with index instead
of depending on the resource name and platform_get_resource_by_name().
Replace the resource_len() implementation with resource_size().
Signed-off-by: NMagnus Damm <damm@igel.co.jp>
Acked-by: NYoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 3a407e73
...@@ -1546,8 +1546,6 @@ static void nop_completion(struct usb_ep *ep, struct usb_request *r) ...@@ -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) static int __init m66592_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
...@@ -1560,11 +1558,10 @@ static int __init m66592_probe(struct platform_device *pdev) ...@@ -1560,11 +1558,10 @@ static int __init m66592_probe(struct platform_device *pdev)
int ret = 0; int ret = 0;
int i; int i;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
(char *)udc_name);
if (!res) { if (!res) {
ret = -ENODEV; ret = -ENODEV;
pr_err("platform_get_resource_byname error.\n"); pr_err("platform_get_resource error.\n");
goto clean_up; goto clean_up;
} }
...@@ -1575,7 +1572,7 @@ static int __init m66592_probe(struct platform_device *pdev) ...@@ -1575,7 +1572,7 @@ static int __init m66592_probe(struct platform_device *pdev)
goto clean_up; goto clean_up;
} }
reg = ioremap(res->start, resource_len(res)); reg = ioremap(res->start, resource_size(res));
if (reg == NULL) { if (reg == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
pr_err("ioremap error.\n"); pr_err("ioremap error.\n");
......
...@@ -2275,7 +2275,6 @@ static int __init_or_module r8a66597_remove(struct platform_device *pdev) ...@@ -2275,7 +2275,6 @@ static int __init_or_module r8a66597_remove(struct platform_device *pdev)
return 0; return 0;
} }
#define resource_len(r) (((r)->end - (r)->start) + 1)
static int __init r8a66597_probe(struct platform_device *pdev) static int __init r8a66597_probe(struct platform_device *pdev)
{ {
#if defined(CONFIG_SUPERH_ON_CHIP_R8A66597) && defined(CONFIG_HAVE_CLK) #if defined(CONFIG_SUPERH_ON_CHIP_R8A66597) && defined(CONFIG_HAVE_CLK)
...@@ -2296,11 +2295,10 @@ static int __init r8a66597_probe(struct platform_device *pdev) ...@@ -2296,11 +2295,10 @@ static int __init r8a66597_probe(struct platform_device *pdev)
goto clean_up; goto clean_up;
} }
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
(char *)hcd_name);
if (!res) { if (!res) {
ret = -ENODEV; ret = -ENODEV;
dev_err(&pdev->dev, "platform_get_resource_byname error.\n"); dev_err(&pdev->dev, "platform_get_resource error.\n");
goto clean_up; goto clean_up;
} }
...@@ -2315,7 +2313,7 @@ static int __init r8a66597_probe(struct platform_device *pdev) ...@@ -2315,7 +2313,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)
irq = ires->start; irq = ires->start;
irq_trigger = ires->flags & IRQF_TRIGGER_MASK; irq_trigger = ires->flags & IRQF_TRIGGER_MASK;
reg = ioremap(res->start, resource_len(res)); reg = ioremap(res->start, resource_size(res));
if (reg == NULL) { if (reg == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
dev_err(&pdev->dev, "ioremap error.\n"); dev_err(&pdev->dev, "ioremap error.\n");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册