mfd: arizona: Remove BUG_ON usage
Subsystems (3)
Charles Keepax
maintainerPATCH v2 1/4 mfd: arizona: Remove BUG_ON usage
BUG_ON macros are generally frowned upon when the issue isn't super critical, the kernel can certainly carry on with the 32k clock on the CODEC in a bad state so change the BUG_ON to a WARN_ON.
---
No changes since v1.
Thanks,
Charles
drivers/mfd/arizona-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/arizona-core.c +1 -1
@@ -80,7 +80,7 @@ int arizona_clk32k_disable(struct arizona *arizona) {mutex_lock (&arizona->clk_lock); -BUG_ON (arizona->clk32k_ref <=0 ); +WARN_ON (arizona->clk32k_ref <=0 ); arizona->clk32k_ref--;
Signature · 1 line
2.11.0
Charles Keepax
maintainerPATCH v2 2/4 mfd: arizona: Ensure 32k clock is put on driver unbind and error
Whilst it doesn't matter if the internal 32k clock register settings are cleaned up on exit, as the part will be turned off losing any settings, hence the driver hasn't historially bothered. The external clock should however be cleaned up, as it could cause clocks to be left on, and will at best generate a warning on unbind.
Add clean up on both the probe error path and unbind for the 32k clock.
---
No changes since v1.
Thanks,
Charles
drivers/mfd/arizona-core.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/mfd/arizona-core.c +18 -0
@@ -1426,6 +1426,15 @@ int arizona_dev_init(struct arizona *arizona)arizona_irq_exit (arizona); err_pm:pm_runtime_disable (arizona->dev); + +switch (arizona->pdata.clk32k_src) { +case ARIZONA_32KZ_MCLK1 : +case ARIZONA_32KZ_MCLK2 : +arizona_clk32k_disable (arizona); +break ; +default : +break ; + } err_reset:arizona_enable_reset (arizona);regulator_disable (arizona->dcvdd);
@@ -1448,6 +1457,15 @@ int arizona_dev_exit(struct arizona *arizona)regulator_disable (arizona->dcvdd);regulator_put (arizona->dcvdd); +switch (arizona->pdata.clk32k_src) { +case ARIZONA_32KZ_MCLK1 : +case ARIZONA_32KZ_MCLK2 : +arizona_clk32k_disable (arizona); +break ; +default : +break ; + } +mfd_remove_devices (arizona->dev);arizona_free_irq (arizona,ARIZONA_IRQ_UNDERCLOCKED , arizona);arizona_free_irq (arizona,ARIZONA_IRQ_OVERCLOCKED , arizona);
Signature · 1 line
2.11.0
Lee Jones
AppliedRe: [PATCH v2 2/4] mfd: arizona: Ensure 32k clock is put on driver unbind and error
Quoted 13 lines · Charles Keepax
Whilst it doesn't matter if the internal 32k clock register settings are cleaned up on exit, as the part will be turned off losing any settings, hence the driver hasn't historially bothered. The external clock should however be cleaned up, as it could cause clocks to be left on, and will at best generate a warning on unbind.
Add clean up on both the probe error path and unbind for the 32k clock.
Fixes cdd8da8cc66b ("mfd: arizona: Add gating of external MCLKn clocks")Signed-off-by Charles Keepax <[email protected]>---
Quoted 7 lines
No changes since v1.
Thanks,
Charlesdrivers/mfd/arizona-core.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Charles Keepax
maintainerPATCH v2 3/4 mfd: madera: Remove unused forward declaration of madera_codec_pdata
In reply to Charles KeepaxThis forward declaration is redundant since the header including the full data structure is included.
---
New since v1 of the series.
Thanks,
Charles
include/linux/mfd/madera/pdata.h | 1 - 1 file changed, 1 deletion(-)
include/linux/mfd/madera/pdata.h +0 -1
@@ -21,7 +21,6 @@struct gpio_desc ;struct pinctrl_map ; -struct madera_codec_pdata ;/** * struct madera_pdata - Configuration data for Madera devices
Signature · 1 line
2.11.0
Lee Jones
AppliedRe: [PATCH v2 3/4] mfd: madera: Remove unused forward declaration of madera_codec_pdata
Quoted 6 lines · Charles Keepax
This forward declaration is redundant since the header including the full data structure is included.
Signed-off-by Charles Keepax <[email protected]>---
Quoted 7 lines
New since v1 of the series.
Thanks,
Charlesinclude/linux/mfd/madera/pdata.h | 1 - 1 file changed, 1 deletion(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Charles Keepax
maintainerPATCH v2 4/4 mfd: madera: Fix minor formatting issues
In reply to Charles KeepaxThe mfd_cell structures inconsistently use commas on single entries in the table, make this consistent by always using a comma. Also remove an extra blank line.
---
Changes since v1:
- Added some additional commit description.
- Move the removing and unused forward declaration into a new patch.
Thanks,
Charles
drivers/mfd/madera-core.c | 12 ++++++------ drivers/mfd/madera-i2c.c | 1 - 2 files changed, 6 insertions(+), 7 deletions(-)
drivers/mfd/madera-core.c +6 -6
@@ -44,7 +44,7 @@ static const char * const madera_core_supplies[] = { };static const struct mfd_cell madera_ldo1_devs[] = { - { .name ="madera-ldo1" }, + { .name ="madera-ldo1" , }, };static const char *const cs47l15_supplies[] = {
@@ -55,8 +55,8 @@ static const char * const cs47l15_supplies[] = {static const struct mfd_cell cs47l15_devs[] = { { .name ="madera-pinctrl" , }, - { .name ="madera-irq" }, - { .name ="madera-gpio" }, + { .name ="madera-irq" , }, + { .name ="madera-gpio" , }, { .name ="madera-extcon" , .parent_supplies = cs47l15_supplies,
@@ -108,7 +108,7 @@ static const char * const cs47l85_supplies[] = {static const struct mfd_cell cs47l85_devs[] = { { .name ="madera-pinctrl" , }, { .name ="madera-irq" , }, - { .name ="madera-micsupp" }, + { .name ="madera-micsupp" , }, { .name ="madera-gpio" , }, { .name ="madera-extcon" ,
@@ -155,10 +155,10 @@ static const char * const cs47l92_supplies[] = { };static const struct mfd_cell cs47l92_devs[] = { - { .name ="madera-pinctrl" }, + { .name ="madera-pinctrl" , }, { .name ="madera-irq" , }, { .name ="madera-micsupp" , }, - { .name ="madera-gpio" }, + { .name ="madera-gpio" , }, { .name ="madera-extcon" , .parent_supplies = cs47l92_supplies,
drivers/mfd/madera-i2c.c +0 -1
@@ -88,7 +88,6 @@ static int madera_i2c_probe(struct i2c_client *i2c,if (!madera)return -ENOMEM ; - madera->regmap =devm_regmap_init_i2c (i2c, regmap_16bit_config);if (IS_ERR (madera->regmap)) { ret =PTR_ERR (madera->regmap);
Signature · 1 line
2.11.0
Lee Jones
AppliedRe: [PATCH v2 4/4] mfd: madera: Fix minor formatting issues
Quoted 11 lines · Charles Keepax
The
mfd_cellstructures inconsistently use commas on single entries in the table, make this consistent by always using a comma. Also remove an extra blank line.Signed-off-by Charles Keepax <[email protected]>---
Changes since v1:
- Added some additional commit description.
- Move the removing and unused forward declaration into a new patch.
Quoted 6 lines
Thanks,
Charlesdrivers/mfd/madera-core.c | 12 ++++++------ drivers/mfd/madera-i2c.c | 1 - 2 files changed, 6 insertions(+), 7 deletions(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog
Lee Jones
AppliedQuoted 7 lines · Charles Keepax
BUG_ONmacros are generally frowned upon when the issue isn't super critical, the kernel can certainly carry on with the 32k clock on the CODEC in a bad state so change theBUG_ONto aWARN_ON.Signed-off-by Charles Keepax <[email protected]>---
Quoted 7 lines
No changes since v1.
Thanks,
Charlesdrivers/mfd/arizona-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks.
Signature · 4 lines
Lee Jones [李琼斯] Senior Technical Lead - Developer Services Linaro.org │ Open source software for Arm SoCs Follow Linaro: Facebook | Twitter | Blog