Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4233a0aa authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Lee Jones
Browse files

mfd: max77693: Remove device wakeup from driver 



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: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 0248b4bf

drivers/mfd/max77693.c

+0 −10
Original line number Diff line number Diff line
@@ -110,15 +110,9 @@ static int max77693_i2c_probe(struct i2c_client *i2c, 
			      const struct i2c_device_id *id)

{

	struct max77693_dev *max77693;

	struct max77693_platform_data *pdata = dev_get_platdata(&i2c->dev);

	u8 reg_data;

	int ret = 0;



	if (!pdata) {

		dev_err(&i2c->dev, "No platform data found.\n");

		return -EINVAL;

	}



	max77693 = devm_kzalloc(&i2c->dev,

			sizeof(struct max77693_dev), GFP_KERNEL);

	if (max77693 == NULL)
@@ -138,8 +132,6 @@ static int max77693_i2c_probe(struct i2c_client *i2c, 
		return ret;

	}



	max77693->wakeup = pdata->wakeup;



	ret = max77693_read_reg(max77693->regmap, MAX77693_PMIC_REG_PMIC_ID2,

				&reg_data);

	if (ret < 0) {
@@ -179,8 +171,6 @@ static int max77693_i2c_probe(struct i2c_client *i2c, 
	if (ret < 0)

		goto err_mfd;



	device_init_wakeup(max77693->dev, pdata->wakeup);



	return ret;



err_mfd:

include/linux/mfd/max77693-private.h

+0 −1
Original line number Diff line number Diff line
@@ -323,7 +323,6 @@ struct max77693_dev { 


	int irq;

	int irq_gpio;

	bool wakeup;

	struct mutex irqlock;

	int irq_masks_cur[MAX77693_IRQ_GROUP_NR];

	int irq_masks_cache[MAX77693_IRQ_GROUP_NR];

include/linux/mfd/max77693.h

+0 −2
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ struct max77693_muic_platform_data { 
};



struct max77693_platform_data {

	int wakeup;



	/* regulator data */

	struct max77693_regulator_data *regulators;

	int num_regulators;