2020-05-29 16:00:23

by Charles Keepax

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

Signed-off-by: Charles Keepax <[email protected]>
---
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(-)

diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c
index 7e0835cb062b1..4724c1a01a39f 100644
--- a/drivers/mfd/madera-core.c
+++ b/drivers/mfd/madera-core.c
@@ -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,
diff --git a/drivers/mfd/madera-i2c.c b/drivers/mfd/madera-i2c.c
index 6b965eb034b6c..7df5b9ba58554 100644
--- a/drivers/mfd/madera-i2c.c
+++ b/drivers/mfd/madera-i2c.c
@@ -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);
diff --git a/include/linux/mfd/madera/pdata.h b/include/linux/mfd/madera/pdata.h
index fa9595dd42ba5..601cbbc10370c 100644
--- a/include/linux/mfd/madera/pdata.h
+++ b/include/linux/mfd/madera/pdata.h
@@ -21,7 +21,6 @@

struct gpio_desc;
struct pinctrl_map;
-struct madera_codec_pdata;

/**
* struct madera_pdata - Configuration data for Madera devices
--
2.11.0

2020-06-01 05:28:57

by Lee Jones

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

On Fri, 29 May 2020, Charles Keepax wrote:

Still needs a commit log.

> Signed-off-by: Charles Keepax <[email protected]>
> ---
> 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(-)
>
> diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c
> index 7e0835cb062b1..4724c1a01a39f 100644
> --- a/drivers/mfd/madera-core.c
> +++ b/drivers/mfd/madera-core.c
> @@ -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?

> };
>
> 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,
> diff --git a/drivers/mfd/madera-i2c.c b/drivers/mfd/madera-i2c.c
> index 6b965eb034b6c..7df5b9ba58554 100644
> --- a/drivers/mfd/madera-i2c.c
> +++ b/drivers/mfd/madera-i2c.c
> @@ -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);
> diff --git a/include/linux/mfd/madera/pdata.h b/include/linux/mfd/madera/pdata.h
> index fa9595dd42ba5..601cbbc10370c 100644
> --- a/include/linux/mfd/madera/pdata.h
> +++ b/include/linux/mfd/madera/pdata.h
> @@ -21,7 +21,6 @@
>
> struct gpio_desc;
> struct pinctrl_map;
> -struct madera_codec_pdata;

This is not a formatting issue.

> /**
> * struct madera_pdata - Configuration data for Madera devices

--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

2020-06-01 09:58:47

by Charles Keepax

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

On Mon, Jun 01, 2020 at 06:24:33AM +0100, Lee Jones wrote:
> On Fri, 29 May 2020, Charles Keepax wrote:
>
> Still needs a commit log.
>
> > Signed-off-by: Charles Keepax <[email protected]>
> > ---
> > 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(-)
> >
> > diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c
> > index 7e0835cb062b1..4724c1a01a39f 100644
> > --- a/drivers/mfd/madera-core.c
> > +++ b/drivers/mfd/madera-core.c
> > @@ -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?
>

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?

> > };
> >
> > 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,
> > diff --git a/drivers/mfd/madera-i2c.c b/drivers/mfd/madera-i2c.c
> > index 6b965eb034b6c..7df5b9ba58554 100644
> > --- a/drivers/mfd/madera-i2c.c
> > +++ b/drivers/mfd/madera-i2c.c
> > @@ -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);
> > diff --git a/include/linux/mfd/madera/pdata.h b/include/linux/mfd/madera/pdata.h
> > index fa9595dd42ba5..601cbbc10370c 100644
> > --- a/include/linux/mfd/madera/pdata.h
> > +++ b/include/linux/mfd/madera/pdata.h
> > @@ -21,7 +21,6 @@
> >
> > 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

2020-06-01 10:51:18

by Lee Jones

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

On Mon, 01 Jun 2020, Charles Keepax wrote:

> On Mon, Jun 01, 2020 at 06:24:33AM +0100, Lee Jones wrote:
> > On Fri, 29 May 2020, Charles Keepax wrote:
> >
> > Still needs a commit log.
> >
> > > Signed-off-by: Charles Keepax <[email protected]>
> > > ---
> > > 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(-)
> > >
> > > diff --git a/drivers/mfd/madera-core.c b/drivers/mfd/madera-core.c
> > > index 7e0835cb062b1..4724c1a01a39f 100644
> > > --- a/drivers/mfd/madera-core.c
> > > +++ b/drivers/mfd/madera-core.c
> > > @@ -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?
> >
>
> 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.

--
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog