On Tue, Oct 23, 2007 at 06:36:39PM -0400, Jeff Garzik wrote:
> drivers/isdn/sc/shmem.c: In function ‘memcpy_toshmem’:
> drivers/isdn/sc/shmem.c:54: warning: passing argument 1 of ‘memcpy_toio’
> makes pointer from integer without a cast
>
> Also, remove some unneeded braces, and add some useful whitespace.
>
> Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
Acked.
> ---
>
> diff --git a/drivers/isdn/sc/shmem.c b/drivers/isdn/sc/shmem.c
> index 034d41a..e0331e0 100644
> --- a/drivers/isdn/sc/shmem.c
> +++ b/drivers/isdn/sc/shmem.c
> @@ -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);
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [EMAIL PROTECTED]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
Karsten Keil
SuSE Labs
ISDN and VOIP development
SUSE LINUX Products GmbH, Maxfeldstr.5 90409 Nuernberg, GF: Markus Rex, HRB
16746 (AG Nuernberg)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
