Skip to contentSkip to conversation

isdn sc driver gcc 4.1 warnings fix

PATCH New Daniel Walker 1 participant 1 message May 10, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 isdn sc driver gcc 4.1 warnings fix

Fixes the following warnings,

drivers/isdn/sc/shmem.c: In function 'memcpy_toshmem':
drivers/isdn/sc/shmem.c:60: warning: passing argument 1 of 'memcpy_toio' makes pointer from integer without a cast drivers/isdn/sc/init.c: In function 'identify_board':
drivers/isdn/sc/init.c:492: warning: passing argument 1 of 'readl' makes pointer from integer without a cast drivers/isdn/sc/init.c:502: warning: passing argument 1 of 'readl' makes pointer from integer without a cast drivers/isdn/sc/init.c:512: warning: passing argument 1 of 'readl' makes pointer from integer without a cast

drivers/isdn/sc/init.c +3 -3
Index: linux-2.6.16/drivers/isdn/sc/init.c
===================================================================
@@ -489,7 +489,7 @@ static int identify_board(unsigned long 
 	 */
 	outb(PRI_BASEPG_VAL, pgport);
 	msleep_interruptible(1000);
-	sig = readl(rambase + SIG_OFFSET);
+	sig = readl((void *)(rambase + SIG_OFFSET));
 	pr_debug("Looking for a signature, got 0x%x\n", sig);
 	if(sig == SIGNATURE)
 		return PRI_BOARD;
@@ -499,7 +499,7 @@ static int identify_board(unsigned long 
 	 */
 	outb(BRI_BASEPG_VAL, pgport);
 	msleep_interruptible(1000);
-	sig = readl(rambase + SIG_OFFSET);
+	sig = readl((void *)(rambase + SIG_OFFSET));
 	pr_debug("Looking for a signature, got 0x%x\n", sig);
 	if(sig == SIGNATURE)
 		return BRI_BOARD;
@@ -509,7 +509,7 @@ static int identify_board(unsigned long 
 	/*
 	 * Try to spot a card
 	 */
-	sig = readl(rambase + SIG_OFFSET);
+	sig = readl((void *)(rambase + SIG_OFFSET));
 	pr_debug("Looking for a signature, got 0x%x\n", sig);
 	if(sig != SIGNATURE)
 		return -1;
drivers/isdn/sc/shmem.c +2 -2
Index: linux-2.6.16/drivers/isdn/sc/shmem.c
===================================================================
@@ -56,8 +56,8 @@ void memcpy_toshmem(int card, void *dest
 
 	outb(((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE) >> 14) | 0x80,
 		sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport]);
-	memcpy_toio(sc_adapter[card]->rambase +
-		((unsigned long) dest % 0x4000), src, n);
+	memcpy_toio((void *)(sc_adapter[card]->rambase +
+		((unsigned long) dest % 0x4000)), src, n);
 	spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);
 	pr_debug("%s: set page to %#x\n",sc_adapter[card]->devicename,
 		((sc_adapter[card]->shmem_magic + ch * SRAM_PAGESIZE)>>14)|0x80);