warning fix
PATCH 1/1 warning fix
Ack'd by the ISDN maintainer.
Please pull from 'warnings-upstream' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6.git warnings-upstream
to receive the following updates:
drivers/isdn/sc/shmem.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
Jeff Garzik (1):
ISDN/sc: fix longstanding warning
drivers/isdn/sc/shmem.c +4 -5
@@ -28,15 +28,15 @@ void memcpy_toshmem(int card, void *dest, const void *src, size_t n) {unsigned long flags;unsigned char ch; +unsigned long dest_rem = ((unsigned long ) dest) %0x4000 ; -if (!IS_VALID_CARD (card)) { +if (!IS_VALID_CARD (card)) {pr_debug ("Invalid param: %d is not a valid card id\n" , card);return ; } -if (n >SRAM_PAGESIZE ) { +if (n >SRAM_PAGESIZE )return ; - }/* * determine the page to load from the address
@@ -50,8 +50,7 @@ void memcpy_toshmem(int card, void *dest, const void *src, size_t n)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 (sc_adapter[card]->rambase + dest_rem, 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 );