diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2009-08-06 20:57:49 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2009-09-18 10:38:49 +0200 |
| commit | 119d3e56e7c82a73d27b5dd010c52dab1bc9f846 (patch) | |
| tree | b4e8bed69dd451d64a1e052a1282dedb8015b641 /drivers/watchdog/wdt_pci.c | |
| parent | [WATCHDOG] ar7_wdt: Fix error handling during probe. (diff) | |
| download | linux-119d3e56e7c82a73d27b5dd010c52dab1bc9f846.tar.xz linux-119d3e56e7c82a73d27b5dd010c52dab1bc9f846.zip | |
[WATCHDOG] wdt_pci - use pci_request_region
Use pci_request_region instead of request_region for this pci_driver.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/wdt_pci.c')
| -rw-r--r-- | drivers/watchdog/wdt_pci.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c index 7a1bdc7c95a9..02b6bdaa2dee 100644 --- a/drivers/watchdog/wdt_pci.c +++ b/drivers/watchdog/wdt_pci.c @@ -647,14 +647,15 @@ static int __devinit wdtpci_init_one(struct pci_dev *dev, goto out_pci; } - irq = dev->irq; - io = pci_resource_start(dev, 2); - - if (request_region(io, 16, "wdt_pci") == NULL) { - printk(KERN_ERR PFX "I/O address 0x%04x already in use\n", io); + if (pci_request_region(dev, 2, "wdt_pci")) { + printk(KERN_ERR PFX "I/O address 0x%04x already in use\n", + pci_resource_start(dev, 2)); goto out_pci; } + irq = dev->irq; + io = pci_resource_start(dev, 2); + if (request_irq(irq, wdtpci_interrupt, IRQF_DISABLED | IRQF_SHARED, "wdt_pci", &wdtpci_miscdev)) { printk(KERN_ERR PFX "IRQ %d is not free\n", irq); @@ -717,7 +718,7 @@ out_rbt: out_irq: free_irq(irq, &wdtpci_miscdev); out_reg: - release_region(io, 16); + pci_release_region(dev, 2); out_pci: pci_disable_device(dev); goto out; @@ -733,7 +734,7 @@ static void __devexit wdtpci_remove_one(struct pci_dev *pdev) misc_deregister(&temp_miscdev); unregister_reboot_notifier(&wdtpci_notifier); free_irq(irq, &wdtpci_miscdev); - release_region(io, 16); + pci_release_region(pdev, 2); pci_disable_device(pdev); dev_count--; } |