summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2017-09-29 11:12:39 -0400
committerGeert Uytterhoeven <geert+renesas@glider.be>2017-10-20 05:37:19 -0400
commit1860bb134fc29dee0aeb912ae20799119b920df9 (patch)
treec5a1326393d9511f51c7f29c4d845cacec2997f1 /drivers/pinctrl
parent3f8833ad66519cf2e4373bf3153f9937ef691717 (diff)
pinctrl: sh-pfc: Remove obsolete sh_pfc_pin_to_bias_info()
All users of sh_pfc_pin_to_bias_info() and the related data structures have been converted to sh_pfc_pin_to_bias_reg(), so those can be removed. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/sh-pfc/core.c15
-rw-r--r--drivers/pinctrl/sh-pfc/core.h3
-rw-r--r--drivers/pinctrl/sh-pfc/sh_pfc.h6
3 files changed, 0 insertions, 24 deletions
diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
index 01c408a3dee4..2fe5fd6c5d17 100644
--- a/drivers/pinctrl/sh-pfc/core.c
+++ b/drivers/pinctrl/sh-pfc/core.c
@@ -389,21 +389,6 @@ int sh_pfc_config_mux(struct sh_pfc *pfc, unsigned mark, int pinmux_type)
389 return 0; 389 return 0;
390} 390}
391 391
392const struct sh_pfc_bias_info *
393sh_pfc_pin_to_bias_info(const struct sh_pfc_bias_info *info,
394 unsigned int num, unsigned int pin)
395{
396 unsigned int i;
397
398 for (i = 0; i < num; i++)
399 if (info[i].pin == pin)
400 return &info[i];
401
402 WARN_ONCE(1, "Pin %u is not in bias info list\n", pin);
403
404 return NULL;
405}
406
407const struct pinmux_bias_reg * 392const struct pinmux_bias_reg *
408sh_pfc_pin_to_bias_reg(const struct sh_pfc *pfc, unsigned int pin, 393sh_pfc_pin_to_bias_reg(const struct sh_pfc *pfc, unsigned int pin,
409 unsigned int *bit) 394 unsigned int *bit)
diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/sh-pfc/core.h
index 460d996513ac..5af8ee26c03e 100644
--- a/drivers/pinctrl/sh-pfc/core.h
+++ b/drivers/pinctrl/sh-pfc/core.h
@@ -32,9 +32,6 @@ void sh_pfc_write(struct sh_pfc *pfc, u32 reg, u32 data);
32int sh_pfc_get_pin_index(struct sh_pfc *pfc, unsigned int pin); 32int sh_pfc_get_pin_index(struct sh_pfc *pfc, unsigned int pin);
33int sh_pfc_config_mux(struct sh_pfc *pfc, unsigned mark, int pinmux_type); 33int sh_pfc_config_mux(struct sh_pfc *pfc, unsigned mark, int pinmux_type);
34 34
35const struct sh_pfc_bias_info *
36sh_pfc_pin_to_bias_info(const struct sh_pfc_bias_info *info,
37 unsigned int num, unsigned int pin);
38const struct pinmux_bias_reg * 35const struct pinmux_bias_reg *
39sh_pfc_pin_to_bias_reg(const struct sh_pfc *pfc, unsigned int pin, 36sh_pfc_pin_to_bias_reg(const struct sh_pfc *pfc, unsigned int pin,
40 unsigned int *bit); 37 unsigned int *bit);
diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
index 1914f4b5fef5..18fd87826629 100644
--- a/drivers/pinctrl/sh-pfc/sh_pfc.h
+++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
@@ -200,12 +200,6 @@ struct sh_pfc_window {
200 unsigned long size; 200 unsigned long size;
201}; 201};
202 202
203struct sh_pfc_bias_info {
204 u16 pin;
205 u16 reg : 11;
206 u16 bit : 5;
207};
208
209struct sh_pfc_pin_range; 203struct sh_pfc_pin_range;
210 204
211struct sh_pfc { 205struct sh_pfc {