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

zorro: ZTWO_VADDR() should return "void __iomem *"

ZTWO_VADDR() converts from physical to virtual I/O addresses, so it should
return "void __iomem *" instead of "unsigned long".

This allows to drop several casts, but requires adding a few casts to
accomodate legacy driver frameworks that store "unsigned long" I/O
addresses.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Geert Uytterhoeven 6112ea08 83b7bce3

+22 -22
+1 -1
arch/m68k/amiga/chipram.c
··· 87 87 88 88 atomic_sub(size, &chipavail); 89 89 pr_debug("amiga_chip_alloc_res: returning %pR\n", res); 90 - return (void *)ZTWO_VADDR(res->start); 90 + return ZTWO_VADDR(res->start); 91 91 } 92 92 93 93 void amiga_chip_free(void *ptr)
+1 -1
arch/m68k/amiga/config.c
··· 618 618 619 619 /* Just steal the block, the chipram allocator isn't functional yet */ 620 620 amiga_chip_size -= SAVEKMSG_MAXMEM; 621 - savekmsg = (void *)ZTWO_VADDR(CHIP_PHYSADDR + amiga_chip_size); 621 + savekmsg = ZTWO_VADDR(CHIP_PHYSADDR + amiga_chip_size); 622 622 savekmsg->magic1 = SAVEKMSG_MAGIC1; 623 623 savekmsg->magic2 = SAVEKMSG_MAGIC2; 624 624 savekmsg->magicptr = ZTWO_PADDR(savekmsg);
+1 -1
arch/m68k/include/asm/amigahw.h
··· 266 266 267 267 #define zTwoBase (0x80000000) 268 268 #define ZTWO_PADDR(x) (((unsigned long)(x))-zTwoBase) 269 - #define ZTWO_VADDR(x) (((unsigned long)(x))+zTwoBase) 269 + #define ZTWO_VADDR(x) ((void __iomem *)(((unsigned long)(x))+zTwoBase)) 270 270 271 271 #define CUSTOM_PHYSADDR (0xdff000) 272 272 #define amiga_custom ((*(volatile struct CUSTOM *)(zTwoBase+CUSTOM_PHYSADDR)))
+2 -2
drivers/block/z2ram.c
··· 116 116 if ( test_bit( i, zorro_unused_z2ram ) ) 117 117 { 118 118 z2_count++; 119 - z2ram_map[ z2ram_size++ ] = 120 - ZTWO_VADDR( Z2RAM_START ) + ( i << Z2RAM_CHUNKSHIFT ); 119 + z2ram_map[z2ram_size++] = (unsigned long)ZTWO_VADDR(Z2RAM_START) + 120 + (i << Z2RAM_CHUNKSHIFT); 121 121 clear_bit( i, zorro_unused_z2ram ); 122 122 } 123 123 }
+1 -1
drivers/ide/buddha.c
··· 198 198 continue; 199 199 } 200 200 } 201 - buddha_board = ZTWO_VADDR(board); 201 + buddha_board = (unsigned long)ZTWO_VADDR(board); 202 202 203 203 /* write to BUDDHA_IRQ_MR to enable the board IRQ */ 204 204 /* X-Surf doesn't have this. IRQs are always on */
+1 -1
drivers/net/ethernet/8390/hydra.c
··· 113 113 static int hydra_init(struct zorro_dev *z) 114 114 { 115 115 struct net_device *dev; 116 - unsigned long board = ZTWO_VADDR(z->resource.start); 116 + unsigned long board = (unsigned long)ZTWO_VADDR(z->resource.start); 117 117 unsigned long ioaddr = board+HYDRA_NIC_BASE; 118 118 const char name[] = "NE2000"; 119 119 int start_page, stop_page;
+2 -2
drivers/net/ethernet/8390/zorro8390.c
··· 287 287 }; 288 288 289 289 static int zorro8390_init(struct net_device *dev, unsigned long board, 290 - const char *name, unsigned long ioaddr) 290 + const char *name, void __iomem *ioaddr) 291 291 { 292 292 int i; 293 293 int err; ··· 354 354 start_page = NESM_START_PG; 355 355 stop_page = NESM_STOP_PG; 356 356 357 - dev->base_addr = ioaddr; 357 + dev->base_addr = (unsigned long)ioaddr; 358 358 dev->irq = IRQ_AMIGA_PORTS; 359 359 360 360 /* Install the Interrupt handler */
+2 -2
drivers/net/ethernet/amd/a2065.c
··· 713 713 dev->dev_addr[3] = (z->rom.er_SerialNumber >> 16) & 0xff; 714 714 dev->dev_addr[4] = (z->rom.er_SerialNumber >> 8) & 0xff; 715 715 dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff; 716 - dev->base_addr = ZTWO_VADDR(base_addr); 717 - dev->mem_start = ZTWO_VADDR(mem_start); 716 + dev->base_addr = (unsigned long)ZTWO_VADDR(base_addr); 717 + dev->mem_start = (unsigned long)ZTWO_VADDR(mem_start); 718 718 dev->mem_end = dev->mem_start + A2065_RAM_SIZE; 719 719 720 720 priv->ll = (volatile struct lance_regs *)dev->base_addr;
+2 -2
drivers/net/ethernet/amd/ariadne.c
··· 747 747 dev->dev_addr[3] = (z->rom.er_SerialNumber >> 16) & 0xff; 748 748 dev->dev_addr[4] = (z->rom.er_SerialNumber >> 8) & 0xff; 749 749 dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff; 750 - dev->base_addr = ZTWO_VADDR(base_addr); 751 - dev->mem_start = ZTWO_VADDR(mem_start); 750 + dev->base_addr = (unsigned long)ZTWO_VADDR(base_addr); 751 + dev->mem_start = (unsigned long)ZTWO_VADDR(mem_start); 752 752 dev->mem_end = dev->mem_start + ARIADNE_RAM_SIZE; 753 753 754 754 dev->netdev_ops = &ariadne_netdev_ops;
+1 -1
drivers/parport/parport_mfc3.c
··· 300 300 if (!request_mem_region(piabase, sizeof(struct pia), "PIA")) 301 301 continue; 302 302 303 - pp = (struct pia *)ZTWO_VADDR(piabase); 303 + pp = ZTWO_VADDR(piabase); 304 304 pp->crb = 0; 305 305 pp->pddrb = 255; /* all data pins output */ 306 306 pp->crb = PIA_DDR|32|8;
+1 -1
drivers/scsi/a2091.c
··· 201 201 instance->irq = IRQ_AMIGA_PORTS; 202 202 instance->unique_id = z->slotaddr; 203 203 204 - regs = (struct a2091_scsiregs *)ZTWO_VADDR(z->resource.start); 204 + regs = ZTWO_VADDR(z->resource.start); 205 205 regs->DAWR = DAWR_A2091; 206 206 207 207 wdregs.SASR = &regs->SASR;
+1 -1
drivers/scsi/a3000.c
··· 220 220 221 221 instance->irq = IRQ_AMIGA_PORTS; 222 222 223 - regs = (struct a3000_scsiregs *)ZTWO_VADDR(res->start); 223 + regs = ZTWO_VADDR(res->start); 224 224 regs->DAWR = DAWR_A3000; 225 225 226 226 wdregs.SASR = &regs->SASR;
+1 -1
drivers/scsi/a4000t.c
··· 56 56 scsi_addr = res->start + A4000T_SCSI_OFFSET; 57 57 58 58 /* Fill in the required pieces of hostdata */ 59 - hostdata->base = (void __iomem *)ZTWO_VADDR(scsi_addr); 59 + hostdata->base = ZTWO_VADDR(scsi_addr); 60 60 hostdata->clock = 50; 61 61 hostdata->chip710 = 1; 62 62 hostdata->dmode_extra = DMODE_FC2;
+1 -1
drivers/scsi/gvp11.c
··· 310 310 if (!request_mem_region(address, 256, "wd33c93")) 311 311 return -EBUSY; 312 312 313 - regs = (struct gvp11_scsiregs *)(ZTWO_VADDR(address)); 313 + regs = ZTWO_VADDR(address); 314 314 315 315 error = check_wd33c93(regs); 316 316 if (error)
+1 -1
drivers/scsi/zorro7xx.c
··· 104 104 if (ioaddr > 0x01000000) 105 105 hostdata->base = ioremap(ioaddr, zorro_resource_len(z)); 106 106 else 107 - hostdata->base = (void __iomem *)ZTWO_VADDR(ioaddr); 107 + hostdata->base = ZTWO_VADDR(ioaddr); 108 108 109 109 hostdata->clock = 50; 110 110 hostdata->chip710 = 1;
+1 -1
drivers/video/amifb.c
··· 3710 3710 if (!videomemory) { 3711 3711 dev_warn(&pdev->dev, 3712 3712 "Unable to map videomem cached writethrough\n"); 3713 - info->screen_base = (char *)ZTWO_VADDR(info->fix.smem_start); 3713 + info->screen_base = ZTWO_VADDR(info->fix.smem_start); 3714 3714 } else 3715 3715 info->screen_base = (char *)videomemory; 3716 3716
+2 -2
drivers/video/cirrusfb.c
··· 2256 2256 2257 2257 info->fix.mmio_start = regbase; 2258 2258 cinfo->regbase = regbase > 16 * MB_ ? ioremap(regbase, 64 * 1024) 2259 - : (caddr_t)ZTWO_VADDR(regbase); 2259 + : ZTWO_VADDR(regbase); 2260 2260 if (!cinfo->regbase) { 2261 2261 dev_err(info->device, "Cannot map registers\n"); 2262 2262 error = -EIO; ··· 2266 2266 info->fix.smem_start = rambase; 2267 2267 info->screen_size = ramsize; 2268 2268 info->screen_base = rambase > 16 * MB_ ? ioremap(rambase, ramsize) 2269 - : (caddr_t)ZTWO_VADDR(rambase); 2269 + : ZTWO_VADDR(rambase); 2270 2270 if (!info->screen_base) { 2271 2271 dev_err(info->device, "Cannot map video RAM\n"); 2272 2272 error = -EIO;