aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-pmcmsp.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-06-09 12:13:32 -0400
committerJiri Kosina <jkosina@suse.cz>2011-06-10 08:55:36 -0400
commit28f65c11f2ffb3957259dece647a24f8ad2e241b (patch)
tree6b7621d09d10df89eedd908d4506fb9f457a909f /drivers/usb/host/ehci-pmcmsp.c
parent140a1ef2f91a00e1d25f0878c193abdc25bf6ebe (diff)
treewide: Convert uses of struct resource to resource_size(ptr)
Several fixes as well where the +1 was missing. Done via coccinelle scripts like: @@ struct resource *ptr; @@ - ptr->end - ptr->start + 1 + resource_size(ptr) and some grep and typing. Mostly uncompiled, no cross-compilers. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/usb/host/ehci-pmcmsp.c')
-rw-r--r--drivers/usb/host/ehci-pmcmsp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/host/ehci-pmcmsp.c b/drivers/usb/host/ehci-pmcmsp.c
index cd69099cda1..e8d54de44ac 100644
--- a/drivers/usb/host/ehci-pmcmsp.c
+++ b/drivers/usb/host/ehci-pmcmsp.c
@@ -124,7 +124,7 @@ static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
124 res = platform_get_resource(pdev, IORESOURCE_MEM, 1); 124 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
125 if (res == NULL) 125 if (res == NULL)
126 return -ENOMEM; 126 return -ENOMEM;
127 res_len = res->end - res->start + 1; 127 res_len = resource_size(res);
128 if (!request_mem_region(res->start, res_len, "mab regs")) 128 if (!request_mem_region(res->start, res_len, "mab regs"))
129 return -EBUSY; 129 return -EBUSY;
130 130
@@ -140,7 +140,7 @@ static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
140 retval = -ENOMEM; 140 retval = -ENOMEM;
141 goto err2; 141 goto err2;
142 } 142 }
143 res_len = res->end - res->start + 1; 143 res_len = resource_size(res);
144 if (!request_mem_region(res->start, res_len, "usbid regs")) { 144 if (!request_mem_region(res->start, res_len, "usbid regs")) {
145 retval = -EBUSY; 145 retval = -EBUSY;
146 goto err2; 146 goto err2;
@@ -154,13 +154,13 @@ static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
154 return 0; 154 return 0;
155err3: 155err3:
156 res = platform_get_resource(pdev, IORESOURCE_MEM, 2); 156 res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
157 res_len = res->end - res->start + 1; 157 res_len = resource_size(res);
158 release_mem_region(res->start, res_len); 158 release_mem_region(res->start, res_len);
159err2: 159err2:
160 iounmap(dev->mab_regs); 160 iounmap(dev->mab_regs);
161err1: 161err1:
162 res = platform_get_resource(pdev, IORESOURCE_MEM, 1); 162 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
163 res_len = res->end - res->start + 1; 163 res_len = resource_size(res);
164 release_mem_region(res->start, res_len); 164 release_mem_region(res->start, res_len);
165 dev_err(&pdev->dev, "Failed to map non-EHCI regs.\n"); 165 dev_err(&pdev->dev, "Failed to map non-EHCI regs.\n");
166 return retval; 166 return retval;
@@ -194,7 +194,7 @@ int usb_hcd_msp_probe(const struct hc_driver *driver,
194 goto err1; 194 goto err1;
195 } 195 }
196 hcd->rsrc_start = res->start; 196 hcd->rsrc_start = res->start;
197 hcd->rsrc_len = res->end - res->start + 1; 197 hcd->rsrc_len = resource_size(res);
198 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, dev->name)) { 198 if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, dev->name)) {
199 retval = -EBUSY; 199 retval = -EBUSY;
200 goto err1; 200 goto err1;