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

Commit 10a3c45c authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sascha Hauer
Browse files

ARM: iomux-imx31: allow pin_list to be const 



This fixes the following warning in a mx3_defconfig build:

	arch/arm/mach-mx3/mach-bug.c: In function 'bug_board_init':
	arch/arm/mach-mx3/mach-bug.c:47: warning: passing argument 1 of 'mxc_iomux_setup_multiple_pins' discards qualifiers from pointer target type

While at it remove some useless consts from unsigned int arguments.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 20930238

arch/arm/mach-mx3/iomux-imx31.c

+6 −6
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ EXPORT_SYMBOL(mxc_iomux_set_pad); 
 * 	- reserves the pin so that it is not claimed by another driver

 * 	- setups the iomux according to the configuration

 */

int mxc_iomux_alloc_pin(const unsigned int pin, const char *label)

int mxc_iomux_alloc_pin(unsigned int pin, const char *label)

{

	unsigned pad = pin & IOMUX_PADNUM_MASK;
@@ -118,10 +118,10 @@ int mxc_iomux_alloc_pin(const unsigned int pin, const char *label) 
}

EXPORT_SYMBOL(mxc_iomux_alloc_pin);



int mxc_iomux_setup_multiple_pins(unsigned int *pin_list, unsigned count,

int mxc_iomux_setup_multiple_pins(const unsigned int *pin_list, unsigned count,

		const char *label)

{

	unsigned int *p = pin_list;

	const unsigned int *p = pin_list;

	int i;

	int ret = -EINVAL;
@@ -139,7 +139,7 @@ int mxc_iomux_setup_multiple_pins(unsigned int *pin_list, unsigned count, 
}

EXPORT_SYMBOL(mxc_iomux_setup_multiple_pins);



void mxc_iomux_release_pin(const unsigned int pin)

void mxc_iomux_release_pin(unsigned int pin)

{

	unsigned pad = pin & IOMUX_PADNUM_MASK;
@@ -148,9 +148,9 @@ void mxc_iomux_release_pin(const unsigned int pin) 
}

EXPORT_SYMBOL(mxc_iomux_release_pin);



void mxc_iomux_release_multiple_pins(unsigned int *pin_list, int count)

void mxc_iomux_release_multiple_pins(const unsigned int *pin_list, int count)

{

	unsigned int *p = pin_list;

	const unsigned int *p = pin_list;

	int i;



	for (i = 0; i < count; i++) {

arch/arm/plat-mxc/include/mach/iomux-mx3.h

+4 −4
Original line number Diff line number Diff line
@@ -112,12 +112,12 @@ enum iomux_gp_func { 
 * 	- setups the iomux according to the configuration

 * 	- if the pin is configured as a GPIO, we claim it through kernel gpiolib

 */

int mxc_iomux_alloc_pin(const unsigned int pin, const char *label);

int mxc_iomux_alloc_pin(unsigned int pin, const char *label);

/*

 * setups mutliple pins

 * convenient way to call the above function with tables

 */

int mxc_iomux_setup_multiple_pins(unsigned int *pin_list, unsigned count,

int mxc_iomux_setup_multiple_pins(const unsigned int *pin_list, unsigned count,

		const char *label);



/*
@@ -126,12 +126,12 @@ int mxc_iomux_setup_multiple_pins(unsigned int *pin_list, unsigned count, 
 * 	- frees the GPIO if the pin was configured as GPIO

 * 	- DOES NOT reconfigure the IOMUX in its reset state

 */

void mxc_iomux_release_pin(const unsigned int pin);

void mxc_iomux_release_pin(unsigned int pin);

/*

 * releases multiple pins

 * convenvient way to call the above function with tables

 */

void mxc_iomux_release_multiple_pins(unsigned int *pin_list, int count);

void mxc_iomux_release_multiple_pins(const unsigned int *pin_list, int count);



/*

 * This function enables/disables the general purpose function for a particular