Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81b36a0b authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Kumar Gala
Browse files

powerpc/83xx: Fix sparse warnings in board files 



This patch fixes following sparse warnings:

  CHECK   83xx/usb.c
83xx/usb.c:205:5: warning: symbol 'mpc837x_usb_cfg' was not declared. Should it be static?
  CHECK   83xx/mpc831x_rdb.c
83xx/mpc831x_rdb.c:45:13: warning: symbol 'mpc831x_rdb_init_IRQ' was not declared. Should it be static?
  CHECK   83xx/mpc832x_rdb.c
83xx/mpc832x_rdb.c:133:13: warning: symbol 'mpc832x_rdb_init_IRQ' was not declared. Should it be static?
  CHECK   83xx/mpc832x_mds.c
83xx/mpc832x_mds.c:68:12: warning: Using plain integer as NULL pointer
83xx/mpc832x_mds.c:72:13: warning: incorrect type in assignment (different address spaces)
83xx/mpc832x_mds.c:72:13:    expected unsigned char [usertype] *static [toplevel] bcsr_regs
83xx/mpc832x_mds.c:72:13:    got void [noderef] <asn:2>*
83xx/mpc832x_mds.c:99:11: warning: incorrect type in argument 1 (different address spaces)
83xx/mpc832x_mds.c:99:11:    expected void volatile [noderef] <asn:2>*addr
83xx/mpc832x_mds.c:99:11:    got unsigned char [usertype] *static [toplevel] bcsr_regs

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent a5dae76a

arch/powerpc/platforms/83xx/mpc831x_rdb.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static void __init mpc831x_rdb_setup_arch(void) 
	mpc831x_usb_cfg();

}



void __init mpc831x_rdb_init_IRQ(void)

static void __init mpc831x_rdb_init_IRQ(void)

{

	struct device_node *np;

arch/powerpc/platforms/83xx/mpc832x_mds.c

+4 −5
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ 
#define DBG(fmt...)

#endif



static u8 *bcsr_regs = NULL;



/* ************************************************************************

 *

 * Setup the architecture
@@ -59,13 +57,14 @@ static u8 *bcsr_regs = NULL; 
static void __init mpc832x_sys_setup_arch(void)

{

	struct device_node *np;

	u8 __iomem *bcsr_regs = NULL;



	if (ppc_md.progress)

		ppc_md.progress("mpc832x_sys_setup_arch()", 0);



	/* Map BCSR area */

	np = of_find_node_by_name(NULL, "bcsr");

	if (np != 0) {

	if (np) {

		struct resource res;



		of_address_to_resource(np, 0, &res);
@@ -93,9 +92,9 @@ static void __init mpc832x_sys_setup_arch(void) 
			!= NULL){

		/* Reset the Ethernet PHYs */

#define BCSR8_FETH_RST 0x50

		bcsr_regs[8] &= ~BCSR8_FETH_RST;

		clrbits8(&bcsr_regs[8], BCSR8_FETH_RST);

		udelay(1000);

		bcsr_regs[8] |= BCSR8_FETH_RST;

		setbits8(&bcsr_regs[8], BCSR8_FETH_RST);

		iounmap(bcsr_regs);

		of_node_put(np);

	}

arch/powerpc/platforms/83xx/mpc832x_rdb.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int __init mpc832x_declare_of_platform_devices(void) 
}

machine_device_initcall(mpc832x_rdb, mpc832x_declare_of_platform_devices);



void __init mpc832x_rdb_init_IRQ(void)

static void __init mpc832x_rdb_init_IRQ(void)

{



	struct device_node *np;

arch/powerpc/platforms/83xx/mpc837x_mds.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#define BCSR12_USB_SER_MASK	0x8a

#define BCSR12_USB_SER_PIN	0x80

#define BCSR12_USB_SER_DEVICE	0x02

extern int mpc837x_usb_cfg(void);



static int mpc837xmds_usb_cfg(void)

{

arch/powerpc/platforms/83xx/mpc837x_rdb.c

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 


#include "mpc83xx.h"



extern int mpc837x_usb_cfg(void);



/* ************************************************************************

 *

 * Setup the architecture