| Message ID | 20231030155432.3468704-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 6217728b38580bd3a4c6db6f65359f93c52f5901 |
| Headers | show |
| Series | [v1,1/1] pinctrl: intel: Move default strength assignment to a switch-case | expand |
On Mon, Oct 30, 2023 at 05:54:32PM +0200, Andy Shevchenko wrote: > iWhen ->pin_config_set() is called from the GPIO library (assumed > GpioIo() ACPI resource), the argument can be 1, when, for example, > PullDefault is provided. In such case we supply sane default in > the driver. Move that default assingment to a switch-case, so > it will be consolidated in one place. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > drivers/pinctrl/intel/pinctrl-intel.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c > index fb3e0e1e0a0e..3e8010607d32 100644 > --- a/drivers/pinctrl/intel/pinctrl-intel.c > +++ b/drivers/pinctrl/intel/pinctrl-intel.c > @@ -677,10 +677,6 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin, > u32 term = 0, up = 0, value; > void __iomem *padcfg1; > > - /* Set default strength value in case none is given */ > - if (arg == 1) > - arg = 5000; > - > switch (param) { > case PIN_CONFIG_BIAS_DISABLE: > break; > @@ -690,6 +686,7 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin, > case 20000: > term = PADCFG1_TERM_20K; > break; > + case 1: /* Set default strength value in case none is given */ Same comment here about constant. > case 5000: > term = PADCFG1_TERM_5K; > break; > @@ -716,6 +713,7 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin, > case 20000: > term = PADCFG1_TERM_20K; > break; > + case 1: /* Set default strength value in case none is given */ > case 5000: > term = PADCFG1_TERM_5K; > break; > -- > 2.40.0.1.gaa8946217a0b
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index fb3e0e1e0a0e..3e8010607d32 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -677,10 +677,6 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin, u32 term = 0, up = 0, value; void __iomem *padcfg1; - /* Set default strength value in case none is given */ - if (arg == 1) - arg = 5000; - switch (param) { case PIN_CONFIG_BIAS_DISABLE: break; @@ -690,6 +686,7 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin, case 20000: term = PADCFG1_TERM_20K; break; + case 1: /* Set default strength value in case none is given */ case 5000: term = PADCFG1_TERM_5K; break; @@ -716,6 +713,7 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned int pin, case 20000: term = PADCFG1_TERM_20K; break; + case 1: /* Set default strength value in case none is given */ case 5000: term = PADCFG1_TERM_5K; break;
iWhen ->pin_config_set() is called from the GPIO library (assumed GpioIo() ACPI resource), the argument can be 1, when, for example, PullDefault is provided. In such case we supply sane default in the driver. Move that default assingment to a switch-case, so it will be consolidated in one place. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/pinctrl/intel/pinctrl-intel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)