| Message ID | 20181208175847.32068-2-oskari@lemmela.net |
|---|---|
| State | Accepted |
| Commit | 753a8d083e085c6f552c7982749de4cc7c40e2ac |
| Headers | show |
| Series |
|
| Related | show |
On Sat, 08 Dec 2018, Oskari Lemmela wrote: > From: Chen-Yu Tsai <wens@csie.org> > > In the axp20x driver, the various mfd_cell lists had varying amounts > of indentation, sometimes even within the same list. For the axp288, > there's no alignment at all. > > Re-align the right hand side of the assignments with the least amount > of tabs possible. Also collapse the closing bracket and the opening > bracket of the next entry onto the same line for the axp288, to be > consistent with all the other mfd_cell lists. > > This patch is whitespace change only. No functionality is modified. > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > Signed-off-by: Oskari Lemmela <oskari@lemmela.net> > --- > drivers/mfd/axp20x.c | 107 +++++++++++++++++++++---------------------- > 1 file changed, 51 insertions(+), 56 deletions(-) Applied, thanks.
On Sat, 08 Dec 2018, Oskari Lemmela wrote: > From: Chen-Yu Tsai <wens@csie.org> > > In the axp20x driver, the various mfd_cell lists had varying amounts > of indentation, sometimes even within the same list. For the axp288, > there's no alignment at all. > > Re-align the right hand side of the assignments with the least amount > of tabs possible. Also collapse the closing bracket and the opening > bracket of the next entry onto the same line for the axp288, to be > consistent with all the other mfd_cell lists. > > This patch is whitespace change only. No functionality is modified. > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> > Signed-off-by: Oskari Lemmela <oskari@lemmela.net> Why is Oskari Lemmela's SoB here? You both authored this alignment patch? > --- > drivers/mfd/axp20x.c | 107 +++++++++++++++++++++---------------------- > 1 file changed, 51 insertions(+), 56 deletions(-) > > diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c > index dfc3cff1d08b..8037b4e01ed6 100644 > --- a/drivers/mfd/axp20x.c > +++ b/drivers/mfd/axp20x.c > @@ -640,9 +640,9 @@ static const struct mfd_cell axp221_cells[] = { > > static const struct mfd_cell axp223_cells[] = { > { > - .name = "axp221-pek", > - .num_resources = ARRAY_SIZE(axp22x_pek_resources), > - .resources = axp22x_pek_resources, > + .name = "axp221-pek", > + .num_resources = ARRAY_SIZE(axp22x_pek_resources), > + .resources = axp22x_pek_resources, > }, { > .name = "axp22x-adc", > .of_compatible = "x-powers,axp221-adc", > @@ -650,7 +650,7 @@ static const struct mfd_cell axp223_cells[] = { > .name = "axp20x-battery-power-supply", > .of_compatible = "x-powers,axp221-battery-power-supply", > }, { > - .name = "axp20x-regulator", > + .name = "axp20x-regulator", > }, { > .name = "axp20x-ac-power-supply", > .of_compatible = "x-powers,axp221-ac-power-supply", > @@ -666,9 +666,9 @@ static const struct mfd_cell axp223_cells[] = { > > static const struct mfd_cell axp152_cells[] = { > { > - .name = "axp20x-pek", > - .num_resources = ARRAY_SIZE(axp152_pek_resources), > - .resources = axp152_pek_resources, > + .name = "axp20x-pek", > + .num_resources = ARRAY_SIZE(axp152_pek_resources), > + .resources = axp152_pek_resources, > }, > }; > > @@ -697,84 +697,79 @@ static const struct resource axp288_charger_resources[] = { > > static const struct mfd_cell axp288_cells[] = { > { > - .name = "axp288_adc", > - .num_resources = ARRAY_SIZE(axp288_adc_resources), > - .resources = axp288_adc_resources, > - }, > - { > - .name = "axp288_extcon", > - .num_resources = ARRAY_SIZE(axp288_extcon_resources), > - .resources = axp288_extcon_resources, > - }, > - { > - .name = "axp288_charger", > - .num_resources = ARRAY_SIZE(axp288_charger_resources), > - .resources = axp288_charger_resources, > - }, > - { > - .name = "axp288_fuel_gauge", > - .num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources), > - .resources = axp288_fuel_gauge_resources, > - }, > - { > - .name = "axp221-pek", > - .num_resources = ARRAY_SIZE(axp288_power_button_resources), > - .resources = axp288_power_button_resources, > - }, > - { > - .name = "axp288_pmic_acpi", > + .name = "axp288_adc", > + .num_resources = ARRAY_SIZE(axp288_adc_resources), > + .resources = axp288_adc_resources, > + }, { > + .name = "axp288_extcon", > + .num_resources = ARRAY_SIZE(axp288_extcon_resources), > + .resources = axp288_extcon_resources, > + }, { > + .name = "axp288_charger", > + .num_resources = ARRAY_SIZE(axp288_charger_resources), > + .resources = axp288_charger_resources, > + }, { > + .name = "axp288_fuel_gauge", > + .num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources), > + .resources = axp288_fuel_gauge_resources, > + }, { > + .name = "axp221-pek", > + .num_resources = ARRAY_SIZE(axp288_power_button_resources), > + .resources = axp288_power_button_resources, > + }, { > + .name = "axp288_pmic_acpi", > }, > }; > > static const struct mfd_cell axp803_cells[] = { > { > - .name = "axp221-pek", > - .num_resources = ARRAY_SIZE(axp803_pek_resources), > - .resources = axp803_pek_resources, > + .name = "axp221-pek", > + .num_resources = ARRAY_SIZE(axp803_pek_resources), > + .resources = axp803_pek_resources, > }, > - { .name = "axp20x-regulator" }, > + { .name = "axp20x-regulator" }, > }; > > static const struct mfd_cell axp806_self_working_cells[] = { > { > - .name = "axp221-pek", > - .num_resources = ARRAY_SIZE(axp806_pek_resources), > - .resources = axp806_pek_resources, > + .name = "axp221-pek", > + .num_resources = ARRAY_SIZE(axp806_pek_resources), > + .resources = axp806_pek_resources, > }, > - { .name = "axp20x-regulator" }, > + { .name = "axp20x-regulator" }, > }; > > static const struct mfd_cell axp806_cells[] = { > { > - .id = 2, > - .name = "axp20x-regulator", > + .id = 2, > + .name = "axp20x-regulator", > }, > }; > > static const struct mfd_cell axp809_cells[] = { > { > - .name = "axp221-pek", > - .num_resources = ARRAY_SIZE(axp809_pek_resources), > - .resources = axp809_pek_resources, > + .name = "axp221-pek", > + .num_resources = ARRAY_SIZE(axp809_pek_resources), > + .resources = axp809_pek_resources, > }, { > - .id = 1, > - .name = "axp20x-regulator", > + .id = 1, > + .name = "axp20x-regulator", > }, > }; > > static const struct mfd_cell axp813_cells[] = { > { > - .name = "axp221-pek", > - .num_resources = ARRAY_SIZE(axp803_pek_resources), > - .resources = axp803_pek_resources, > + .name = "axp221-pek", > + .num_resources = ARRAY_SIZE(axp803_pek_resources), > + .resources = axp803_pek_resources, > }, { > - .name = "axp20x-regulator", > + .name = "axp20x-regulator", > }, { > - .name = "axp20x-gpio", > - .of_compatible = "x-powers,axp813-gpio", > + .name = "axp20x-gpio", > + .of_compatible = "x-powers,axp813-gpio", > }, { > - .name = "axp813-adc", > - .of_compatible = "x-powers,axp813-adc", > + .name = "axp813-adc", > + .of_compatible = "x-powers,axp813-adc", > }, { > .name = "axp20x-battery-power-supply", > .of_compatible = "x-powers,axp813-battery-power-supply",
Hi Lee, On 10.12.2018 8.36, Lee Jones wrote: > On Sat, 08 Dec 2018, Oskari Lemmela wrote: > >> From: Chen-Yu Tsai <wens@csie.org> >> >> In the axp20x driver, the various mfd_cell lists had varying amounts >> of indentation, sometimes even within the same list. For the axp288, >> there's no alignment at all. >> >> Re-align the right hand side of the assignments with the least amount >> of tabs possible. Also collapse the closing bracket and the opening >> bracket of the next entry onto the same line for the axp288, to be >> consistent with all the other mfd_cell lists. >> >> This patch is whitespace change only. No functionality is modified. >> >> Signed-off-by: Chen-Yu Tsai <wens@csie.org> >> Signed-off-by: Oskari Lemmela <oskari@lemmela.net> > Why is Oskari Lemmela's SoB here? > > You both authored this alignment patch? I picked up Chen-Yu's patch from https://github.com/wens/linux/commit/b99cec26bae2835a0374463570ea9ea26b034afa. I should have mentioned it cover letter. Chen-Yu is correct author. I'm just sending his patch. > >> --- >> drivers/mfd/axp20x.c | 107 +++++++++++++++++++++---------------------- >> 1 file changed, 51 insertions(+), 56 deletions(-) >> >> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c >> index dfc3cff1d08b..8037b4e01ed6 100644 >> --- a/drivers/mfd/axp20x.c >> +++ b/drivers/mfd/axp20x.c >> @@ -640,9 +640,9 @@ static const struct mfd_cell axp221_cells[] = { >> >> static const struct mfd_cell axp223_cells[] = { >> { >> - .name = "axp221-pek", >> - .num_resources = ARRAY_SIZE(axp22x_pek_resources), >> - .resources = axp22x_pek_resources, >> + .name = "axp221-pek", >> + .num_resources = ARRAY_SIZE(axp22x_pek_resources), >> + .resources = axp22x_pek_resources, >> }, { >> .name = "axp22x-adc", >> .of_compatible = "x-powers,axp221-adc", >> @@ -650,7 +650,7 @@ static const struct mfd_cell axp223_cells[] = { >> .name = "axp20x-battery-power-supply", >> .of_compatible = "x-powers,axp221-battery-power-supply", >> }, { >> - .name = "axp20x-regulator", >> + .name = "axp20x-regulator", >> }, { >> .name = "axp20x-ac-power-supply", >> .of_compatible = "x-powers,axp221-ac-power-supply", >> @@ -666,9 +666,9 @@ static const struct mfd_cell axp223_cells[] = { >> >> static const struct mfd_cell axp152_cells[] = { >> { >> - .name = "axp20x-pek", >> - .num_resources = ARRAY_SIZE(axp152_pek_resources), >> - .resources = axp152_pek_resources, >> + .name = "axp20x-pek", >> + .num_resources = ARRAY_SIZE(axp152_pek_resources), >> + .resources = axp152_pek_resources, >> }, >> }; >> >> @@ -697,84 +697,79 @@ static const struct resource axp288_charger_resources[] = { >> >> static const struct mfd_cell axp288_cells[] = { >> { >> - .name = "axp288_adc", >> - .num_resources = ARRAY_SIZE(axp288_adc_resources), >> - .resources = axp288_adc_resources, >> - }, >> - { >> - .name = "axp288_extcon", >> - .num_resources = ARRAY_SIZE(axp288_extcon_resources), >> - .resources = axp288_extcon_resources, >> - }, >> - { >> - .name = "axp288_charger", >> - .num_resources = ARRAY_SIZE(axp288_charger_resources), >> - .resources = axp288_charger_resources, >> - }, >> - { >> - .name = "axp288_fuel_gauge", >> - .num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources), >> - .resources = axp288_fuel_gauge_resources, >> - }, >> - { >> - .name = "axp221-pek", >> - .num_resources = ARRAY_SIZE(axp288_power_button_resources), >> - .resources = axp288_power_button_resources, >> - }, >> - { >> - .name = "axp288_pmic_acpi", >> + .name = "axp288_adc", >> + .num_resources = ARRAY_SIZE(axp288_adc_resources), >> + .resources = axp288_adc_resources, >> + }, { >> + .name = "axp288_extcon", >> + .num_resources = ARRAY_SIZE(axp288_extcon_resources), >> + .resources = axp288_extcon_resources, >> + }, { >> + .name = "axp288_charger", >> + .num_resources = ARRAY_SIZE(axp288_charger_resources), >> + .resources = axp288_charger_resources, >> + }, { >> + .name = "axp288_fuel_gauge", >> + .num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources), >> + .resources = axp288_fuel_gauge_resources, >> + }, { >> + .name = "axp221-pek", >> + .num_resources = ARRAY_SIZE(axp288_power_button_resources), >> + .resources = axp288_power_button_resources, >> + }, { >> + .name = "axp288_pmic_acpi", >> }, >> }; >> >> static const struct mfd_cell axp803_cells[] = { >> { >> - .name = "axp221-pek", >> - .num_resources = ARRAY_SIZE(axp803_pek_resources), >> - .resources = axp803_pek_resources, >> + .name = "axp221-pek", >> + .num_resources = ARRAY_SIZE(axp803_pek_resources), >> + .resources = axp803_pek_resources, >> }, >> - { .name = "axp20x-regulator" }, >> + { .name = "axp20x-regulator" }, >> }; >> >> static const struct mfd_cell axp806_self_working_cells[] = { >> { >> - .name = "axp221-pek", >> - .num_resources = ARRAY_SIZE(axp806_pek_resources), >> - .resources = axp806_pek_resources, >> + .name = "axp221-pek", >> + .num_resources = ARRAY_SIZE(axp806_pek_resources), >> + .resources = axp806_pek_resources, >> }, >> - { .name = "axp20x-regulator" }, >> + { .name = "axp20x-regulator" }, >> }; >> >> static const struct mfd_cell axp806_cells[] = { >> { >> - .id = 2, >> - .name = "axp20x-regulator", >> + .id = 2, >> + .name = "axp20x-regulator", >> }, >> }; >> >> static const struct mfd_cell axp809_cells[] = { >> { >> - .name = "axp221-pek", >> - .num_resources = ARRAY_SIZE(axp809_pek_resources), >> - .resources = axp809_pek_resources, >> + .name = "axp221-pek", >> + .num_resources = ARRAY_SIZE(axp809_pek_resources), >> + .resources = axp809_pek_resources, >> }, { >> - .id = 1, >> - .name = "axp20x-regulator", >> + .id = 1, >> + .name = "axp20x-regulator", >> }, >> }; >> >> static const struct mfd_cell axp813_cells[] = { >> { >> - .name = "axp221-pek", >> - .num_resources = ARRAY_SIZE(axp803_pek_resources), >> - .resources = axp803_pek_resources, >> + .name = "axp221-pek", >> + .num_resources = ARRAY_SIZE(axp803_pek_resources), >> + .resources = axp803_pek_resources, >> }, { >> - .name = "axp20x-regulator", >> + .name = "axp20x-regulator", >> }, { >> - .name = "axp20x-gpio", >> - .of_compatible = "x-powers,axp813-gpio", >> + .name = "axp20x-gpio", >> + .of_compatible = "x-powers,axp813-gpio", >> }, { >> - .name = "axp813-adc", >> - .of_compatible = "x-powers,axp813-adc", >> + .name = "axp813-adc", >> + .of_compatible = "x-powers,axp813-adc", >> }, { >> .name = "axp20x-battery-power-supply", >> .of_compatible = "x-powers,axp813-battery-power-supply", Thanks, Oskari
On Mon, 10 Dec 2018, Oskari Lemmelä wrote: > On 10.12.2018 8.36, Lee Jones wrote: > > On Sat, 08 Dec 2018, Oskari Lemmela wrote: > > > >> From: Chen-Yu Tsai <wens@csie.org> > >> > >> In the axp20x driver, the various mfd_cell lists had varying amounts > >> of indentation, sometimes even within the same list. For the axp288, > >> there's no alignment at all. > >> > >> Re-align the right hand side of the assignments with the least amount > >> of tabs possible. Also collapse the closing bracket and the opening > >> bracket of the next entry onto the same line for the axp288, to be > >> consistent with all the other mfd_cell lists. > >> > >> This patch is whitespace change only. No functionality is modified. > >> > >> Signed-off-by: Chen-Yu Tsai <wens@csie.org> > >> Signed-off-by: Oskari Lemmela <oskari@lemmela.net> > > Why is Oskari Lemmela's SoB here? > > > > You both authored this alignment patch? > I picked up Chen-Yu's patch from > https://github.com/wens/linux/commit/b99cec26bae2835a0374463570ea9ea26b034afa. > I should have mentioned it cover letter. > > Chen-Yu is correct author. I'm just sending his patch. That's fine. Thanks for the explanation.
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c index dfc3cff1d08b..8037b4e01ed6 100644 --- a/drivers/mfd/axp20x.c +++ b/drivers/mfd/axp20x.c @@ -640,9 +640,9 @@ static const struct mfd_cell axp221_cells[] = { static const struct mfd_cell axp223_cells[] = { { - .name = "axp221-pek", - .num_resources = ARRAY_SIZE(axp22x_pek_resources), - .resources = axp22x_pek_resources, + .name = "axp221-pek", + .num_resources = ARRAY_SIZE(axp22x_pek_resources), + .resources = axp22x_pek_resources, }, { .name = "axp22x-adc", .of_compatible = "x-powers,axp221-adc", @@ -650,7 +650,7 @@ static const struct mfd_cell axp223_cells[] = { .name = "axp20x-battery-power-supply", .of_compatible = "x-powers,axp221-battery-power-supply", }, { - .name = "axp20x-regulator", + .name = "axp20x-regulator", }, { .name = "axp20x-ac-power-supply", .of_compatible = "x-powers,axp221-ac-power-supply", @@ -666,9 +666,9 @@ static const struct mfd_cell axp223_cells[] = { static const struct mfd_cell axp152_cells[] = { { - .name = "axp20x-pek", - .num_resources = ARRAY_SIZE(axp152_pek_resources), - .resources = axp152_pek_resources, + .name = "axp20x-pek", + .num_resources = ARRAY_SIZE(axp152_pek_resources), + .resources = axp152_pek_resources, }, }; @@ -697,84 +697,79 @@ static const struct resource axp288_charger_resources[] = { static const struct mfd_cell axp288_cells[] = { { - .name = "axp288_adc", - .num_resources = ARRAY_SIZE(axp288_adc_resources), - .resources = axp288_adc_resources, - }, - { - .name = "axp288_extcon", - .num_resources = ARRAY_SIZE(axp288_extcon_resources), - .resources = axp288_extcon_resources, - }, - { - .name = "axp288_charger", - .num_resources = ARRAY_SIZE(axp288_charger_resources), - .resources = axp288_charger_resources, - }, - { - .name = "axp288_fuel_gauge", - .num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources), - .resources = axp288_fuel_gauge_resources, - }, - { - .name = "axp221-pek", - .num_resources = ARRAY_SIZE(axp288_power_button_resources), - .resources = axp288_power_button_resources, - }, - { - .name = "axp288_pmic_acpi", + .name = "axp288_adc", + .num_resources = ARRAY_SIZE(axp288_adc_resources), + .resources = axp288_adc_resources, + }, { + .name = "axp288_extcon", + .num_resources = ARRAY_SIZE(axp288_extcon_resources), + .resources = axp288_extcon_resources, + }, { + .name = "axp288_charger", + .num_resources = ARRAY_SIZE(axp288_charger_resources), + .resources = axp288_charger_resources, + }, { + .name = "axp288_fuel_gauge", + .num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources), + .resources = axp288_fuel_gauge_resources, + }, { + .name = "axp221-pek", + .num_resources = ARRAY_SIZE(axp288_power_button_resources), + .resources = axp288_power_button_resources, + }, { + .name = "axp288_pmic_acpi", }, }; static const struct mfd_cell axp803_cells[] = { { - .name = "axp221-pek", - .num_resources = ARRAY_SIZE(axp803_pek_resources), - .resources = axp803_pek_resources, + .name = "axp221-pek", + .num_resources = ARRAY_SIZE(axp803_pek_resources), + .resources = axp803_pek_resources, }, - { .name = "axp20x-regulator" }, + { .name = "axp20x-regulator" }, }; static const struct mfd_cell axp806_self_working_cells[] = { { - .name = "axp221-pek", - .num_resources = ARRAY_SIZE(axp806_pek_resources), - .resources = axp806_pek_resources, + .name = "axp221-pek", + .num_resources = ARRAY_SIZE(axp806_pek_resources), + .resources = axp806_pek_resources, }, - { .name = "axp20x-regulator" }, + { .name = "axp20x-regulator" }, }; static const struct mfd_cell axp806_cells[] = { { - .id = 2, - .name = "axp20x-regulator", + .id = 2, + .name = "axp20x-regulator", }, }; static const struct mfd_cell axp809_cells[] = { { - .name = "axp221-pek", - .num_resources = ARRAY_SIZE(axp809_pek_resources), - .resources = axp809_pek_resources, + .name = "axp221-pek", + .num_resources = ARRAY_SIZE(axp809_pek_resources), + .resources = axp809_pek_resources, }, { - .id = 1, - .name = "axp20x-regulator", + .id = 1, + .name = "axp20x-regulator", }, }; static const struct mfd_cell axp813_cells[] = { { - .name = "axp221-pek", - .num_resources = ARRAY_SIZE(axp803_pek_resources), - .resources = axp803_pek_resources, + .name = "axp221-pek", + .num_resources = ARRAY_SIZE(axp803_pek_resources), + .resources = axp803_pek_resources, }, { - .name = "axp20x-regulator", + .name = "axp20x-regulator", }, { - .name = "axp20x-gpio", - .of_compatible = "x-powers,axp813-gpio", + .name = "axp20x-gpio", + .of_compatible = "x-powers,axp813-gpio", }, { - .name = "axp813-adc", - .of_compatible = "x-powers,axp813-adc", + .name = "axp813-adc", + .of_compatible = "x-powers,axp813-adc", }, { .name = "axp20x-battery-power-supply", .of_compatible = "x-powers,axp813-battery-power-supply",