| Message ID | 20211202205612.76216-2-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | c1a77ba466c0dd0bdf1ec2bbebb8996d7cd7b8f7 |
| Headers | show |
| Series | None | expand |
On 02/12/2021 22:56, Andy Shevchenko wrote: > Instead of double validating of_node, return value of > the boolean property directly. Nice cleanup, thanks, Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com> > We can't remove ifdeffery, because in OF_GPIO=n cases > it might bring unwanted surprises. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > sound/soc/ti/davinci-mcasp.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c > index 81c1ccec5904..3e105caac95e 100644 > --- a/sound/soc/ti/davinci-mcasp.c > +++ b/sound/soc/ti/davinci-mcasp.c > @@ -1870,12 +1870,10 @@ static int mcasp_reparent_fck(struct platform_device *pdev) > static bool davinci_mcasp_have_gpiochip(struct davinci_mcasp *mcasp) > { > #ifdef CONFIG_OF_GPIO > - if (mcasp->dev->of_node && > - of_property_read_bool(mcasp->dev->of_node, "gpio-controller")) > - return true; > -#endif > - > + return of_property_read_bool(mcasp->dev->of_node, "gpio-controller"); > +#else > return false; > +#endif > } > > static int davinci_mcasp_get_config(struct davinci_mcasp *mcasp, >
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 81c1ccec5904..3e105caac95e 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -1870,12 +1870,10 @@ static int mcasp_reparent_fck(struct platform_device *pdev) static bool davinci_mcasp_have_gpiochip(struct davinci_mcasp *mcasp) { #ifdef CONFIG_OF_GPIO - if (mcasp->dev->of_node && - of_property_read_bool(mcasp->dev->of_node, "gpio-controller")) - return true; -#endif - + return of_property_read_bool(mcasp->dev->of_node, "gpio-controller"); +#else return false; +#endif } static int davinci_mcasp_get_config(struct davinci_mcasp *mcasp,
Instead of double validating of_node, return value of the boolean property directly. We can't remove ifdeffery, because in OF_GPIO=n cases it might bring unwanted surprises. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- sound/soc/ti/davinci-mcasp.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)