Commit 5863aa65 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] sparc: resource warning fix

sound/sparc/amd7930.c: In function 'amd7930_attach_common':
sound/sparc/amd7930.c:1040: warning: format '%08lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t'

sound/sparc/cs4231.c:2043: warning: format '%016lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t'

sound/sparc/dbri.c: In function 'dbri_attach':
sound/sparc/dbri.c:2650: warning: format '%016lx' expects type 'long unsigned int', but argument 5 has type 'resource_size_t'
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6b8f3ef4
...@@ -1033,10 +1033,10 @@ static int __init amd7930_attach_common(struct resource *rp, int irq) ...@@ -1033,10 +1033,10 @@ static int __init amd7930_attach_common(struct resource *rp, int irq)
strcpy(card->driver, "AMD7930"); strcpy(card->driver, "AMD7930");
strcpy(card->shortname, "Sun AMD7930"); strcpy(card->shortname, "Sun AMD7930");
sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d", sprintf(card->longname, "%s at 0x%02lx:0x%08Lx, irq %d",
card->shortname, card->shortname,
rp->flags & 0xffL, rp->flags & 0xffL,
rp->start, (unsigned long long)rp->start,
irq); irq);
if ((err = snd_amd7930_create(card, rp, if ((err = snd_amd7930_create(card, rp,
......
...@@ -2036,7 +2036,7 @@ static int __init cs4231_sbus_attach(struct sbus_dev *sdev) ...@@ -2036,7 +2036,7 @@ static int __init cs4231_sbus_attach(struct sbus_dev *sdev)
if (err) if (err)
return err; return err;
sprintf(card->longname, "%s at 0x%02lx:0x%016lx, irq %d", sprintf(card->longname, "%s at 0x%02lx:0x%016Lx, irq %d",
card->shortname, card->shortname,
rp->flags & 0xffL, rp->flags & 0xffL,
(unsigned long long)rp->start, (unsigned long long)rp->start,
......
...@@ -2645,7 +2645,7 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev) ...@@ -2645,7 +2645,7 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
strcpy(card->driver, "DBRI"); strcpy(card->driver, "DBRI");
strcpy(card->shortname, "Sun DBRI"); strcpy(card->shortname, "Sun DBRI");
rp = &sdev->resource[0]; rp = &sdev->resource[0];
sprintf(card->longname, "%s at 0x%02lx:0x%016lx, irq %d", sprintf(card->longname, "%s at 0x%02lx:0x%016Lx, irq %d",
card->shortname, card->shortname,
rp->flags & 0xffL, (unsigned long long)rp->start, irq.pri); rp->flags & 0xffL, (unsigned long long)rp->start, irq.pri);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment