tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] use resource_size()
[WATCHDOG] iTCO_wdt: add PCI ID for the Intel EP80579 (Tolapai) SoC

Linus Torvalds f51671fc 2f99f5c8

+18 -17
+2 -2
drivers/watchdog/adx_wdt.c
··· 242 242 } 243 243 244 244 res = devm_request_mem_region(&pdev->dev, res->start, 245 - res->end - res->start + 1, res->name); 245 + resource_size(res), res->name); 246 246 if (!res) { 247 247 dev_err(&pdev->dev, "cannot request I/O memory region\n"); 248 248 return -ENXIO; 249 249 } 250 250 251 251 wdt->base = devm_ioremap_nocache(&pdev->dev, res->start, 252 - res->end - res->start + 1); 252 + resource_size(res)); 253 253 if (!wdt->base) { 254 254 dev_err(&pdev->dev, "cannot remap I/O memory region\n"); 255 255 return -ENXIO;
+1 -1
drivers/watchdog/at32ap700x_wdt.c
··· 326 326 return -ENOMEM; 327 327 } 328 328 329 - wdt->regs = ioremap(regs->start, regs->end - regs->start + 1); 329 + wdt->regs = ioremap(regs->start, resource_size(regs)); 330 330 if (!wdt->regs) { 331 331 ret = -ENOMEM; 332 332 dev_dbg(&pdev->dev, "could not map I/O memory\n");
+1 -1
drivers/watchdog/davinci_wdt.c
··· 221 221 return -ENOENT; 222 222 } 223 223 224 - size = res->end - res->start + 1; 224 + size = resource_size(res); 225 225 wdt_mem = request_mem_region(res->start, size, pdev->name); 226 226 227 227 if (wdt_mem == NULL) {
+4
drivers/watchdog/iTCO_wdt.c
··· 30 30 * document number 316972-004, 316973-012: 82801I (ICH9) 31 31 * document number 319973-002, 319974-002: 82801J (ICH10) 32 32 * document number 322169-001, 322170-001: 5 Series, 3400 Series (PCH) 33 + * document number 320066-003, 320257-008: EP80597 (IICH) 33 34 */ 34 35 35 36 /* ··· 101 100 TCO_PCH, /* PCH Desktop Full Featured */ 102 101 TCO_PCHM, /* PCH Mobile Full Featured */ 103 102 TCO_PCHMSFF, /* PCH Mobile SFF Full Featured */ 103 + TCO_EP80579, /* EP80579 */ 104 104 }; 105 105 106 106 static struct { ··· 145 143 {"PCH Desktop Full Featured", 2}, 146 144 {"PCH Mobile Full Featured", 2}, 147 145 {"PCH Mobile SFF Full Featured", 2}, 146 + {"EP80579", 2}, 148 147 {NULL, 0} 149 148 }; 150 149 ··· 217 214 { ITCO_PCI_DEVICE(0x3b00, TCO_PCH)}, 218 215 { ITCO_PCI_DEVICE(0x3b01, TCO_PCHM)}, 219 216 { ITCO_PCI_DEVICE(0x3b0d, TCO_PCHMSFF)}, 217 + { ITCO_PCI_DEVICE(0x5031, TCO_EP80579)}, 220 218 { 0, }, /* End of list */ 221 219 }; 222 220 MODULE_DEVICE_TABLE(pci, iTCO_wdt_pci_tbl);
+1 -1
drivers/watchdog/mpcore_wdt.c
··· 350 350 ret = -ENXIO; 351 351 goto err_free; 352 352 } 353 - wdt->base = ioremap(res->start, res->end - res->start + 1); 353 + wdt->base = ioremap(res->start, resource_size(res)); 354 354 if (!wdt->base) { 355 355 ret = -ENOMEM; 356 356 goto err_free;
+1 -1
drivers/watchdog/mv64x60_wdt.c
··· 275 275 if (!r) 276 276 return -ENODEV; 277 277 278 - mv64x60_wdt_regs = ioremap(r->start, r->end - r->start + 1); 278 + mv64x60_wdt_regs = ioremap(r->start, resource_size(r)); 279 279 if (mv64x60_wdt_regs == NULL) 280 280 return -ENOMEM; 281 281
+4 -5
drivers/watchdog/omap_wdt.c
··· 277 277 goto err_busy; 278 278 } 279 279 280 - mem = request_mem_region(res->start, res->end - res->start + 1, 281 - pdev->name); 280 + mem = request_mem_region(res->start, resource_size(res), pdev->name); 282 281 if (!mem) { 283 282 ret = -EBUSY; 284 283 goto err_busy; ··· 305 306 goto err_clk; 306 307 } 307 308 308 - wdev->base = ioremap(res->start, res->end - res->start + 1); 309 + wdev->base = ioremap(res->start, resource_size(res)); 309 310 if (!wdev->base) { 310 311 ret = -ENOMEM; 311 312 goto err_ioremap; ··· 357 358 kfree(wdev); 358 359 359 360 err_kzalloc: 360 - release_mem_region(res->start, res->end - res->start + 1); 361 + release_mem_region(res->start, resource_size(res)); 361 362 362 363 err_busy: 363 364 err_get_resource: ··· 382 383 return -ENOENT; 383 384 384 385 misc_deregister(&(wdev->omap_wdt_miscdev)); 385 - release_mem_region(res->start, res->end - res->start + 1); 386 + release_mem_region(res->start, resource_size(res)); 386 387 platform_set_drvdata(pdev, NULL); 387 388 388 389 clk_put(wdev->ick);
+1 -1
drivers/watchdog/pnx4008_wdt.c
··· 264 264 return -ENOENT; 265 265 } 266 266 267 - size = res->end - res->start + 1; 267 + size = resource_size(res); 268 268 wdt_mem = request_mem_region(res->start, size, pdev->name); 269 269 270 270 if (wdt_mem == NULL) {
+1 -1
drivers/watchdog/s3c2410_wdt.c
··· 421 421 return -ENOENT; 422 422 } 423 423 424 - size = (res->end - res->start) + 1; 424 + size = resource_size(res); 425 425 wdt_mem = request_mem_region(res->start, size, pdev->name); 426 426 if (wdt_mem == NULL) { 427 427 dev_err(dev, "failed to get memory region\n");
+2 -4
drivers/watchdog/txx9wdt.c
··· 214 214 res = platform_get_resource(dev, IORESOURCE_MEM, 0); 215 215 if (!res) 216 216 goto exit_busy; 217 - if (!devm_request_mem_region(&dev->dev, 218 - res->start, res->end - res->start + 1, 217 + if (!devm_request_mem_region(&dev->dev, res->start, resource_size(res), 219 218 "txx9wdt")) 220 219 goto exit_busy; 221 - txx9wdt_reg = devm_ioremap(&dev->dev, 222 - res->start, res->end - res->start + 1); 220 + txx9wdt_reg = devm_ioremap(&dev->dev, res->start, resource_size(res)); 223 221 if (!txx9wdt_reg) 224 222 goto exit_busy; 225 223