lkml.org 
[lkml]   [2013]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v3 1/2] max77693: remove device wakeup from driver
    On 08/21/2013 06:53 PM, Andrzej Hajda wrote:
    > 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>
    > ---
    > drivers/mfd/max77693.c | 10 ----------
    > include/linux/mfd/max77693-private.h | 1 -
    > include/linux/mfd/max77693.h | 2 --
    > 3 files changed, 13 deletions(-)
    >
    > diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
    > index 9e60fed..27f5da3 100644
    > --- a/drivers/mfd/max77693.c
    > +++ b/drivers/mfd/max77693.c
    > @@ -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 = i2c->dev.platform_data;
    > 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:
    > diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
    > index 244fb0d..3e050b9 100644
    > --- a/include/linux/mfd/max77693-private.h
    > +++ b/include/linux/mfd/max77693-private.h
    > @@ -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];
    > diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h
    > index 676f0f3..3f3dc45 100644
    > --- a/include/linux/mfd/max77693.h
    > +++ b/include/linux/mfd/max77693.h
    > @@ -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;

    Ping.

    Regards
    Andrzej



    \
     
     \ /
      Last update: 2013-09-26 14:21    [W:2.447 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site