From: Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
To: 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, linux-leds@vger.kernel.org
Cc: 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>,
Bryan Wu <cooloney@gmail.com>, Richard Purdie <rpurdie@rpsys.net>,
Jacek Anaszewski <j.anaszewski@samsung.com>,
Krzysztof Kozlowski <k.kozlowski.k@gmail.com>
Subject: [PATCH v5 2/9] mfd: max77693: Store I2C device type as enum and add default unknown
Date: Wed, 15 Jul 2015 21:59:48 +0900 [thread overview]
Message-ID: <1436965195-8899-3-git-send-email-k.kozlowski.k@gmail.com> (raw)
In-Reply-To: <1436965195-8899-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>
Acked-by: Lee Jones <lee.jones@linaro.org>
---
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-07-15 12:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-15 12:59 [PATCH v5 0/9] regulator: Merge max77843 into max77693 Krzysztof Kozlowski
2015-07-15 12:59 ` [PATCH v5 1/9] mfd/extcon: max77693: Remove unused extern declarations and max77693_dev members Krzysztof Kozlowski
2015-07-15 12:59 ` Krzysztof Kozlowski [this message]
2015-07-15 12:59 ` [PATCH v5 3/9] regulator: max77693: Support different register configurations Krzysztof Kozlowski
2015-07-15 12:59 ` [PATCH v5 4/9] drivers: max77693: Move state container to common header Krzysztof Kozlowski
2015-07-15 12:59 ` [PATCH v5 5/9] drivers: max77843: Switch to common max77693 state container Krzysztof Kozlowski
2015-07-15 12:59 ` [PATCH v5 6/9] mfd/extcon: max77693: Rename defines to allow inclusion with max77843 Krzysztof Kozlowski
2015-07-15 12:59 ` [PATCH v5 7/9] mfd/extcon: max77843: Rename defines to allow inclusion with max77693 Krzysztof Kozlowski
2015-07-15 12:59 ` [PATCH v5 8/9] regulator: max77693: Add support for MAX77843 device Krzysztof Kozlowski
2015-07-15 12:59 ` [PATCH v5 9/9] regulator: Remove the max77843 driver Krzysztof Kozlowski
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=1436965195-8899-3-git-send-email-k.kozlowski.k@gmail.com \
--to=k.kozlowski.k@gmail.com \
--cc=broonie@kernel.org \
--cc=cooloney@gmail.com \
--cc=cw00.choi@samsung.com \
--cc=dbaryshkov@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=j.anaszewski@samsung.com \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=rpurdie@rpsys.net \
--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).