lkml.org 
[lkml]   [2012]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 7/8] i2c: i2c-bfin-twi: Move TWI peripheral pin request array to platform data.
    On Wed, May 16, 2012 at 03:20:25PM +0800, sonic.zhang@analog.com wrote:
    > From: Sonic Zhang <sonic.zhang@analog.com>
    >
    > Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>

    Again, please state the dependency.

    > ---
    > drivers/i2c/busses/i2c-bfin-twi.c | 12 ++++--------
    > 1 files changed, 4 insertions(+), 8 deletions(-)
    >
    > diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c
    > index d7e8fba..b2ca317 100644
    > --- a/drivers/i2c/busses/i2c-bfin-twi.c
    > +++ b/drivers/i2c/busses/i2c-bfin-twi.c
    > @@ -78,11 +78,6 @@ DEFINE_TWI_REG(XMT_DATA16, 0x84)
    > DEFINE_TWI_REG(RCV_DATA8, 0x88)
    > DEFINE_TWI_REG(RCV_DATA16, 0x8C)
    >
    > -static const u16 pin_req[2][3] = {
    > - {P_TWI0_SCL, P_TWI0_SDA, 0},
    > - {P_TWI1_SCL, P_TWI1_SDA, 0},
    > -};
    > -
    > static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface,
    > unsigned short twi_int_status)
    > {
    > @@ -719,7 +714,8 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
    > p_adap->timeout = 5 * HZ;
    > p_adap->retries = 3;
    >
    > - rc = peripheral_request_list(pin_req[pdev->id], "i2c-bfin-twi");
    > + rc = peripheral_request_list((unsigned short *)pdev->dev.platform_data,
    > + "i2c-bfin-twi");
    > if (rc) {
    > dev_err(&pdev->dev, "Can't setup pin mux!\n");
    > goto out_error_pin_mux;
    > @@ -766,7 +762,7 @@ out_error_add_adapter:
    > free_irq(iface->irq, iface);
    > out_error_req_irq:
    > out_error_no_irq:
    > - peripheral_free_list(pin_req[pdev->id]);
    > + peripheral_free_list((unsigned short *)pdev->dev.platform_data);
    > out_error_pin_mux:
    > iounmap(iface->regs_base);
    > out_error_ioremap:
    > @@ -784,7 +780,7 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev)
    >
    > i2c_del_adapter(&(iface->adap));
    > free_irq(iface->irq, iface);
    > - peripheral_free_list(pin_req[pdev->id]);
    > + peripheral_free_list((unsigned short *)pdev->dev.platform_data);
    > iounmap(iface->regs_base);
    > kfree(iface);
    >
    > --
    > 1.7.0.4
    >
    >
    > --
    > To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
    > the body of a message to majordomo@vger.kernel.org
    > More majordomo info at http://vger.kernel.org/majordomo-info.html

    --
    Pengutronix e.K. | Wolfram Sang |
    Industrial Linux Solutions | http://www.pengutronix.de/ |
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-06-12 03:41    [W:0.031 / U:33.352 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site