Subject: Re: linux-next: sparc build warnings

From: David Miller <[email-masked]>
Date: Tue, 02 Sep 2008 03:16:27 -0700 (PDT)

From: Stephen Rothwell <[email-masked]>
Date: Tue, 2 Sep 2008 18:53:34 +1000

> Today's linux-next build (sparc defconfig) got these warnings:
> 
> arch/sparc/mm/sun4c.c:1111: warning: "struct sbus_bus" declared inside parameter list
> arch/sparc/mm/sun4c.c:1111: warning: its scope is only this definition or declaration, which is probably not what you want
> arch/sparc/mm/sun4c.c:1123: warning: "struct sbus_bus" declared inside parameter list
> arch/sparc/mm/sun4c.c:1133: warning: "struct sbus_bus" declared inside parameter list
> arch/sparc/mm/sun4c.c:1140: warning: "struct sbus_bus" declared inside parameter list

Thankfully these were harmless :)

I've just pushed the following fix for this, thanks.

sparc32: Fix sun4c build warnings.

Reported by Stephen Rothwell.

Signed-off-by: David S. Miller <[email-masked]>
---
 arch/sparc/mm/sun4c.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index 95070a1..fe65aee 100644
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -1108,7 +1108,7 @@ static void sun4c_unlockarea(char *vaddr, unsigned long size)
  * by implication and fool the page locking code above
  * if passed to by mistake.
  */
-static __u32 sun4c_get_scsi_one(char *bufptr, unsigned long len, struct sbus_bus *sbus)
+static __u32 sun4c_get_scsi_one(struct device *dev, char *bufptr, unsigned long len)
 {
 	unsigned long page;
 
@@ -1120,7 +1120,7 @@ static __u32 sun4c_get_scsi_one(char *bufptr, unsigned long len, struct sbus_bus
 	return (__u32)sun4c_lockarea(bufptr, len);
 }
 
-static void sun4c_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus *sbus)
+static void sun4c_get_scsi_sgl(struct device *dev, struct scatterlist *sg, int sz)
 {
 	while (sz != 0) {
 		--sz;
@@ -1130,14 +1130,14 @@ static void sun4c_get_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus *
 	}
 }
 
-static void sun4c_release_scsi_one(__u32 bufptr, unsigned long len, struct sbus_bus *sbus)
+static void sun4c_release_scsi_one(struct device *dev, __u32 bufptr, unsigned long len)
 {
 	if (bufptr < sun4c_iobuffer_start)
 		return; /* On kernel stack or similar, see above */
 	sun4c_unlockarea((char *)bufptr, len);
 }
 
-static void sun4c_release_scsi_sgl(struct scatterlist *sg, int sz, struct sbus_bus *sbus)
+static void sun4c_release_scsi_sgl(struct device *dev, struct scatterlist *sg, int sz)
 {
 	while (sz != 0) {
 		--sz;
-- 
1.5.6.5.GIT