USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro
Subsystems (3)
PATCH 1/3 USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro
Signed-off-by Axel Lin <[email protected]>
--- drivers/usb/host/isp116x-hcd.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
drivers/usb/host/isp116x-hcd.c +2 -4
@@ -1557,8 +1557,6 @@ static int isp116x_remove(struct platform_device *pdev)return 0 ; } -#define resource_len (r) (((r)->end - (r)->start) + 1) -static int __devinit isp116x_probe (struct platform_device *pdev) {struct usb_hcd *hcd;
@@ -1597,7 +1595,7 @@ static int __devinit isp116x_probe(struct platform_device *pdev) ret = -EBUSY ; goto err1; } - addr_reg =ioremap (addr->start,resource_len (addr)); + addr_reg =ioremap (addr->start,resource_size (addr));if (addr_reg ==NULL ) { ret = -ENOMEM ; goto err2;
@@ -1606,7 +1604,7 @@ static int __devinit isp116x_probe(struct platform_device *pdev) ret = -EBUSY ; goto err3; } - data_reg =ioremap (data->start,resource_len (data)); + data_reg =ioremap (data->start,resource_size (data));if (data_reg ==NULL ) { ret = -ENOMEM ; goto err4;
Signature · 1 line
1.7.2
PATCH 2/3 USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro
Signed-off-by Axel Lin <[email protected]>
--- drivers/usb/host/isp1362-hcd.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-)
drivers/usb/host/isp1362-hcd.c +8 -10
@@ -2649,8 +2649,6 @@ static struct hc_driver isp1362_hc_driver = {/*-------------------------------------------------------------------------*/ -#define resource_len (r) (((r)->end - (r)->start) + 1) - static int __devexit isp1362_remove(struct platform_device *pdev) {struct usb_hcd *hcd =platform_get_drvdata (pdev);
@@ -2672,12 +2670,12 @@ static int __devexit isp1362_remove(struct platform_device *pdev) res =platform_get_resource (pdev,IORESOURCE_MEM ,1 );DBG (0 ,"%s: release mem_region: %08lx\n" , __func__, (long unsigned int )res->start);if (res) -release_mem_region (res->start,resource_len (res)); +release_mem_region (res->start,resource_size (res)); res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );DBG (0 ,"%s: release mem_region: %08lx\n" , __func__, (long unsigned int )res->start);if (res) -release_mem_region (res->start,resource_len (res)); +release_mem_region (res->start,resource_size (res));DBG (0 ,"%s: put_hcd\n" , __func__);usb_put_hcd (hcd);
@@ -2723,21 +2721,21 @@ static int __init isp1362_probe(struct platform_device *pdev) goto err1; } -if (!request_mem_region (addr->start,resource_len (addr), hcd_name)) { +if (!request_mem_region (addr->start,resource_size (addr), hcd_name)) { retval = -EBUSY ; goto err1; } - addr_reg =ioremap (addr->start,resource_len (addr)); + addr_reg =ioremap (addr->start,resource_size (addr));if (addr_reg ==NULL ) { retval = -ENOMEM ; goto err2; } -if (!request_mem_region (data->start,resource_len (data), hcd_name)) { +if (!request_mem_region (data->start,resource_size (data), hcd_name)) { retval = -EBUSY ; goto err3; } - data_reg =ioremap (data->start,resource_len (data)); + data_reg =ioremap (data->start,resource_size (data));if (data_reg ==NULL ) { retval = -ENOMEM ; goto err4;
@@ -2795,13 +2793,13 @@ static int __init isp1362_probe(struct platform_device *pdev)iounmap (data_reg); err4:DBG (0 ,"%s: Releasing mem region %08lx\n" , __func__, (long unsigned int )data->start); -release_mem_region (data->start,resource_len (data)); +release_mem_region (data->start,resource_size (data)); err3:DBG (0 ,"%s: Unmapping addr_reg @ %p\n" , __func__, addr_reg);iounmap (addr_reg); err2:DBG (0 ,"%s: Releasing mem region %08lx\n" , __func__, (long unsigned int )addr->start); -release_mem_region (addr->start,resource_len (addr)); +release_mem_region (addr->start,resource_size (addr)); err1:pr_err ("%s: init error, %d\n" , __func__, retval);
Signature · 1 line
1.7.2
Re: [PATCH 2/3] USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro
Acked-by Mike Frysinger <[email protected]>
-mike
PATCH 3/3 USB: ohci-sh - use resource_size instead of defining its own resource_len macro
In reply to Axel LinSigned-off-by Axel Lin <[email protected]>
--- drivers/usb/host/ohci-sh.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/usb/host/ohci-sh.c +1 -2
@@ -77,7 +77,6 @@ static const struct hc_driver ohci_sh_hc_driver = {/*-------------------------------------------------------------------------*/ -#define resource_len (r) (((r)->end - (r)->start) + 1)static int ohci_hcd_sh_probe (struct platform_device *pdev) {struct resource *res =NULL ;
@@ -109,7 +108,7 @@ static int ohci_hcd_sh_probe(struct platform_device *pdev) hcd->regs = (void __iomem *)res->start; hcd->rsrc_start = res->start; - hcd->rsrc_len =resource_len (res); + hcd->rsrc_len =resource_size (res); ret =usb_add_hcd (hcd, irq,IRQF_DISABLED );if (ret !=0 ) {err ("Failed to add hcd" );
Signature · 1 line
1.7.2
Re: [PATCH 3/3] USB: ohci-sh - use resource_size instead of defining its own resource_len macro
Hi Axel,
Quoted 4 lines · Axel Lin
Signed-off-by Axel Lin <[email protected]>--- drivers/usb/host/ohci-sh.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
Thank you very much for your patch.
Thanks,
Yoshihiro Shimoda