diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/driver.c | 4 | ||||
| -rw-r--r-- | drivers/base/resource.c | 14 | ||||
| -rw-r--r-- | drivers/usb/host/ohci-at91.c | 2 | ||||
| -rw-r--r-- | drivers/video/fb.c | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 81cedca1db..31d6f2a406 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -261,7 +261,7 @@ void __iomem *dev_request_mem_region(struct device_d *dev, int num) if (!res) return NULL; - res = request_iomem_region(dev_name(dev), res->start, res->size); + res = request_iomem_region(dev_name(dev), res->start, res->end); if (!res) return NULL; @@ -392,7 +392,7 @@ static int do_devinfo(int argc, char *argv[]) printf("name : %s\n", res->name); printf("start : " PRINTF_CONVERSION_RESOURCE "\nsize : " PRINTF_CONVERSION_RESOURCE "\n", - res->start, res->size); + res->start, resource_size(res)); } printf("driver: %s\n\n", dev->driver ? diff --git a/drivers/base/resource.c b/drivers/base/resource.c index 347b2f01f0..6790af36d8 100644 --- a/drivers/base/resource.c +++ b/drivers/base/resource.c @@ -47,7 +47,7 @@ struct device_d *add_generic_device(const char* devname, int id, const char *res if (resname) res[0].name = xstrdup(resname); res[0].start = start; - res[0].size = size; + res[0].end = start + size - 1; res[0].flags = flags; return add_generic_device_res(devname, id, res, 1, pdata); @@ -94,10 +94,10 @@ struct device_d *add_dm9000_device(int id, resource_size_t base, } res[0].start = base; - res[0].size = size; + res[0].end = base + size - 1; res[0].flags = IORESOURCE_MEM | flags; res[1].start = data; - res[1].size = size; + res[1].end = data + size - 1; res[1].flags = IORESOURCE_MEM | flags; return add_generic_device_res("dm9000", id, res, 2, pdata); @@ -113,10 +113,10 @@ struct device_d *add_usb_ehci_device(int id, resource_size_t hccr, res = xzalloc(sizeof(struct resource) * 2); res[0].start = hccr; - res[0].size = 0x40; + res[0].end = hccr + 0x40 - 1; res[0].flags = IORESOURCE_MEM; res[1].start = hcor; - res[1].size = 0xc0; + res[1].end = hcor + 0xc0 - 1; res[1].flags = IORESOURCE_MEM; return add_generic_device_res("ehci", id, res, 2, pdata); @@ -146,10 +146,10 @@ struct device_d *add_ks8851_device(int id, resource_size_t addr, res = xzalloc(sizeof(struct resource) * 2); res[0].start = addr; - res[0].size = size; + res[0].end = addr + size - 1; res[0].flags = IORESOURCE_MEM | flags; res[1].start = addr_cmd; - res[1].size = size; + res[1].end = addr_cmd + size - 1; res[1].flags = IORESOURCE_MEM | flags; return add_generic_device_res("ks8851_mll", id, res, 2, pdata); diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index 2ce7c6ecc5..b3e9909df0 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c @@ -64,7 +64,7 @@ static int at91_ohci_probe(struct device_d *dev) writel(0, ®s->control); add_generic_device("ohci", DEVICE_ID_DYNAMIC, NULL, dev->resource[0].start, - dev->resource[0].size, IORESOURCE_MEM, NULL); + resource_size(&dev->resource[0]), IORESOURCE_MEM, NULL); return 0; } diff --git a/drivers/video/fb.c b/drivers/video/fb.c index 0be465f892..d885570b24 100644 --- a/drivers/video/fb.c +++ b/drivers/video/fb.c @@ -86,7 +86,7 @@ static int fb_setup_mode(struct device_d *dev, struct param_d *param, if (!ret) { dev->resource[0].start = (resource_size_t)info->screen_base; info->cdev.size = info->xres * info->yres * (info->bits_per_pixel >> 3); - dev->resource[0].size = info->cdev.size; + dev->resource[0].end = info->cdev.size - 1; dev_param_set_generic(dev, param, val); } else info->cdev.size = 0; @@ -116,7 +116,7 @@ int register_framebuffer(struct fb_info *info) info->cdev.priv = info; dev->resource = xzalloc(sizeof(struct resource)); dev->resource[0].start = (resource_size_t)info->screen_base; - dev->resource[0].size = info->cdev.size; + dev->resource[0].end = info->cdev.size - 1; dev->resource[0].flags = IORESOURCE_MEM; dev->num_resources = 1; |