diff options
author | Andrew Morton <akpm@osdl.org> | 2006-07-03 03:24:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 18:27:00 -0400 |
commit | 5863aa651bd79a6bb15972894306923db088e71c (patch) | |
tree | 99e945816bedc1f72c30c8fc8cc0930a6da9e095 | |
parent | 6b8f3ef454d60e0c7ec42400400dc0fe7b5a4f7d (diff) |
[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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | sound/sparc/amd7930.c | 4 | ||||
-rw-r--r-- | sound/sparc/cs4231.c | 2 | ||||
-rw-r--r-- | sound/sparc/dbri.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index db3e22efd02e..2bd8e40b8541 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c | |||
@@ -1033,10 +1033,10 @@ static int __init amd7930_attach_common(struct resource *rp, int irq) | |||
1033 | 1033 | ||
1034 | strcpy(card->driver, "AMD7930"); | 1034 | strcpy(card->driver, "AMD7930"); |
1035 | strcpy(card->shortname, "Sun AMD7930"); | 1035 | strcpy(card->shortname, "Sun AMD7930"); |
1036 | sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d", | 1036 | sprintf(card->longname, "%s at 0x%02lx:0x%08Lx, irq %d", |
1037 | card->shortname, | 1037 | card->shortname, |
1038 | rp->flags & 0xffL, | 1038 | rp->flags & 0xffL, |
1039 | rp->start, | 1039 | (unsigned long long)rp->start, |
1040 | irq); | 1040 | irq); |
1041 | 1041 | ||
1042 | if ((err = snd_amd7930_create(card, rp, | 1042 | if ((err = snd_amd7930_create(card, rp, |
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 5018fcf41df5..9a06c3bd6944 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
@@ -2036,7 +2036,7 @@ static int __init cs4231_sbus_attach(struct sbus_dev *sdev) | |||
2036 | if (err) | 2036 | if (err) |
2037 | return err; | 2037 | return err; |
2038 | 2038 | ||
2039 | sprintf(card->longname, "%s at 0x%02lx:0x%016lx, irq %d", | 2039 | sprintf(card->longname, "%s at 0x%02lx:0x%016Lx, irq %d", |
2040 | card->shortname, | 2040 | card->shortname, |
2041 | rp->flags & 0xffL, | 2041 | rp->flags & 0xffL, |
2042 | (unsigned long long)rp->start, | 2042 | (unsigned long long)rp->start, |
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 59a02a0d9afc..f3ae6e23610e 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
@@ -2645,7 +2645,7 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev) | |||
2645 | strcpy(card->driver, "DBRI"); | 2645 | strcpy(card->driver, "DBRI"); |
2646 | strcpy(card->shortname, "Sun DBRI"); | 2646 | strcpy(card->shortname, "Sun DBRI"); |
2647 | rp = &sdev->resource[0]; | 2647 | rp = &sdev->resource[0]; |
2648 | sprintf(card->longname, "%s at 0x%02lx:0x%016lx, irq %d", | 2648 | sprintf(card->longname, "%s at 0x%02lx:0x%016Lx, irq %d", |
2649 | card->shortname, | 2649 | card->shortname, |
2650 | rp->flags & 0xffL, (unsigned long long)rp->start, irq.pri); | 2650 | rp->flags & 0xffL, (unsigned long long)rp->start, irq.pri); |
2651 | 2651 | ||