From: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
To: Chanwoo Choi <cw00.choi@samsung.com>,
MyungJoo Ham <myungjoo.ham@samsung.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Lee Jones <lee.jones@linaro.org>,
Sebastian Reichel <sre@kernel.org>,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
David Woodhouse <dwmw2@infradead.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
linux-kernel@vger.kernel.org, linux-input@vger.kernel.org,
linux-pm@vger.kernel.org
Cc: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Subject: [PATCH 02/10] mfd: max77693: Store I2C device type as enum and add default unknown
Date: Wed, 29 Apr 2015 19:58:27 +0900 [thread overview]
Message-ID: <1430305114-23598-3-git-send-email-k.kozlowski.k@gmail.com> (raw)
In-Reply-To: <1430305114-23598-1-git-send-email-k.kozlowski.k@gmail.com>
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(-)
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 */
--
2.1.4
next prev parent reply other threads:[~2015-04-29 10:58 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-29 10:58 [PATCH 00/10] regulator/power/mfd/input/extcon: Merge max77843 into max77693 Krzysztof Kozlowski
2015-04-29 10:58 ` [PATCH 01/10] mfd/extcon: max77693: Remove unused extern declarations and max77693_dev members Krzysztof Kozlowski
2015-05-04 6:45 ` Chanwoo Choi
2015-05-04 6:49 ` Krzysztof Kozłowski
2015-05-04 6:54 ` Chanwoo Choi
2015-05-04 7:01 ` Krzysztof Kozłowski
2015-05-05 8:24 ` Lee Jones
2015-04-29 10:58 ` Krzysztof Kozlowski [this message]
2015-04-29 10:58 ` [PATCH 03/10] regulator: max77693: Use core code for charger's is_enabled Krzysztof Kozlowski
2015-04-29 11:03 ` Mark Brown
2015-04-29 11:08 ` Krzysztof Kozłowski
2015-04-29 10:58 ` [PATCH 04/10] regulator: max77693: Support different register configurations Krzysztof Kozlowski
2015-04-29 17:41 ` Mark Brown
2015-04-29 10:58 ` [PATCH 05/10] max77693: Move state container to common header Krzysztof Kozlowski
2015-05-23 15:11 ` Sebastian Reichel
2015-05-27 9:17 ` Lee Jones
2015-04-29 10:58 ` [PATCH 06/10] max77843: Switch to common max77693 state container Krzysztof Kozlowski
2015-04-29 10:58 ` [PATCH 07/10] mfd/extcon: max77693: Rename defines to allow inclusion with max77843 Krzysztof Kozlowski
2015-04-29 13:12 ` Lee Jones
2015-04-29 13:23 ` Krzysztof Kozłowski
2015-04-29 10:58 ` [PATCH 08/10] mfd/extcon: max77843: Rename defines to allow inclusion with max77693 Krzysztof Kozlowski
2015-04-29 13:11 ` Lee Jones
2015-04-29 10:58 ` [PATCH 09/10] regulator: max77693: Add support for MAX77843 device Krzysztof Kozlowski
2015-04-29 17:58 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430305114-23598-3-git-send-email-k.kozlowski.k@gmail.com \
--to=k.kozlowski.k@gmail.com \
--cc=broonie@kernel.org \
--cc=cw00.choi@samsung.com \
--cc=dbaryshkov@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=sameo@linux.intel.com \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).