diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/amiserial.c | 4 | ||||
-rw-r--r-- | drivers/isdn/sc/init.c | 4 | ||||
-rw-r--r-- | drivers/media/radio/radio-aimslab.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-aztech.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-cadet.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-gemtek.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-rtrack2.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-sf16fmi.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-sf16fmr2.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-terratec.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-typhoon.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-zoltrix.c | 2 | ||||
-rw-r--r-- | drivers/net/arcnet/com90io.c | 4 | ||||
-rw-r--r-- | drivers/sbus/char/display7seg.c | 2 | ||||
-rw-r--r-- | drivers/tc/zs.c | 2 |
15 files changed, 16 insertions, 20 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index 2a36561eec68..a124f8c5d062 100644 --- a/drivers/char/amiserial.c +++ b/drivers/char/amiserial.c | |||
@@ -2053,10 +2053,6 @@ static int __init rs_init(void) | |||
2053 | state->icount.rx = state->icount.tx = 0; | 2053 | state->icount.rx = state->icount.tx = 0; |
2054 | state->icount.frame = state->icount.parity = 0; | 2054 | state->icount.frame = state->icount.parity = 0; |
2055 | state->icount.overrun = state->icount.brk = 0; | 2055 | state->icount.overrun = state->icount.brk = 0; |
2056 | /* | ||
2057 | if(state->port && check_region(state->port,REGION_LENGTH(state))) | ||
2058 | continue; | ||
2059 | */ | ||
2060 | 2056 | ||
2061 | printk(KERN_INFO "ttyS%d is the amiga builtin serial port\n", | 2057 | printk(KERN_INFO "ttyS%d is the amiga builtin serial port\n", |
2062 | state->line); | 2058 | state->line); |
diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c index 40b0df04ed9f..1ebed041672d 100644 --- a/drivers/isdn/sc/init.c +++ b/drivers/isdn/sc/init.c | |||
@@ -87,7 +87,7 @@ static int __init sc_init(void) | |||
87 | */ | 87 | */ |
88 | for (i = 0 ; i < MAX_IO_REGS - 1 ; i++) { | 88 | for (i = 0 ; i < MAX_IO_REGS - 1 ; i++) { |
89 | if(!request_region(io[b] + i * 0x400, 1, "sc test")) { | 89 | if(!request_region(io[b] + i * 0x400, 1, "sc test")) { |
90 | pr_debug("check_region for 0x%x failed\n", io[b] + i * 0x400); | 90 | pr_debug("request_region for 0x%x failed\n", io[b] + i * 0x400); |
91 | io[b] = 0; | 91 | io[b] = 0; |
92 | break; | 92 | break; |
93 | } else | 93 | } else |
@@ -181,7 +181,7 @@ static int __init sc_init(void) | |||
181 | for (i = SRAM_MIN ; i < SRAM_MAX ; i += SRAM_PAGESIZE) { | 181 | for (i = SRAM_MIN ; i < SRAM_MAX ; i += SRAM_PAGESIZE) { |
182 | pr_debug("Checking RAM address 0x%x...\n", i); | 182 | pr_debug("Checking RAM address 0x%x...\n", i); |
183 | if(request_region(i, SRAM_PAGESIZE, "sc test")) { | 183 | if(request_region(i, SRAM_PAGESIZE, "sc test")) { |
184 | pr_debug(" check_region succeeded\n"); | 184 | pr_debug(" request_region succeeded\n"); |
185 | model = identify_board(i, io[b]); | 185 | model = identify_board(i, io[b]); |
186 | release_region(i, SRAM_PAGESIZE); | 186 | release_region(i, SRAM_PAGESIZE); |
187 | if (model >= 0) { | 187 | if (model >= 0) { |
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c index 8b4ad70dd1b2..877c770558e9 100644 --- a/drivers/media/radio/radio-aimslab.c +++ b/drivers/media/radio/radio-aimslab.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | #include <linux/module.h> /* Modules */ | 30 | #include <linux/module.h> /* Modules */ |
31 | #include <linux/init.h> /* Initdata */ | 31 | #include <linux/init.h> /* Initdata */ |
32 | #include <linux/ioport.h> /* check_region, request_region */ | 32 | #include <linux/ioport.h> /* request_region */ |
33 | #include <linux/delay.h> /* udelay */ | 33 | #include <linux/delay.h> /* udelay */ |
34 | #include <asm/io.h> /* outb, outb_p */ | 34 | #include <asm/io.h> /* outb, outb_p */ |
35 | #include <asm/uaccess.h> /* copy to/from user */ | 35 | #include <asm/uaccess.h> /* copy to/from user */ |
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c index 013c835ed910..5319a9c9a979 100644 --- a/drivers/media/radio/radio-aztech.c +++ b/drivers/media/radio/radio-aztech.c | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #include <linux/module.h> /* Modules */ | 27 | #include <linux/module.h> /* Modules */ |
28 | #include <linux/init.h> /* Initdata */ | 28 | #include <linux/init.h> /* Initdata */ |
29 | #include <linux/ioport.h> /* check_region, request_region */ | 29 | #include <linux/ioport.h> /* request_region */ |
30 | #include <linux/delay.h> /* udelay */ | 30 | #include <linux/delay.h> /* udelay */ |
31 | #include <asm/io.h> /* outb, outb_p */ | 31 | #include <asm/io.h> /* outb, outb_p */ |
32 | #include <asm/uaccess.h> /* copy to/from user */ | 32 | #include <asm/uaccess.h> /* copy to/from user */ |
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c index 53d399b6652b..022913da8c59 100644 --- a/drivers/media/radio/radio-cadet.c +++ b/drivers/media/radio/radio-cadet.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | #include <linux/module.h> /* Modules */ | 30 | #include <linux/module.h> /* Modules */ |
31 | #include <linux/init.h> /* Initdata */ | 31 | #include <linux/init.h> /* Initdata */ |
32 | #include <linux/ioport.h> /* check_region, request_region */ | 32 | #include <linux/ioport.h> /* request_region */ |
33 | #include <linux/delay.h> /* udelay */ | 33 | #include <linux/delay.h> /* udelay */ |
34 | #include <asm/io.h> /* outb, outb_p */ | 34 | #include <asm/io.h> /* outb, outb_p */ |
35 | #include <asm/uaccess.h> /* copy to/from user */ | 35 | #include <asm/uaccess.h> /* copy to/from user */ |
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c index 202bfe6819b8..6418f03b9ce4 100644 --- a/drivers/media/radio/radio-gemtek.c +++ b/drivers/media/radio/radio-gemtek.c | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #include <linux/module.h> /* Modules */ | 18 | #include <linux/module.h> /* Modules */ |
19 | #include <linux/init.h> /* Initdata */ | 19 | #include <linux/init.h> /* Initdata */ |
20 | #include <linux/ioport.h> /* check_region, request_region */ | 20 | #include <linux/ioport.h> /* request_region */ |
21 | #include <linux/delay.h> /* udelay */ | 21 | #include <linux/delay.h> /* udelay */ |
22 | #include <asm/io.h> /* outb, outb_p */ | 22 | #include <asm/io.h> /* outb, outb_p */ |
23 | #include <asm/uaccess.h> /* copy to/from user */ | 23 | #include <asm/uaccess.h> /* copy to/from user */ |
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c index c00245d4d249..b2256d675b44 100644 --- a/drivers/media/radio/radio-rtrack2.c +++ b/drivers/media/radio/radio-rtrack2.c | |||
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | #include <linux/module.h> /* Modules */ | 11 | #include <linux/module.h> /* Modules */ |
12 | #include <linux/init.h> /* Initdata */ | 12 | #include <linux/init.h> /* Initdata */ |
13 | #include <linux/ioport.h> /* check_region, request_region */ | 13 | #include <linux/ioport.h> /* request_region */ |
14 | #include <linux/delay.h> /* udelay */ | 14 | #include <linux/delay.h> /* udelay */ |
15 | #include <asm/io.h> /* outb, outb_p */ | 15 | #include <asm/io.h> /* outb, outb_p */ |
16 | #include <asm/uaccess.h> /* copy to/from user */ | 16 | #include <asm/uaccess.h> /* copy to/from user */ |
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c index 3a464a09221f..6f03ce4dd7b0 100644 --- a/drivers/media/radio/radio-sf16fmi.c +++ b/drivers/media/radio/radio-sf16fmi.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <linux/kernel.h> /* __setup */ | 18 | #include <linux/kernel.h> /* __setup */ |
19 | #include <linux/module.h> /* Modules */ | 19 | #include <linux/module.h> /* Modules */ |
20 | #include <linux/init.h> /* Initdata */ | 20 | #include <linux/init.h> /* Initdata */ |
21 | #include <linux/ioport.h> /* check_region, request_region */ | 21 | #include <linux/ioport.h> /* request_region */ |
22 | #include <linux/delay.h> /* udelay */ | 22 | #include <linux/delay.h> /* udelay */ |
23 | #include <linux/videodev.h> /* kernel radio structs */ | 23 | #include <linux/videodev.h> /* kernel radio structs */ |
24 | #include <linux/isapnp.h> | 24 | #include <linux/isapnp.h> |
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c index 0732efda6a98..71971e9bb342 100644 --- a/drivers/media/radio/radio-sf16fmr2.c +++ b/drivers/media/radio/radio-sf16fmr2.c | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | #include <linux/module.h> /* Modules */ | 15 | #include <linux/module.h> /* Modules */ |
16 | #include <linux/init.h> /* Initdata */ | 16 | #include <linux/init.h> /* Initdata */ |
17 | #include <linux/ioport.h> /* check_region, request_region */ | 17 | #include <linux/ioport.h> /* request_region */ |
18 | #include <linux/delay.h> /* udelay */ | 18 | #include <linux/delay.h> /* udelay */ |
19 | #include <asm/io.h> /* outb, outb_p */ | 19 | #include <asm/io.h> /* outb, outb_p */ |
20 | #include <asm/uaccess.h> /* copy to/from user */ | 20 | #include <asm/uaccess.h> /* copy to/from user */ |
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c index 248d67fde037..b03573c6840e 100644 --- a/drivers/media/radio/radio-terratec.c +++ b/drivers/media/radio/radio-terratec.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | #include <linux/module.h> /* Modules */ | 26 | #include <linux/module.h> /* Modules */ |
27 | #include <linux/init.h> /* Initdata */ | 27 | #include <linux/init.h> /* Initdata */ |
28 | #include <linux/ioport.h> /* check_region, request_region */ | 28 | #include <linux/ioport.h> /* request_region */ |
29 | #include <linux/delay.h> /* udelay */ | 29 | #include <linux/delay.h> /* udelay */ |
30 | #include <asm/io.h> /* outb, outb_p */ | 30 | #include <asm/io.h> /* outb, outb_p */ |
31 | #include <asm/uaccess.h> /* copy to/from user */ | 31 | #include <asm/uaccess.h> /* copy to/from user */ |
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c index d7da901ebe90..f304f3c14763 100644 --- a/drivers/media/radio/radio-typhoon.c +++ b/drivers/media/radio/radio-typhoon.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | #include <linux/module.h> /* Modules */ | 32 | #include <linux/module.h> /* Modules */ |
33 | #include <linux/init.h> /* Initdata */ | 33 | #include <linux/init.h> /* Initdata */ |
34 | #include <linux/ioport.h> /* check_region, request_region */ | 34 | #include <linux/ioport.h> /* request_region */ |
35 | #include <linux/proc_fs.h> /* radio card status report */ | 35 | #include <linux/proc_fs.h> /* radio card status report */ |
36 | #include <asm/io.h> /* outb, outb_p */ | 36 | #include <asm/io.h> /* outb, outb_p */ |
37 | #include <asm/uaccess.h> /* copy to/from user */ | 37 | #include <asm/uaccess.h> /* copy to/from user */ |
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c index 342f92df4aba..4c6d6fb49034 100644 --- a/drivers/media/radio/radio-zoltrix.c +++ b/drivers/media/radio/radio-zoltrix.c | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | #include <linux/module.h> /* Modules */ | 29 | #include <linux/module.h> /* Modules */ |
30 | #include <linux/init.h> /* Initdata */ | 30 | #include <linux/init.h> /* Initdata */ |
31 | #include <linux/ioport.h> /* check_region, request_region */ | 31 | #include <linux/ioport.h> /* request_region */ |
32 | #include <linux/delay.h> /* udelay, msleep */ | 32 | #include <linux/delay.h> /* udelay, msleep */ |
33 | #include <asm/io.h> /* outb, outb_p */ | 33 | #include <asm/io.h> /* outb, outb_p */ |
34 | #include <asm/uaccess.h> /* copy to/from user */ | 34 | #include <asm/uaccess.h> /* copy to/from user */ |
diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c index 52c77cbe8c62..1f0302735416 100644 --- a/drivers/net/arcnet/com90io.c +++ b/drivers/net/arcnet/com90io.c | |||
@@ -160,7 +160,7 @@ static int __init com90io_probe(struct net_device *dev) | |||
160 | return -ENODEV; | 160 | return -ENODEV; |
161 | } | 161 | } |
162 | if (!request_region(ioaddr, ARCNET_TOTAL_SIZE, "com90io probe")) { | 162 | if (!request_region(ioaddr, ARCNET_TOTAL_SIZE, "com90io probe")) { |
163 | BUGMSG(D_INIT_REASONS, "IO check_region %x-%x failed.\n", | 163 | BUGMSG(D_INIT_REASONS, "IO request_region %x-%x failed.\n", |
164 | ioaddr, ioaddr + ARCNET_TOTAL_SIZE - 1); | 164 | ioaddr, ioaddr + ARCNET_TOTAL_SIZE - 1); |
165 | return -ENXIO; | 165 | return -ENXIO; |
166 | } | 166 | } |
@@ -242,7 +242,7 @@ static int __init com90io_found(struct net_device *dev) | |||
242 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq); | 242 | BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq); |
243 | return -ENODEV; | 243 | return -ENODEV; |
244 | } | 244 | } |
245 | /* Reserve the I/O region - guaranteed to work by check_region */ | 245 | /* Reserve the I/O region */ |
246 | if (!request_region(dev->base_addr, ARCNET_TOTAL_SIZE, "arcnet (COM90xx-IO)")) { | 246 | if (!request_region(dev->base_addr, ARCNET_TOTAL_SIZE, "arcnet (COM90xx-IO)")) { |
247 | free_irq(dev->irq, dev); | 247 | free_irq(dev->irq, dev); |
248 | return -EBUSY; | 248 | return -EBUSY; |
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c index dbad7f35eb0a..24ed5893b4f0 100644 --- a/drivers/sbus/char/display7seg.c +++ b/drivers/sbus/char/display7seg.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <linux/major.h> | 14 | #include <linux/major.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | #include <linux/miscdevice.h> | 16 | #include <linux/miscdevice.h> |
17 | #include <linux/ioport.h> /* request_region, check_region */ | 17 | #include <linux/ioport.h> /* request_region */ |
18 | #include <asm/atomic.h> | 18 | #include <asm/atomic.h> |
19 | #include <asm/ebus.h> /* EBus device */ | 19 | #include <asm/ebus.h> /* EBus device */ |
20 | #include <asm/oplib.h> /* OpenProm Library */ | 20 | #include <asm/oplib.h> /* OpenProm Library */ |
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c index 4382ee60b6a8..6bed8713897e 100644 --- a/drivers/tc/zs.c +++ b/drivers/tc/zs.c | |||
@@ -1683,7 +1683,7 @@ static void __init probe_sccs(void) | |||
1683 | #ifndef CONFIG_SERIAL_DEC_CONSOLE | 1683 | #ifndef CONFIG_SERIAL_DEC_CONSOLE |
1684 | /* | 1684 | /* |
1685 | * We're called early and memory managment isn't up, yet. | 1685 | * We're called early and memory managment isn't up, yet. |
1686 | * Thus check_region would fail. | 1686 | * Thus request_region would fail. |
1687 | */ | 1687 | */ |
1688 | if (!request_region((unsigned long) | 1688 | if (!request_region((unsigned long) |
1689 | zs_channels[n_channels].control, | 1689 | zs_channels[n_channels].control, |