Message ID | 1499667800-69055-3-git-send-email-preid@electromag.com.au (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
On 2017-07-10 08:23, Phil Reid wrote: > Sort the header includes prior to adding to the list. > > Signed-off-by: Phil Reid <preid@electromag.com.au> > --- > drivers/power/supply/sbs-battery.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/drivers/power/supply/sbs-battery.c > b/drivers/power/supply/sbs-battery.c > index 15873df..4594ed1 100644 > --- a/drivers/power/supply/sbs-battery.c > +++ b/drivers/power/supply/sbs-battery.c > @@ -14,19 +14,18 @@ > * more details. > */ > > -#include <linux/init.h> > -#include <linux/module.h> > -#include <linux/kernel.h> > #include <linux/err.h> > -#include <linux/power_supply.h> > +#include <linux/gpio/consumer.h> > #include <linux/i2c.h> > -#include <linux/slab.h> > +#include <linux/init.h> > #include <linux/interrupt.h> > -#include <linux/gpio/consumer.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > #include <linux/of.h> > -#include <linux/stat.h> > - > #include <linux/power/sbs-battery.h> > +#include <linux/power_supply.h> > +#include <linux/slab.h> > +#include <linux/stat.h> > > enum { > REG_MANUFACTURER_DATA, > @@ -57,7 +56,7 @@ enum { > #define BATTERY_MODE_MASK 0x8000 > enum sbs_battery_mode { > BATTERY_MODE_AMPS = 0, > - BATTERY_MODE_WATTS = 0x800 > + BATTERY_MODE_WATTS = 0x8000 > }; I guess the second chunk is in there by accident. > > /* manufacturer access defines */
On 11/07/2017 16:37, Michael Heinemann wrote: > On 2017-07-10 08:23, Phil Reid wrote: >> Sort the header includes prior to adding to the list. >> >> Signed-off-by: Phil Reid <preid@electromag.com.au> >> --- >> drivers/power/supply/sbs-battery.c | 17 ++++++++--------- >> 1 file changed, 8 insertions(+), 9 deletions(-) >> >> diff --git a/drivers/power/supply/sbs-battery.c >> b/drivers/power/supply/sbs-battery.c >> index 15873df..4594ed1 100644 >> --- a/drivers/power/supply/sbs-battery.c >> +++ b/drivers/power/supply/sbs-battery.c >> @@ -14,19 +14,18 @@ >> * more details. >> */ >> >> -#include <linux/init.h> >> -#include <linux/module.h> >> -#include <linux/kernel.h> >> #include <linux/err.h> >> -#include <linux/power_supply.h> >> +#include <linux/gpio/consumer.h> >> #include <linux/i2c.h> >> -#include <linux/slab.h> >> +#include <linux/init.h> >> #include <linux/interrupt.h> >> -#include <linux/gpio/consumer.h> >> +#include <linux/kernel.h> >> +#include <linux/module.h> >> #include <linux/of.h> >> -#include <linux/stat.h> >> - >> #include <linux/power/sbs-battery.h> >> +#include <linux/power_supply.h> >> +#include <linux/slab.h> >> +#include <linux/stat.h> >> >> enum { >> REG_MANUFACTURER_DATA, >> @@ -57,7 +56,7 @@ enum { >> #define BATTERY_MODE_MASK 0x8000 >> enum sbs_battery_mode { >> BATTERY_MODE_AMPS = 0, >> - BATTERY_MODE_WATTS = 0x800 >> + BATTERY_MODE_WATTS = 0x8000 >> }; > > I guess the second chunk is in there by accident. > >> >> /* manufacturer access defines */ > > Damn, Thought I'd fixed that before sending the email
diff --git a/drivers/power/supply/sbs-battery.c b/drivers/power/supply/sbs-battery.c index 15873df..4594ed1 100644 --- a/drivers/power/supply/sbs-battery.c +++ b/drivers/power/supply/sbs-battery.c @@ -14,19 +14,18 @@ * more details. */ -#include <linux/init.h> -#include <linux/module.h> -#include <linux/kernel.h> #include <linux/err.h> -#include <linux/power_supply.h> +#include <linux/gpio/consumer.h> #include <linux/i2c.h> -#include <linux/slab.h> +#include <linux/init.h> #include <linux/interrupt.h> -#include <linux/gpio/consumer.h> +#include <linux/kernel.h> +#include <linux/module.h> #include <linux/of.h> -#include <linux/stat.h> - #include <linux/power/sbs-battery.h> +#include <linux/power_supply.h> +#include <linux/slab.h> +#include <linux/stat.h> enum { REG_MANUFACTURER_DATA, @@ -57,7 +56,7 @@ enum { #define BATTERY_MODE_MASK 0x8000 enum sbs_battery_mode { BATTERY_MODE_AMPS = 0, - BATTERY_MODE_WATTS = 0x800 + BATTERY_MODE_WATTS = 0x8000 }; /* manufacturer access defines */
Sort the header includes prior to adding to the list. Signed-off-by: Phil Reid <preid@electromag.com.au> --- drivers/power/supply/sbs-battery.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)