lkml.org 
[lkml]   [2011]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3/6] input/mc13783-ts: convert to mc13xxx API
    This is the first step to also support the touch interface of the mc13892
    pmic chip.

    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    ---
    drivers/input/touchscreen/mc13783_ts.c | 34 ++++++++++++++++----------------
    1 files changed, 17 insertions(+), 17 deletions(-)

    diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c
    index c5bc62d..ede0274 100644
    --- a/drivers/input/touchscreen/mc13783_ts.c
    +++ b/drivers/input/touchscreen/mc13783_ts.c
    @@ -35,7 +35,7 @@ MODULE_PARM_DESC(sample_tolerance,

    struct mc13783_ts_priv {
    struct input_dev *idev;
    - struct mc13783 *mc13783;
    + struct mc13xxx *mc13xxx;
    struct delayed_work work;
    struct workqueue_struct *workq;
    unsigned int sample[4];
    @@ -45,7 +45,7 @@ static irqreturn_t mc13783_ts_handler(int irq, void *data)
    {
    struct mc13783_ts_priv *priv = data;

    - mc13783_irq_ack(priv->mc13783, irq);
    + mc13xxx_irq_ack(priv->mc13xxx, irq);

    /*
    * Kick off reading coordinates. Note that if work happens already
    @@ -121,10 +121,10 @@ static void mc13783_ts_work(struct work_struct *work)
    {
    struct mc13783_ts_priv *priv =
    container_of(work, struct mc13783_ts_priv, work.work);
    - unsigned int mode = MC13783_ADC_MODE_TS;
    + unsigned int mode = MC13XXX_ADC_MODE_TS;
    unsigned int channel = 12;

    - if (mc13783_adc_do_conversion(priv->mc13783,
    + if (mc13xxx_adc_do_conversion(priv->mc13xxx,
    mode, channel, priv->sample) == 0)
    mc13783_ts_report_sample(priv);
    }
    @@ -134,21 +134,21 @@ static int mc13783_ts_open(struct input_dev *dev)
    struct mc13783_ts_priv *priv = input_get_drvdata(dev);
    int ret;

    - mc13783_lock(priv->mc13783);
    + mc13xxx_lock(priv->mc13xxx);

    - mc13783_irq_ack(priv->mc13783, MC13783_IRQ_TS);
    + mc13xxx_irq_ack(priv->mc13xxx, MC13XXX_IRQ_TS);

    - ret = mc13783_irq_request(priv->mc13783, MC13783_IRQ_TS,
    + ret = mc13xxx_irq_request(priv->mc13xxx, MC13XXX_IRQ_TS,
    mc13783_ts_handler, MC13783_TS_NAME, priv);
    if (ret)
    goto out;

    - ret = mc13783_reg_rmw(priv->mc13783, MC13783_ADC0,
    - MC13783_ADC0_TSMOD_MASK, MC13783_ADC0_TSMOD0);
    + ret = mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0,
    + MC13XXX_ADC0_TSMOD_MASK, MC13XXX_ADC0_TSMOD0);
    if (ret)
    - mc13783_irq_free(priv->mc13783, MC13783_IRQ_TS, priv);
    + mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv);
    out:
    - mc13783_unlock(priv->mc13783);
    + mc13xxx_unlock(priv->mc13xxx);
    return ret;
    }

    @@ -156,11 +156,11 @@ static void mc13783_ts_close(struct input_dev *dev)
    {
    struct mc13783_ts_priv *priv = input_get_drvdata(dev);

    - mc13783_lock(priv->mc13783);
    - mc13783_reg_rmw(priv->mc13783, MC13783_ADC0,
    - MC13783_ADC0_TSMOD_MASK, 0);
    - mc13783_irq_free(priv->mc13783, MC13783_IRQ_TS, priv);
    - mc13783_unlock(priv->mc13783);
    + mc13xxx_lock(priv->mc13xxx);
    + mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0,
    + MC13XXX_ADC0_TSMOD_MASK, 0);
    + mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv);
    + mc13xxx_unlock(priv->mc13xxx);

    cancel_delayed_work_sync(&priv->work);
    }
    @@ -177,7 +177,7 @@ static int __init mc13783_ts_probe(struct platform_device *pdev)
    goto err_free_mem;

    INIT_DELAYED_WORK(&priv->work, mc13783_ts_work);
    - priv->mc13783 = dev_get_drvdata(pdev->dev.parent);
    + priv->mc13xxx = dev_get_drvdata(pdev->dev.parent);
    priv->idev = idev;

    /*
    --
    1.7.5.4
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-08-24 15:33    [W:0.026 / U:33.348 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site