aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2008-04-30 03:54:19 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 11:29:48 -0400
commit24cb233520f01971d6d873cb52c64bbbb0665ac0 (patch)
tree08ee88564a13e1a07132a59e6119b5affbd13cad /drivers/char
parenta6fc819ebe2d70c92e43e14adbb93a5bd8ea5aa3 (diff)
char serial: switch drivers to ioremap_nocache
Simple search/replace except for synclink.c where I noticed a real bug and fixed it too. It was doing NULL + offset, then checking for NULL if the remap failed. Signed-off-by: Alan Cox <alan@redhat.com> Cc: Paul Fulghum <paulkf@microgate.com> Acked-by: Jiri Slaby <jirislaby@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/applicom.c4
-rw-r--r--drivers/char/istallion.c6
-rw-r--r--drivers/char/moxa.c4
-rw-r--r--drivers/char/nozomi.c2
-rw-r--r--drivers/char/sx.c10
-rw-r--r--drivers/char/synclink.c7
-rw-r--r--drivers/char/synclink_gt.c2
-rw-r--r--drivers/char/synclinkmp.c10
8 files changed, 25 insertions, 20 deletions
diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index a7c4990b5b6b..31d08b641f5b 100644
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -199,7 +199,7 @@ static int __init applicom_init(void)
199 if (pci_enable_device(dev)) 199 if (pci_enable_device(dev))
200 return -EIO; 200 return -EIO;
201 201
202 RamIO = ioremap(pci_resource_start(dev, 0), LEN_RAM_IO); 202 RamIO = ioremap_nocache(pci_resource_start(dev, 0), LEN_RAM_IO);
203 203
204 if (!RamIO) { 204 if (!RamIO) {
205 printk(KERN_INFO "ac.o: Failed to ioremap PCI memory " 205 printk(KERN_INFO "ac.o: Failed to ioremap PCI memory "
@@ -254,7 +254,7 @@ static int __init applicom_init(void)
254 /* Now try the specified ISA cards */ 254 /* Now try the specified ISA cards */
255 255
256 for (i = 0; i < MAX_ISA_BOARD; i++) { 256 for (i = 0; i < MAX_ISA_BOARD; i++) {
257 RamIO = ioremap(mem + (LEN_RAM_IO * i), LEN_RAM_IO); 257 RamIO = ioremap_nocache(mem + (LEN_RAM_IO * i), LEN_RAM_IO);
258 258
259 if (!RamIO) { 259 if (!RamIO) {
260 printk(KERN_INFO "ac.o: Failed to ioremap the ISA card's memory space (slot #%d)\n", i + 1); 260 printk(KERN_INFO "ac.o: Failed to ioremap the ISA card's memory space (slot #%d)\n", i + 1);
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index a1427d39d933..7c8b62f162bf 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -3257,7 +3257,7 @@ static int stli_initecp(struct stlibrd *brdp)
3257 */ 3257 */
3258 EBRDINIT(brdp); 3258 EBRDINIT(brdp);
3259 3259
3260 brdp->membase = ioremap(brdp->memaddr, brdp->memsize); 3260 brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);
3261 if (brdp->membase == NULL) { 3261 if (brdp->membase == NULL) {
3262 retval = -ENOMEM; 3262 retval = -ENOMEM;
3263 goto err_reg; 3263 goto err_reg;
@@ -3414,7 +3414,7 @@ static int stli_initonb(struct stlibrd *brdp)
3414 */ 3414 */
3415 EBRDINIT(brdp); 3415 EBRDINIT(brdp);
3416 3416
3417 brdp->membase = ioremap(brdp->memaddr, brdp->memsize); 3417 brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);
3418 if (brdp->membase == NULL) { 3418 if (brdp->membase == NULL) {
3419 retval = -ENOMEM; 3419 retval = -ENOMEM;
3420 goto err_reg; 3420 goto err_reg;
@@ -3665,7 +3665,7 @@ static int stli_eisamemprobe(struct stlibrd *brdp)
3665 */ 3665 */
3666 for (i = 0; (i < stli_eisamempsize); i++) { 3666 for (i = 0; (i < stli_eisamempsize); i++) {
3667 brdp->memaddr = stli_eisamemprobeaddrs[i]; 3667 brdp->memaddr = stli_eisamemprobeaddrs[i];
3668 brdp->membase = ioremap(brdp->memaddr, brdp->memsize); 3668 brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);
3669 if (brdp->membase == NULL) 3669 if (brdp->membase == NULL)
3670 continue; 3670 continue;
3671 3671
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 585fac179ec6..d57d3a61919b 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -937,7 +937,7 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
937 goto err; 937 goto err;
938 } 938 }
939 939
940 board->basemem = ioremap(pci_resource_start(pdev, 2), 0x4000); 940 board->basemem = ioremap_nocache(pci_resource_start(pdev, 2), 0x4000);
941 if (board->basemem == NULL) { 941 if (board->basemem == NULL) {
942 dev_err(&pdev->dev, "can't remap io space 2\n"); 942 dev_err(&pdev->dev, "can't remap io space 2\n");
943 goto err_reg; 943 goto err_reg;
@@ -1042,7 +1042,7 @@ static int __init moxa_init(void)
1042 brd->numPorts = type[i] == MOXA_BOARD_C218_ISA ? 8 : 1042 brd->numPorts = type[i] == MOXA_BOARD_C218_ISA ? 8 :
1043 numports[i]; 1043 numports[i];
1044 brd->busType = MOXA_BUS_TYPE_ISA; 1044 brd->busType = MOXA_BUS_TYPE_ISA;
1045 brd->basemem = ioremap(baseaddr[i], 0x4000); 1045 brd->basemem = ioremap_nocache(baseaddr[i], 0x4000);
1046 if (!brd->basemem) { 1046 if (!brd->basemem) {
1047 printk(KERN_ERR "MOXA: can't remap %lx\n", 1047 printk(KERN_ERR "MOXA: can't remap %lx\n",
1048 baseaddr[i]); 1048 baseaddr[i]);
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index b55c933d5585..0a8d321e6e23 100644
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -1407,7 +1407,7 @@ static int __devinit nozomi_card_init(struct pci_dev *pdev,
1407 /* Find out what card type it is */ 1407 /* Find out what card type it is */
1408 nozomi_get_card_type(dc); 1408 nozomi_get_card_type(dc);
1409 1409
1410 dc->base_addr = ioremap(start, dc->card_type); 1410 dc->base_addr = ioremap_nocache(start, dc->card_type);
1411 if (!dc->base_addr) { 1411 if (!dc->base_addr) {
1412 dev_err(&pdev->dev, "Unable to map card MMIO\n"); 1412 dev_err(&pdev->dev, "Unable to map card MMIO\n");
1413 ret = -ENODEV; 1413 ret = -ENODEV;
diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index e97a21db3d48..4ad2c71b45f3 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -2540,7 +2540,7 @@ static int __devinit sx_eisa_probe(struct device *dev)
2540 goto err_flag; 2540 goto err_flag;
2541 } 2541 }
2542 board->base2 = 2542 board->base2 =
2543 board->base = ioremap(board->hw_base, SI2_EISA_WINDOW_LEN); 2543 board->base = ioremap_nocache(board->hw_base, SI2_EISA_WINDOW_LEN);
2544 if (!board->base) { 2544 if (!board->base) {
2545 dev_err(dev, "can't remap memory\n"); 2545 dev_err(dev, "can't remap memory\n");
2546 goto err_reg; 2546 goto err_reg;
@@ -2617,7 +2617,7 @@ static void __devinit fix_sx_pci(struct pci_dev *pdev, struct sx_board *board)
2617 2617
2618 pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &hwbase); 2618 pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &hwbase);
2619 hwbase &= PCI_BASE_ADDRESS_MEM_MASK; 2619 hwbase &= PCI_BASE_ADDRESS_MEM_MASK;
2620 rebase = ioremap(hwbase, 0x80); 2620 rebase = ioremap_nocache(hwbase, 0x80);
2621 t = readl(rebase + CNTRL_REG_OFFSET); 2621 t = readl(rebase + CNTRL_REG_OFFSET);
2622 if (t != CNTRL_REG_GOODVALUE) { 2622 if (t != CNTRL_REG_GOODVALUE) {
2623 printk(KERN_DEBUG "sx: performing cntrl reg fix: %08x -> " 2623 printk(KERN_DEBUG "sx: performing cntrl reg fix: %08x -> "
@@ -2761,7 +2761,7 @@ static int __init sx_init(void)
2761 if (!request_region(board->hw_base, board->hw_len, "sx")) 2761 if (!request_region(board->hw_base, board->hw_len, "sx"))
2762 continue; 2762 continue;
2763 board->base2 = 2763 board->base2 =
2764 board->base = ioremap(board->hw_base, board->hw_len); 2764 board->base = ioremap_nocache(board->hw_base, board->hw_len);
2765 if (!board->base) 2765 if (!board->base)
2766 goto err_sx_reg; 2766 goto err_sx_reg;
2767 board->flags &= ~SX_BOARD_TYPE; 2767 board->flags &= ~SX_BOARD_TYPE;
@@ -2785,7 +2785,7 @@ err_sx_reg:
2785 if (!request_region(board->hw_base, board->hw_len, "sx")) 2785 if (!request_region(board->hw_base, board->hw_len, "sx"))
2786 continue; 2786 continue;
2787 board->base2 = 2787 board->base2 =
2788 board->base = ioremap(board->hw_base, board->hw_len); 2788 board->base = ioremap_nocache(board->hw_base, board->hw_len);
2789 if (!board->base) 2789 if (!board->base)
2790 goto err_si_reg; 2790 goto err_si_reg;
2791 board->flags &= ~SX_BOARD_TYPE; 2791 board->flags &= ~SX_BOARD_TYPE;
@@ -2808,7 +2808,7 @@ err_si_reg:
2808 if (!request_region(board->hw_base, board->hw_len, "sx")) 2808 if (!request_region(board->hw_base, board->hw_len, "sx"))
2809 continue; 2809 continue;
2810 board->base2 = 2810 board->base2 =
2811 board->base = ioremap(board->hw_base, board->hw_len); 2811 board->base = ioremap_nocache(board->hw_base, board->hw_len);
2812 if (!board->base) 2812 if (!board->base)
2813 goto err_si1_reg; 2813 goto err_si1_reg;
2814 board->flags &= ~SX_BOARD_TYPE; 2814 board->flags &= ~SX_BOARD_TYPE;
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 4fbfff7a442e..513b7c2f3e26 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -4150,7 +4150,8 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
4150 } 4150 }
4151 info->lcr_mem_requested = true; 4151 info->lcr_mem_requested = true;
4152 4152
4153 info->memory_base = ioremap(info->phys_memory_base,0x40000); 4153 info->memory_base = ioremap_nocache(info->phys_memory_base,
4154 0x40000);
4154 if (!info->memory_base) { 4155 if (!info->memory_base) {
4155 printk( "%s(%d):Cant map shared memory on device %s MemAddr=%08X\n", 4156 printk( "%s(%d):Cant map shared memory on device %s MemAddr=%08X\n",
4156 __FILE__,__LINE__,info->device_name, info->phys_memory_base ); 4157 __FILE__,__LINE__,info->device_name, info->phys_memory_base );
@@ -4163,12 +4164,14 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
4163 goto errout; 4164 goto errout;
4164 } 4165 }
4165 4166
4166 info->lcr_base = ioremap(info->phys_lcr_base,PAGE_SIZE) + info->lcr_offset; 4167 info->lcr_base = ioremap_nocache(info->phys_lcr_base,
4168 PAGE_SIZE);
4167 if (!info->lcr_base) { 4169 if (!info->lcr_base) {
4168 printk( "%s(%d):Cant map LCR memory on device %s MemAddr=%08X\n", 4170 printk( "%s(%d):Cant map LCR memory on device %s MemAddr=%08X\n",
4169 __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); 4171 __FILE__,__LINE__,info->device_name, info->phys_lcr_base );
4170 goto errout; 4172 goto errout;
4171 } 4173 }
4174 info->lcr_base += info->lcr_offset;
4172 4175
4173 } else { 4176 } else {
4174 /* claim DMA channel */ 4177 /* claim DMA channel */
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index 430f5bc0ae30..2001b0e52dc6 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -3350,7 +3350,7 @@ static int claim_resources(struct slgt_info *info)
3350 else 3350 else
3351 info->reg_addr_requested = true; 3351 info->reg_addr_requested = true;
3352 3352
3353 info->reg_addr = ioremap(info->phys_reg_addr, SLGT_REG_SIZE); 3353 info->reg_addr = ioremap_nocache(info->phys_reg_addr, SLGT_REG_SIZE);
3354 if (!info->reg_addr) { 3354 if (!info->reg_addr) {
3355 DBGERR(("%s cant map device registers, addr=%08X\n", 3355 DBGERR(("%s cant map device registers, addr=%08X\n",
3356 info->device_name, info->phys_reg_addr)); 3356 info->device_name, info->phys_reg_addr));
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index a624ffd7baaa..bec54866e0bb 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -3643,7 +3643,8 @@ static int claim_resources(SLMP_INFO *info)
3643 else 3643 else
3644 info->sca_statctrl_requested = true; 3644 info->sca_statctrl_requested = true;
3645 3645
3646 info->memory_base = ioremap(info->phys_memory_base,SCA_MEM_SIZE); 3646 info->memory_base = ioremap_nocache(info->phys_memory_base,
3647 SCA_MEM_SIZE);
3647 if (!info->memory_base) { 3648 if (!info->memory_base) {
3648 printk( "%s(%d):%s Cant map shared memory, MemAddr=%08X\n", 3649 printk( "%s(%d):%s Cant map shared memory, MemAddr=%08X\n",
3649 __FILE__,__LINE__,info->device_name, info->phys_memory_base ); 3650 __FILE__,__LINE__,info->device_name, info->phys_memory_base );
@@ -3651,7 +3652,7 @@ static int claim_resources(SLMP_INFO *info)
3651 goto errout; 3652 goto errout;
3652 } 3653 }
3653 3654
3654 info->lcr_base = ioremap(info->phys_lcr_base,PAGE_SIZE); 3655 info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE);
3655 if (!info->lcr_base) { 3656 if (!info->lcr_base) {
3656 printk( "%s(%d):%s Cant map LCR memory, MemAddr=%08X\n", 3657 printk( "%s(%d):%s Cant map LCR memory, MemAddr=%08X\n",
3657 __FILE__,__LINE__,info->device_name, info->phys_lcr_base ); 3658 __FILE__,__LINE__,info->device_name, info->phys_lcr_base );
@@ -3660,7 +3661,7 @@ static int claim_resources(SLMP_INFO *info)
3660 } 3661 }
3661 info->lcr_base += info->lcr_offset; 3662 info->lcr_base += info->lcr_offset;
3662 3663
3663 info->sca_base = ioremap(info->phys_sca_base,PAGE_SIZE); 3664 info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE);
3664 if (!info->sca_base) { 3665 if (!info->sca_base) {
3665 printk( "%s(%d):%s Cant map SCA memory, MemAddr=%08X\n", 3666 printk( "%s(%d):%s Cant map SCA memory, MemAddr=%08X\n",
3666 __FILE__,__LINE__,info->device_name, info->phys_sca_base ); 3667 __FILE__,__LINE__,info->device_name, info->phys_sca_base );
@@ -3669,7 +3670,8 @@ static int claim_resources(SLMP_INFO *info)
3669 } 3670 }
3670 info->sca_base += info->sca_offset; 3671 info->sca_base += info->sca_offset;
3671 3672
3672 info->statctrl_base = ioremap(info->phys_statctrl_base,PAGE_SIZE); 3673 info->statctrl_base = ioremap_nocache(info->phys_statctrl_base,
3674 PAGE_SIZE);
3673 if (!info->statctrl_base) { 3675 if (!info->statctrl_base) {
3674 printk( "%s(%d):%s Cant map SCA Status/Control memory, MemAddr=%08X\n", 3676 printk( "%s(%d):%s Cant map SCA Status/Control memory, MemAddr=%08X\n",
3675 __FILE__,__LINE__,info->device_name, info->phys_statctrl_base ); 3677 __FILE__,__LINE__,info->device_name, info->phys_statctrl_base );