Commit c614d12c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

pinctrl: renesas: Rename sh_pfc_soc_operations instances 



Some instances of struct sh_pfc_soc_operations are called
"<soc>_pfc_ops", others are called "<soc>_pinmux_ops" or just
"pinmux_ops".  Settle on the first variant, to avoid confusion with
"struct pinmux_ops" in the pinctrl core, and to increase consistency.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/2ab33ad1d6a20a57d16922678b78810fa55b7fc0.1640269757.git.geert+renesas@glider.be
parent 9e04a0ed

drivers/pinctrl/renesas/pfc-r8a77470.c

+2 −2
Original line number Diff line number Diff line
@@ -3683,7 +3683,7 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
	{ /* sentinel */ }

};



static const struct sh_pfc_soc_operations r8a77470_pinmux_ops = {

static const struct sh_pfc_soc_operations r8a77470_pfc_ops = {

	.pin_to_pocctrl = r8a77470_pin_to_pocctrl,

	.get_bias = rcar_pinmux_get_bias,

	.set_bias = rcar_pinmux_set_bias,
@@ -3692,7 +3692,7 @@ static const struct sh_pfc_soc_operations r8a77470_pinmux_ops = { 
#ifdef CONFIG_PINCTRL_PFC_R8A77470

const struct sh_pfc_soc_info r8a77470_pinmux_info = {

	.name = "r8a77470_pfc",

	.ops = &r8a77470_pinmux_ops,

	.ops = &r8a77470_pfc_ops,

	.unlock_reg = 0xe6060000, /* PMMR */



	.function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },

drivers/pinctrl/renesas/pfc-r8a7790.c

+3 −3
Original line number Diff line number Diff line
@@ -6282,7 +6282,7 @@ static int r8a7790_pinmux_soc_init(struct sh_pfc *pfc) 
	return 0;

}



static const struct sh_pfc_soc_operations r8a7790_pinmux_ops = {

static const struct sh_pfc_soc_operations r8a7790_pfc_ops = {

	.init = r8a7790_pinmux_soc_init,

	.pin_to_pocctrl = r8a7790_pin_to_pocctrl,

	.get_bias = rcar_pinmux_get_bias,
@@ -6292,7 +6292,7 @@ static const struct sh_pfc_soc_operations r8a7790_pinmux_ops = { 
#ifdef CONFIG_PINCTRL_PFC_R8A7742

const struct sh_pfc_soc_info r8a7742_pinmux_info = {

	.name = "r8a77420_pfc",

	.ops = &r8a7790_pinmux_ops,

	.ops = &r8a7790_pfc_ops,

	.unlock_reg = 0xe6060000, /* PMMR */



	.function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },
@@ -6315,7 +6315,7 @@ const struct sh_pfc_soc_info r8a7742_pinmux_info = { 
#ifdef CONFIG_PINCTRL_PFC_R8A7790

const struct sh_pfc_soc_info r8a7790_pinmux_info = {

	.name = "r8a77900_pfc",

	.ops = &r8a7790_pinmux_ops,

	.ops = &r8a7790_pfc_ops,

	.unlock_reg = 0xe6060000, /* PMMR */



	.function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },

drivers/pinctrl/renesas/pfc-r8a7791.c

+5 −5
Original line number Diff line number Diff line
@@ -6989,7 +6989,7 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
	{ /* sentinel */ },

};



static const struct sh_pfc_soc_operations r8a7791_pinmux_ops = {

static const struct sh_pfc_soc_operations r8a7791_pfc_ops = {

	.pin_to_pocctrl = r8a7791_pin_to_pocctrl,

	.get_bias = rcar_pinmux_get_bias,

	.set_bias = rcar_pinmux_set_bias,
@@ -6998,7 +6998,7 @@ static const struct sh_pfc_soc_operations r8a7791_pinmux_ops = { 
#ifdef CONFIG_PINCTRL_PFC_R8A7743

const struct sh_pfc_soc_info r8a7743_pinmux_info = {

	.name = "r8a77430_pfc",

	.ops = &r8a7791_pinmux_ops,

	.ops = &r8a7791_pfc_ops,

	.unlock_reg = 0xe6060000, /* PMMR */



	.function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },
@@ -7021,7 +7021,7 @@ const struct sh_pfc_soc_info r8a7743_pinmux_info = { 
#ifdef CONFIG_PINCTRL_PFC_R8A7744

const struct sh_pfc_soc_info r8a7744_pinmux_info = {

	.name = "r8a77440_pfc",

	.ops = &r8a7791_pinmux_ops,

	.ops = &r8a7791_pfc_ops,

	.unlock_reg = 0xe6060000, /* PMMR */



	.function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },
@@ -7044,7 +7044,7 @@ const struct sh_pfc_soc_info r8a7744_pinmux_info = { 
#ifdef CONFIG_PINCTRL_PFC_R8A7791

const struct sh_pfc_soc_info r8a7791_pinmux_info = {

	.name = "r8a77910_pfc",

	.ops = &r8a7791_pinmux_ops,

	.ops = &r8a7791_pfc_ops,

	.unlock_reg = 0xe6060000, /* PMMR */



	.function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },
@@ -7069,7 +7069,7 @@ const struct sh_pfc_soc_info r8a7791_pinmux_info = { 
#ifdef CONFIG_PINCTRL_PFC_R8A7793

const struct sh_pfc_soc_info r8a7793_pinmux_info = {

	.name = "r8a77930_pfc",

	.ops = &r8a7791_pinmux_ops,

	.ops = &r8a7791_pfc_ops,

	.unlock_reg = 0xe6060000, /* PMMR */



	.function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },

drivers/pinctrl/renesas/pfc-r8a7792.c

+2 −2
Original line number Diff line number Diff line
@@ -3281,14 +3281,14 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
	{ /* sentinel */ }

};



static const struct sh_pfc_soc_operations r8a7792_pinmux_ops = {

static const struct sh_pfc_soc_operations r8a7792_pfc_ops = {

	.get_bias = rcar_pinmux_get_bias,

	.set_bias = rcar_pinmux_set_bias,

};



const struct sh_pfc_soc_info r8a7792_pinmux_info = {

	.name = "r8a77920_pfc",

	.ops = &r8a7792_pinmux_ops,

	.ops = &r8a7792_pfc_ops,

	.unlock_reg = 0xe6060000, /* PMMR */



	.function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },

drivers/pinctrl/renesas/pfc-r8a7794.c

+3 −3
Original line number Diff line number Diff line
@@ -5935,7 +5935,7 @@ static int r8a7794_pinmux_soc_init(struct sh_pfc *pfc) 
	return 0;

}



static const struct sh_pfc_soc_operations r8a7794_pinmux_ops = {

static const struct sh_pfc_soc_operations r8a7794_pfc_ops = {

	.init = r8a7794_pinmux_soc_init,

	.pin_to_pocctrl = r8a7794_pin_to_pocctrl,

	.get_bias = rcar_pinmux_get_bias,
@@ -5945,7 +5945,7 @@ static const struct sh_pfc_soc_operations r8a7794_pinmux_ops = { 
#ifdef CONFIG_PINCTRL_PFC_R8A7745

const struct sh_pfc_soc_info r8a7745_pinmux_info = {

	.name = "r8a77450_pfc",

	.ops = &r8a7794_pinmux_ops,

	.ops = &r8a7794_pfc_ops,

	.unlock_reg = 0xe6060000, /* PMMR */



	.function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },
@@ -5968,7 +5968,7 @@ const struct sh_pfc_soc_info r8a7745_pinmux_info = { 
#ifdef CONFIG_PINCTRL_PFC_R8A7794

const struct sh_pfc_soc_info r8a7794_pinmux_info = {

	.name = "r8a77940_pfc",

	.ops = &r8a7794_pinmux_ops,

	.ops = &r8a7794_pfc_ops,

	.unlock_reg = 0xe6060000, /* PMMR */



	.function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },