Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24cb2335 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files

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: default avatarAlan Cox <alan@redhat.com>
Cc: Paul Fulghum <paulkf@microgate.com>
Acked-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a6fc819e

drivers/char/applicom.c

+2 −2
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static int __init applicom_init(void) 
		if (pci_enable_device(dev))

			return -EIO;



		RamIO = ioremap(pci_resource_start(dev, 0), LEN_RAM_IO);

		RamIO = ioremap_nocache(pci_resource_start(dev, 0), LEN_RAM_IO);



		if (!RamIO) {

			printk(KERN_INFO "ac.o: Failed to ioremap PCI memory "
@@ -254,7 +254,7 @@ static int __init applicom_init(void) 
	/* Now try the specified ISA cards */



	for (i = 0; i < MAX_ISA_BOARD; i++) {

		RamIO = ioremap(mem + (LEN_RAM_IO * i), LEN_RAM_IO);

		RamIO = ioremap_nocache(mem + (LEN_RAM_IO * i), LEN_RAM_IO);



		if (!RamIO) {

			printk(KERN_INFO "ac.o: Failed to ioremap the ISA card's memory space (slot #%d)\n", i + 1);

drivers/char/istallion.c

+3 −3
Original line number Diff line number Diff line
@@ -3257,7 +3257,7 @@ static int stli_initecp(struct stlibrd *brdp) 
 */

	EBRDINIT(brdp);



	brdp->membase = ioremap(brdp->memaddr, brdp->memsize);

	brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);

	if (brdp->membase == NULL) {

		retval = -ENOMEM;

		goto err_reg;
@@ -3414,7 +3414,7 @@ static int stli_initonb(struct stlibrd *brdp) 
 */

	EBRDINIT(brdp);



	brdp->membase = ioremap(brdp->memaddr, brdp->memsize);

	brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);

	if (brdp->membase == NULL) {

		retval = -ENOMEM;

		goto err_reg;
@@ -3665,7 +3665,7 @@ static int stli_eisamemprobe(struct stlibrd *brdp) 
 */

	for (i = 0; (i < stli_eisamempsize); i++) {

		brdp->memaddr = stli_eisamemprobeaddrs[i];

		brdp->membase = ioremap(brdp->memaddr, brdp->memsize);

		brdp->membase = ioremap_nocache(brdp->memaddr, brdp->memsize);

		if (brdp->membase == NULL)

			continue;

drivers/char/moxa.c

+2 −2
Original line number Diff line number Diff line
@@ -937,7 +937,7 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev, 
		goto err;

	}



	board->basemem = ioremap(pci_resource_start(pdev, 2), 0x4000);

	board->basemem = ioremap_nocache(pci_resource_start(pdev, 2), 0x4000);

	if (board->basemem == NULL) {

		dev_err(&pdev->dev, "can't remap io space 2\n");

		goto err_reg;
@@ -1042,7 +1042,7 @@ static int __init moxa_init(void) 
			brd->numPorts = type[i] == MOXA_BOARD_C218_ISA ? 8 :

					numports[i];

			brd->busType = MOXA_BUS_TYPE_ISA;

			brd->basemem = ioremap(baseaddr[i], 0x4000);

			brd->basemem = ioremap_nocache(baseaddr[i], 0x4000);

			if (!brd->basemem) {

				printk(KERN_ERR "MOXA: can't remap %lx\n",

						baseaddr[i]);

drivers/char/nozomi.c

+1 −1
Original line number Diff line number Diff line
@@ -1407,7 +1407,7 @@ static int __devinit nozomi_card_init(struct pci_dev *pdev, 
	/* Find out what card type it is */

	nozomi_get_card_type(dc);



	dc->base_addr = ioremap(start, dc->card_type);

	dc->base_addr = ioremap_nocache(start, dc->card_type);

	if (!dc->base_addr) {

		dev_err(&pdev->dev, "Unable to map card MMIO\n");

		ret = -ENODEV;

drivers/char/sx.c

+5 −5
Original line number Diff line number Diff line
@@ -2540,7 +2540,7 @@ static int __devinit sx_eisa_probe(struct device *dev) 
		goto err_flag;

	}

	board->base2 =

	board->base = ioremap(board->hw_base, SI2_EISA_WINDOW_LEN);

	board->base = ioremap_nocache(board->hw_base, SI2_EISA_WINDOW_LEN);

	if (!board->base) {

		dev_err(dev, "can't remap memory\n");

		goto err_reg;
@@ -2617,7 +2617,7 @@ static void __devinit fix_sx_pci(struct pci_dev *pdev, struct sx_board *board) 


	pci_read_config_dword(pdev, PCI_BASE_ADDRESS_0, &hwbase);

	hwbase &= PCI_BASE_ADDRESS_MEM_MASK;

	rebase = ioremap(hwbase, 0x80);

	rebase = ioremap_nocache(hwbase, 0x80);

	t = readl(rebase + CNTRL_REG_OFFSET);

	if (t != CNTRL_REG_GOODVALUE) {

		printk(KERN_DEBUG "sx: performing cntrl reg fix: %08x -> "
@@ -2761,7 +2761,7 @@ static int __init sx_init(void) 
		if (!request_region(board->hw_base, board->hw_len, "sx"))

			continue;

		board->base2 =

		board->base = ioremap(board->hw_base, board->hw_len);

		board->base = ioremap_nocache(board->hw_base, board->hw_len);

		if (!board->base)

			goto err_sx_reg;

		board->flags &= ~SX_BOARD_TYPE;
@@ -2785,7 +2785,7 @@ static int __init sx_init(void) 
		if (!request_region(board->hw_base, board->hw_len, "sx"))

			continue;

		board->base2 =

		board->base = ioremap(board->hw_base, board->hw_len);

		board->base = ioremap_nocache(board->hw_base, board->hw_len);

		if (!board->base)

			goto err_si_reg;

		board->flags &= ~SX_BOARD_TYPE;
@@ -2808,7 +2808,7 @@ static int __init sx_init(void) 
		if (!request_region(board->hw_base, board->hw_len, "sx"))

			continue;

		board->base2 =

		board->base = ioremap(board->hw_base, board->hw_len);

		board->base = ioremap_nocache(board->hw_base, board->hw_len);

		if (!board->base)

			goto err_si1_reg;

		board->flags &= ~SX_BOARD_TYPE;