| Message ID | 1432446213-4886-3-git-send-email-k.kozlowski.k@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Sun, 24 May 2015, Krzysztof Kozlowski wrote: > Store the device type (obtained from i2c_device_id) as an enum and add a > default type of unknown to distinguish from case when this is not set > at all. > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> > --- > include/linux/mfd/max77693-private.h | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) Applied, thanks. > diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h > index ad67b8235a8d..e3c0afff38d3 100644 > --- a/include/linux/mfd/max77693-private.h > +++ b/include/linux/mfd/max77693-private.h > @@ -529,13 +529,18 @@ enum max77693_irq_muic { > MAX77693_MUIC_IRQ_NR, > }; > > +enum max77693_types { > + TYPE_MAX77693_UNKNOWN, > + TYPE_MAX77693, > +}; > + > struct max77693_dev { > struct device *dev; > struct i2c_client *i2c; /* 0xCC , PMIC, Charger, Flash LED */ > struct i2c_client *muic; /* 0x4A , MUIC */ > struct i2c_client *haptic; /* 0x90 , Haptic */ > > - int type; > + enum max77693_types type; > > struct regmap *regmap; > struct regmap *regmap_muic; > @@ -549,8 +554,4 @@ struct max77693_dev { > int irq; > }; > > -enum max77693_types { > - TYPE_MAX77693, > -}; > - > #endif /* __LINUX_MFD_MAX77693_PRIV_H */
2015-05-27 19:23 GMT+09:00 Lee Jones <lee.jones@linaro.org>: > On Sun, 24 May 2015, Krzysztof Kozlowski wrote: > >> Store the device type (obtained from i2c_device_id) as an enum and add a >> default type of unknown to distinguish from case when this is not set >> at all. >> >> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> >> --- >> include/linux/mfd/max77693-private.h | 11 ++++++----- >> 1 file changed, 6 insertions(+), 5 deletions(-) > > Applied, thanks. Thanks. I was thinking about merging everything through one tree because of the dependency (successive patches depend on previous) but I don't mind choosing different strategy. However if you picked this one maybe you can also apply the patch 1/9: mfd/extcon: max77693: Remove unused extern declarations and max77693_dev members It already got ack from Chanwoo. Other patches depend on these so either everything will go through your tree or you will prepare an immutable branch for e.g. Mark (as everything is around regulator drivers). Anyway I need some input from Mark about the patches 4, 5 and 9. Rest of them already have his ack. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 27 May 2015, Krzysztof Koz?owski wrote: > 2015-05-27 19:23 GMT+09:00 Lee Jones <lee.jones@linaro.org>: > > On Sun, 24 May 2015, Krzysztof Kozlowski wrote: > > > >> Store the device type (obtained from i2c_device_id) as an enum and add a > >> default type of unknown to distinguish from case when this is not set > >> at all. > >> > >> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> > >> --- > >> include/linux/mfd/max77693-private.h | 11 ++++++----- > >> 1 file changed, 6 insertions(+), 5 deletions(-) > > > > Applied, thanks. > > Thanks. > > I was thinking about merging everything through one tree because of > the dependency (successive patches depend on previous) but I don't > mind choosing different strategy. However if you picked this one maybe > you can also apply the patch 1/9: > mfd/extcon: max77693: Remove unused extern declarations and max77693_dev members > > It already got ack from Chanwoo. > > Other patches depend on these so either everything will go through > your tree or you will prepare an immutable branch for e.g. Mark (as > everything is around regulator drivers). > > Anyway I need some input from Mark about the patches 4, 5 and 9. Rest > of them already have his ack. I'm happy to do that. Just let me know when you have all the Acks you need and I'll apply them all at once.
On Wed, 27 May 2015, Lee Jones wrote: > On Wed, 27 May 2015, Krzysztof Koz?owski wrote: > > > 2015-05-27 19:23 GMT+09:00 Lee Jones <lee.jones@linaro.org>: > > > On Sun, 24 May 2015, Krzysztof Kozlowski wrote: > > > > > >> Store the device type (obtained from i2c_device_id) as an enum and add a > > >> default type of unknown to distinguish from case when this is not set > > >> at all. > > >> > > >> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> > > >> --- > > >> include/linux/mfd/max77693-private.h | 11 ++++++----- > > >> 1 file changed, 6 insertions(+), 5 deletions(-) > > > > > > Applied, thanks. > > > > Thanks. > > > > I was thinking about merging everything through one tree because of > > the dependency (successive patches depend on previous) but I don't > > mind choosing different strategy. However if you picked this one maybe > > you can also apply the patch 1/9: > > mfd/extcon: max77693: Remove unused extern declarations and max77693_dev members > > > > It already got ack from Chanwoo. > > > > Other patches depend on these so either everything will go through > > your tree or you will prepare an immutable branch for e.g. Mark (as > > everything is around regulator drivers). > > > > Anyway I need some input from Mark about the patches 4, 5 and 9. Rest > > of them already have his ack. > > I'm happy to do that. Just let me know when you have all the Acks you > need and I'll apply them all at once. In fact, it's probably better to withdraw this patch too, then apply it with all the others. Patch unapplied (but you can add my Ack).
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h index ad67b8235a8d..e3c0afff38d3 100644 --- a/include/linux/mfd/max77693-private.h +++ b/include/linux/mfd/max77693-private.h @@ -529,13 +529,18 @@ enum max77693_irq_muic { MAX77693_MUIC_IRQ_NR, }; +enum max77693_types { + TYPE_MAX77693_UNKNOWN, + TYPE_MAX77693, +}; + struct max77693_dev { struct device *dev; struct i2c_client *i2c; /* 0xCC , PMIC, Charger, Flash LED */ struct i2c_client *muic; /* 0x4A , MUIC */ struct i2c_client *haptic; /* 0x90 , Haptic */ - int type; + enum max77693_types type; struct regmap *regmap; struct regmap *regmap_muic; @@ -549,8 +554,4 @@ struct max77693_dev { int irq; }; -enum max77693_types { - TYPE_MAX77693, -}; - #endif /* __LINUX_MFD_MAX77693_PRIV_H */
Store the device type (obtained from i2c_device_id) as an enum and add a default type of unknown to distinguish from case when this is not set at all. Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@gmail.com> --- include/linux/mfd/max77693-private.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)