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

Commit 533743dc authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

sh-pfc: Replace pinmux_enum_id typedef with u16 



The typedef only conceals the real variable type without bringing any
additional value (see Documentation/CodingStyle, section 5.b). Moreover,
it polutes the pinmux namespace. Replace it with the integer type it
used to hide.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: default avatarYusuke Goda <yusuke.goda.sx@renesas.com>
parent a1a3580c

drivers/pinctrl/sh-pfc/core.c

+6 −7
Original line number Diff line number Diff line
@@ -98,8 +98,7 @@ int sh_pfc_get_pin_index(struct sh_pfc *pfc, unsigned int pin) 
	return -EINVAL;

}



static int sh_pfc_enum_in_range(pinmux_enum_t enum_id,

				const struct pinmux_range *r)

static int sh_pfc_enum_in_range(u16 enum_id, const struct pinmux_range *r)

{

	if (enum_id < r->begin)

		return 0;
@@ -194,7 +193,7 @@ static void sh_pfc_write_config_reg(struct sh_pfc *pfc, 
	sh_pfc_write_raw_reg(mapped_reg, crp->reg_width, data);

}



static int sh_pfc_get_config_reg(struct sh_pfc *pfc, pinmux_enum_t enum_id,

static int sh_pfc_get_config_reg(struct sh_pfc *pfc, u16 enum_id,

				 const struct pinmux_cfg_reg **crp, int *fieldp,

				 int *valuep)

{
@@ -238,10 +237,10 @@ static int sh_pfc_get_config_reg(struct sh_pfc *pfc, pinmux_enum_t enum_id, 
	return -EINVAL;

}



static int sh_pfc_mark_to_enum(struct sh_pfc *pfc, pinmux_enum_t mark, int pos,

			      pinmux_enum_t *enum_idp)

static int sh_pfc_mark_to_enum(struct sh_pfc *pfc, u16 mark, int pos,

			      u16 *enum_idp)

{

	const pinmux_enum_t *data = pfc->info->gpio_data;

	const u16 *data = pfc->info->gpio_data;

	int k;



	if (pos) {
@@ -264,7 +263,7 @@ static int sh_pfc_mark_to_enum(struct sh_pfc *pfc, pinmux_enum_t mark, int pos, 
int sh_pfc_config_mux(struct sh_pfc *pfc, unsigned mark, int pinmux_type)

{

	const struct pinmux_cfg_reg *cr = NULL;

	pinmux_enum_t enum_id;

	u16 enum_id;

	const struct pinmux_range *range;

	int in_range, pos, field, value;

	int ret;

drivers/pinctrl/sh-pfc/pfc-r8a73a4.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ enum { 
#define _PORT_DATA(pfx, sfx)	PORT_DATA_IO(pfx)

#define PINMUX_DATA_ALL()    CPU_ALL_PORT(_PORT_DATA, , unused)



static const pinmux_enum_t pinmux_data[] = {

static const u16 pinmux_data[] = {

	/* specify valid pin states for each pin in GPIO mode */

	PINMUX_DATA_ALL(),

drivers/pinctrl/sh-pfc/pfc-r8a7740.c

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ enum { 
#define _PORT_DATA(pfx, sfx)	PORT_DATA_IO(pfx)

#define PINMUX_DATA_GP_ALL()	CPU_ALL_PORT(_PORT_DATA, , unused)



static const pinmux_enum_t pinmux_data[] = {

static const u16 pinmux_data[] = {

	PINMUX_DATA_GP_ALL(),



	/* Port0 */

drivers/pinctrl/sh-pfc/pfc-r8a7778.c

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ enum { 
	PINMUX_MARK_END,

};



static const pinmux_enum_t pinmux_data[] = {

static const u16 pinmux_data[] = {

	PINMUX_DATA_GP_ALL(), /* PINMUX_DATA(GP_M_N_DATA, GP_M_N_FN...), */



	PINMUX_DATA(PENC0_MARK,		FN_PENC0),

drivers/pinctrl/sh-pfc/pfc-r8a7779.c

+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ enum { 
	PINMUX_MARK_END,

};



static const pinmux_enum_t pinmux_data[] = {

static const u16 pinmux_data[] = {

	PINMUX_DATA_GP_ALL(), /* PINMUX_DATA(GP_M_N_DATA, GP_M_N_FN...), */



	PINMUX_DATA(AVS1_MARK, FN_AVS1),