Skip to contentSkip to conversation

mfd: arizona: Remove BUG_ON usage

PATCH Superseded Charles Keepax 2 participants 6 messages May 29, 2020 – Jun 1, 2020

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Charles Keepax

author maintainer
#0 lore raw

PATCH 1/3 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.

---
 drivers/mfd/arizona-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mfd/arizona-core.c +1 -1
index f73cf76d1373d..19e0bc3c0683e 100644
@@ -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
author maintainer
#1 lore raw

PATCH 2/3 mfd: madera: Fix minor formatting issues

---
 drivers/mfd/madera-core.c        | 12 ++++++------
 drivers/mfd/madera-i2c.c         |  1 -
 include/linux/mfd/madera/pdata.h |  1 -
 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/mfd/madera-core.c +6 -6
index 7e0835cb062b1..4724c1a01a39f 100644
@@ -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
index 6b965eb034b6c..7df5b9ba58554 100644
@@ -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);
include/linux/mfd/madera/pdata.h +0 -1
index fa9595dd42ba5..601cbbc10370c 100644
@@ -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
#2 lore raw

Re: [PATCH 2/3] mfd: madera: Fix minor formatting issues

On Fri, 29 May 2020, Charles Keepax wrote:

Still needs a commit log.

Quoted 12 lines
---
 drivers/mfd/madera-core.c        | 12 ++++++------
 drivers/mfd/madera-i2c.c         |  1 -
 include/linux/mfd/madera/pdata.h |  1 -
 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/mfd/madera-core.c +0 -0
index 7e0835cb062b1..4724c1a01a39f 100644

drivers/mfd/madera-core.c static const char * const madera_core_supplies[] = { · line 47

Quoted 5 lines
drivers/mfd/madera-core.c +1 -1
@@ -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", },

What issue does this solve?

Why are ','s a requirement, even for single entries?

Quoted 53 lines
drivers/mfd/madera-core.c +5 -5
 };
 
 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
index 6b965eb034b6c..7df5b9ba58554 100644
@@ -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);
include/linux/mfd/madera/pdata.h +0 -0
index fa9595dd42ba5..601cbbc10370c 100644

include/linux/mfd/madera/pdata.h line 24

Quoted 4 lines
include/linux/mfd/madera/pdata.h +0 -1
@@ -21,7 +21,6 @@
 
 struct gpio_desc;
 struct pinctrl_map;
-struct madera_codec_pdata;

This is not a formatting issue.

Quoted 2 lines
include/linux/mfd/madera/pdata.h +0 -0
 /**
  * struct madera_pdata - Configuration data for Madera devices
Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
author maintainer
#3 lore raw

Re: [PATCH 2/3] mfd: madera: Fix minor formatting issues

Quoted 18 lines · Lee Jones

On Fri, 29 May 2020, Charles Keepax wrote:

Still needs a commit log.

Quoted 14 lines
---
 drivers/mfd/madera-core.c        | 12 ++++++------
 drivers/mfd/madera-i2c.c         |  1 -
 include/linux/mfd/madera/pdata.h |  1 -
 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/mfd/madera-core.c +0 -0
index 7e0835cb062b1..4724c1a01a39f 100644
@@ -44,7 +44,7 @@ static const char * const madera_core_supplies[] = {
 };
 
Quoted 8 lines

drivers/mfd/madera-core.c static const char * const madera_core_supplies[] = { · line 47

Quoted 3 lines
drivers/mfd/madera-core.c +1 -1
 static const struct mfd_cell madera_ldo1_devs[] = {
-	{ .name = "madera-ldo1" },
+	{ .name = "madera-ldo1", },

What issue does this solve?

Why are ','s a requirement, even for single entries?

Was more just a consistency thing, we seem to have ended up with half the lines having commas and half not, happy to move them all to not having comma's if that is your preference?

Quoted 54 lines
Quoted 54 lines
drivers/mfd/madera-core.c +5 -5
 };
 
 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
index 6b965eb034b6c..7df5b9ba58554 100644
@@ -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);
include/linux/mfd/madera/pdata.h +0 -0
index fa9595dd42ba5..601cbbc10370c 100644
@@ -21,7 +21,6 @@
 
Quoted 5 lines

include/linux/mfd/madera/pdata.h line 24

Quoted 3 lines
include/linux/mfd/madera/pdata.h +0 -1
 struct gpio_desc;
 struct pinctrl_map;
-struct madera_codec_pdata;

This is not a formatting issue.

Fair point will split out into a separate patch.

Thanks,
Charles

#4 lore raw

Re: [PATCH 2/3] mfd: madera: Fix minor formatting issues

Quoted 25 lines · Charles Keepax
Quoted 24 lines · Lee Jones

On Fri, 29 May 2020, Charles Keepax wrote:

Still needs a commit log.

Quoted 12 lines
---
 drivers/mfd/madera-core.c        | 12 ++++++------
 drivers/mfd/madera-i2c.c         |  1 -
 include/linux/mfd/madera/pdata.h |  1 -
 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/mfd/madera-core.c +0 -0
index 7e0835cb062b1..4724c1a01a39f 100644

drivers/mfd/madera-core.c static const char * const madera_core_supplies[] = { · line 47

Quoted 5 lines
drivers/mfd/madera-core.c +1 -1
@@ -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", },

What issue does this solve?

Quoted 6 lines
Quoted 2 lines

Why are ','s a requirement, even for single entries?

Was more just a consistency thing, we seem to have ended up with half the lines having commas and half not, happy to move them all to not having comma's if that is your preference?

I don't have a preference. Consistency is more important to me.

Please describe your changes in the commit log.

Signature · 4 lines
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
author maintainer
#5 lore raw

PATCH 3/3 mfd: arizona: Ensure 32k clock is put on driver unbind and error

In reply to 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")
---
 drivers/mfd/arizona-core.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
drivers/mfd/arizona-core.c +18 -0
index 19e0bc3c0683e..000cb82023e35 100644
@@ -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