summaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2014-04-23 16:13:05 +0200
committerLee Jones <lee.jones@linaro.org>2014-06-03 08:11:21 +0100
commit9549b5ff001a8904372370d10be9a2f05e10eca5 (patch)
treeac06ddeb4bb3c9c7ec8572c86789af1e50d9c95f /include/linux/mfd
parent006cea3aeced7f3d67fe2849da7724683853d87d (diff)
downloadlinux-9549b5ff001a8904372370d10be9a2f05e10eca5.tar.gz
linux-9549b5ff001a8904372370d10be9a2f05e10eca5.tar.bz2
linux-9549b5ff001a8904372370d10be9a2f05e10eca5.zip
mfd: sec-core: Remove duplicated device type from sec_pmic_dev
The device type was stored in sec_pmic_dev state container twice: - unsigned long type (initialized from of_device_id or i2c_device_id) - int device_type (initialized as above or from board files when there is no DTS) The 'type' field was never used outside of probe so it can be safely removed. Change also the device_type in sec_pmic_dev and sec_platform_data to unsigned long to avoid any casts. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/samsung/core.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index 1c66a6462887..47d84242940b 100644
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -48,13 +48,12 @@ struct sec_pmic_dev {
struct regmap *regmap_pmic;
struct i2c_client *i2c;
- int device_type;
+ unsigned long device_type;
int irq_base;
int irq;
struct regmap_irq_chip_data *irq_data;
int ono;
- unsigned long type;
bool wakeup;
bool wtsr_smpl;
};