leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: max77693: Remove device wakeup from driver

Browse Source 
The patch removes wakeup related code from the driver and plaftorm
data - it is already handled by i2c core using I2C_CLIENT_WAKE flag
from struct i2c_board_info. As a result MFD itself do not requires
platform data.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Andrzej Hajda 2013-08-21 18:53:33 +02:00 committed by Lee Jones
parent 0248b4bfe5
commit 4233a0aafb
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mfd/max77693.c
View File

@ -110,15 +110,9 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct max77693_dev *max77693; struct max77693_dev *max77693;
struct max77693_platform_data *pdata = dev_get_platdata(&i2c->dev);
u8 reg_data; u8 reg_data;
int ret = 0; int ret = 0;
if (!pdata) {
dev_err(&i2c->dev, "No platform data found.\n");
return -EINVAL;
}
max77693 = devm_kzalloc(&i2c->dev, max77693 = devm_kzalloc(&i2c->dev,
sizeof(struct max77693_dev), GFP_KERNEL); sizeof(struct max77693_dev), GFP_KERNEL);
if (max77693 == NULL) if (max77693 == NULL)
@ -138,8 +132,6 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
return ret; return ret;
} }
max77693->wakeup = pdata->wakeup;
ret = max77693_read_reg(max77693->regmap, MAX77693_PMIC_REG_PMIC_ID2, ret = max77693_read_reg(max77693->regmap, MAX77693_PMIC_REG_PMIC_ID2,
&reg_data); &reg_data);
if (ret < 0) { if (ret < 0) {
@ -179,8 +171,6 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
if (ret < 0) if (ret < 0)
goto err_mfd; goto err_mfd;
device_init_wakeup(max77693->dev, pdata->wakeup);
return ret; return ret;
err_mfd: err_mfd:

1
include/linux/mfd/max77693-private.h
View File

@ -323,7 +323,6 @@ struct max77693_dev {
int irq; int irq;
int irq_gpio; int irq_gpio;
bool wakeup;
struct mutex irqlock; struct mutex irqlock;
int irq_masks_cur[MAX77693_IRQ_GROUP_NR]; int irq_masks_cur[MAX77693_IRQ_GROUP_NR];
int irq_masks_cache[MAX77693_IRQ_GROUP_NR]; int irq_masks_cache[MAX77693_IRQ_GROUP_NR];

2
include/linux/mfd/max77693.h
View File

@ -64,8 +64,6 @@ struct max77693_muic_platform_data {
}; };
struct max77693_platform_data { struct max77693_platform_data {
int wakeup;
/* regulator data */ /* regulator data */
struct max77693_regulator_data *regulators; struct max77693_regulator_data *regulators;
int num_regulators; int num_regulators;