[PATCH v1 1/2] ASoC: ti: davinci-mcasp: Get rid of duplicate of_node assignment
GPIO library does copy the of_node from the parent device of the GPIO chip, there is no need to repeat this in the individual drivers. Remove assignment here.
For the details one may look into the of_gpio_dev_init() implementation.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com --- sound/soc/ti/davinci-mcasp.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 56a19eeec5c7..81c1ccec5904 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -2230,9 +2230,6 @@ static int davinci_mcasp_init_gpiochip(struct davinci_mcasp *mcasp) mcasp->gpio_chip = davinci_mcasp_template_chip; mcasp->gpio_chip.label = dev_name(mcasp->dev); mcasp->gpio_chip.parent = mcasp->dev; -#ifdef CONFIG_OF_GPIO - mcasp->gpio_chip.of_node = mcasp->dev->of_node; -#endif
return devm_gpiochip_add_data(mcasp->dev, &mcasp->gpio_chip, 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(-)
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,
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,
On 02/12/2021 22:56, Andy Shevchenko wrote:
GPIO library does copy the of_node from the parent device of the GPIO chip, there is no need to repeat this in the individual drivers. Remove assignment here.
Thanks, looks good, Acked-by: Peter Ujfalusi peter.ujfalusi@gmail.com
For the details one may look into the of_gpio_dev_init() implementation.
Which works after commit 1df62542e0161.
Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com
sound/soc/ti/davinci-mcasp.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 56a19eeec5c7..81c1ccec5904 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -2230,9 +2230,6 @@ static int davinci_mcasp_init_gpiochip(struct davinci_mcasp *mcasp) mcasp->gpio_chip = davinci_mcasp_template_chip; mcasp->gpio_chip.label = dev_name(mcasp->dev); mcasp->gpio_chip.parent = mcasp->dev; -#ifdef CONFIG_OF_GPIO
- mcasp->gpio_chip.of_node = mcasp->dev->of_node;
-#endif
return devm_gpiochip_add_data(mcasp->dev, &mcasp->gpio_chip, mcasp); }
On Fri, Dec 03, 2021 at 04:45:31PM +0200, Péter Ujfalusi wrote:
On 02/12/2021 22:56, Andy Shevchenko wrote:
GPIO library does copy the of_node from the parent device of the GPIO chip, there is no need to repeat this in the individual drivers. Remove assignment here.
Thanks, looks good, Acked-by: Peter Ujfalusi peter.ujfalusi@gmail.com
Thanks!
For the details one may look into the of_gpio_dev_init() implementation.
Which works after commit 1df62542e0161.
Actually even before that.
On Thu, 2 Dec 2021 22:56:11 +0200, Andy Shevchenko wrote:
GPIO library does copy the of_node from the parent device of the GPIO chip, there is no need to repeat this in the individual drivers. Remove assignment here.
For the details one may look into the of_gpio_dev_init() implementation.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: ti: davinci-mcasp: Get rid of duplicate of_node assignment commit: 4db32072b8ab18a8b90191c57c74f42d00bf9991 [2/2] ASoC: ti: davinci-mcasp: Remove unnecessary conditional commit: c1a77ba466c0dd0bdf1ec2bbebb8996d7cd7b8f7
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
participants (3)
-
Andy Shevchenko -
Mark Brown -
Péter Ujfalusi