diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-07-15 11:13:51 -0400 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-07-29 09:17:44 -0400 |
commit | 18dcc58341e4094a2799acfd1e8779a94e97fd13 (patch) | |
tree | f20ee6515d2223a4ee28f550a490900246aad4a4 | |
parent | 8157b964290ae7483ea67cf65c3707b23a8be5c0 (diff) |
sh-pfc: shx3: Remove shx3_ prefix from static symbols
Unlike all other PFC SoC data, the shx3 data prefix all static symbols
with shx3_. Remove the prefix to be consistent with the other source
files.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-shx3.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-shx3.c b/drivers/pinctrl/sh-pfc/pfc-shx3.c index 48a6c60f41e5..775a622b9b9b 100644 --- a/drivers/pinctrl/sh-pfc/pfc-shx3.c +++ b/drivers/pinctrl/sh-pfc/pfc-shx3.c | |||
@@ -127,7 +127,7 @@ enum { | |||
127 | PINMUX_MARK_END, | 127 | PINMUX_MARK_END, |
128 | }; | 128 | }; |
129 | 129 | ||
130 | static const u16 shx3_pinmux_data[] = { | 130 | static const u16 pinmux_data[] = { |
131 | /* PA GPIO */ | 131 | /* PA GPIO */ |
132 | PINMUX_DATA(PA7_DATA, PA7_IN, PA7_OUT), | 132 | PINMUX_DATA(PA7_DATA, PA7_IN, PA7_OUT), |
133 | PINMUX_DATA(PA6_DATA, PA6_IN, PA6_OUT), | 133 | PINMUX_DATA(PA6_DATA, PA6_IN, PA6_OUT), |
@@ -285,7 +285,7 @@ static const u16 shx3_pinmux_data[] = { | |||
285 | PINMUX_DATA(IRQOUT_MARK, PH0_FN), | 285 | PINMUX_DATA(IRQOUT_MARK, PH0_FN), |
286 | }; | 286 | }; |
287 | 287 | ||
288 | static struct sh_pfc_pin shx3_pinmux_pins[] = { | 288 | static struct sh_pfc_pin pinmux_pins[] = { |
289 | /* PA */ | 289 | /* PA */ |
290 | PINMUX_GPIO(GPIO_PA7, PA7_DATA), | 290 | PINMUX_GPIO(GPIO_PA7, PA7_DATA), |
291 | PINMUX_GPIO(GPIO_PA6, PA6_DATA), | 291 | PINMUX_GPIO(GPIO_PA6, PA6_DATA), |
@@ -365,9 +365,9 @@ static struct sh_pfc_pin shx3_pinmux_pins[] = { | |||
365 | PINMUX_GPIO(GPIO_PH0, PH0_DATA), | 365 | PINMUX_GPIO(GPIO_PH0, PH0_DATA), |
366 | }; | 366 | }; |
367 | 367 | ||
368 | #define PINMUX_FN_BASE ARRAY_SIZE(shx3_pinmux_pins) | 368 | #define PINMUX_FN_BASE ARRAY_SIZE(pinmux_pins) |
369 | 369 | ||
370 | static const struct pinmux_func shx3_pinmux_func_gpios[] = { | 370 | static const struct pinmux_func pinmux_func_gpios[] = { |
371 | /* FN */ | 371 | /* FN */ |
372 | GPIO_FN(D31), | 372 | GPIO_FN(D31), |
373 | GPIO_FN(D30), | 373 | GPIO_FN(D30), |
@@ -433,7 +433,7 @@ static const struct pinmux_func shx3_pinmux_func_gpios[] = { | |||
433 | GPIO_FN(IRQOUT), | 433 | GPIO_FN(IRQOUT), |
434 | }; | 434 | }; |
435 | 435 | ||
436 | static const struct pinmux_cfg_reg shx3_pinmux_config_regs[] = { | 436 | static const struct pinmux_cfg_reg pinmux_config_regs[] = { |
437 | { PINMUX_CFG_REG("PABCR", 0xffc70000, 32, 2) { | 437 | { PINMUX_CFG_REG("PABCR", 0xffc70000, 32, 2) { |
438 | PA7_FN, PA7_OUT, PA7_IN, 0, | 438 | PA7_FN, PA7_OUT, PA7_IN, 0, |
439 | PA6_FN, PA6_OUT, PA6_IN, 0, | 439 | PA6_FN, PA6_OUT, PA6_IN, 0, |
@@ -509,7 +509,7 @@ static const struct pinmux_cfg_reg shx3_pinmux_config_regs[] = { | |||
509 | { }, | 509 | { }, |
510 | }; | 510 | }; |
511 | 511 | ||
512 | static const struct pinmux_data_reg shx3_pinmux_data_regs[] = { | 512 | static const struct pinmux_data_reg pinmux_data_regs[] = { |
513 | { PINMUX_DATA_REG("PABDR", 0xffc70010, 32) { | 513 | { PINMUX_DATA_REG("PABDR", 0xffc70010, 32) { |
514 | 0, 0, 0, 0, 0, 0, 0, 0, | 514 | 0, 0, 0, 0, 0, 0, 0, 0, |
515 | PA7_DATA, PA6_DATA, PA5_DATA, PA4_DATA, | 515 | PA7_DATA, PA6_DATA, PA5_DATA, PA4_DATA, |
@@ -550,12 +550,12 @@ const struct sh_pfc_soc_info shx3_pinmux_info = { | |||
550 | .input = { PINMUX_INPUT_BEGIN, PINMUX_INPUT_END }, | 550 | .input = { PINMUX_INPUT_BEGIN, PINMUX_INPUT_END }, |
551 | .output = { PINMUX_OUTPUT_BEGIN, PINMUX_OUTPUT_END }, | 551 | .output = { PINMUX_OUTPUT_BEGIN, PINMUX_OUTPUT_END }, |
552 | .function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END }, | 552 | .function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END }, |
553 | .pins = shx3_pinmux_pins, | 553 | .pins = pinmux_pins, |
554 | .nr_pins = ARRAY_SIZE(shx3_pinmux_pins), | 554 | .nr_pins = ARRAY_SIZE(pinmux_pins), |
555 | .func_gpios = shx3_pinmux_func_gpios, | 555 | .func_gpios = pinmux_func_gpios, |
556 | .nr_func_gpios = ARRAY_SIZE(shx3_pinmux_func_gpios), | 556 | .nr_func_gpios = ARRAY_SIZE(pinmux_func_gpios), |
557 | .gpio_data = shx3_pinmux_data, | 557 | .gpio_data = pinmux_data, |
558 | .gpio_data_size = ARRAY_SIZE(shx3_pinmux_data), | 558 | .gpio_data_size = ARRAY_SIZE(pinmux_data), |
559 | .cfg_regs = shx3_pinmux_config_regs, | 559 | .cfg_regs = pinmux_config_regs, |
560 | .data_regs = shx3_pinmux_data_regs, | 560 | .data_regs = pinmux_data_regs, |
561 | }; | 561 | }; |