lkml.org 
[lkml]   [2008]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/27] Blackfin Serial Driver: Fix bug - should suspend/resume/remove all uart ports.
    Date
    From: Sonic Zhang <sonic.zhang@analog.com>

    Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Alan Cox <alan@redhat.com>
    ---

    drivers/serial/bfin_5xx.c | 39 ++++++++++++++++++++++-----------------
    1 files changed, 22 insertions(+), 17 deletions(-)

    diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
    index 4a023c6..04eeef0 100644
    --- a/drivers/serial/bfin_5xx.c
    +++ b/drivers/serial/bfin_5xx.c
    @@ -1100,20 +1100,26 @@ static struct uart_driver bfin_serial_reg = {

    static int bfin_serial_suspend(struct platform_device *dev, pm_message_t state)
    {
    - struct bfin_serial_port *uart = platform_get_drvdata(dev);
    + int i;

    - if (uart)
    - uart_suspend_port(&bfin_serial_reg, &uart->port);
    + for (i = 0; i < nr_ports; i++) {
    + if (bfin_serial_ports[i].port.dev != &dev->dev)
    + continue;
    + uart_suspend_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
    + }

    return 0;
    }

    static int bfin_serial_resume(struct platform_device *dev)
    {
    - struct bfin_serial_port *uart = platform_get_drvdata(dev);
    + int i;

    - if (uart)
    - uart_resume_port(&bfin_serial_reg, &uart->port);
    + for (i = 0; i < nr_ports; i++) {
    + if (bfin_serial_ports[i].port.dev != &dev->dev)
    + continue;
    + uart_resume_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
    + }

    return 0;
    }
    @@ -1133,27 +1139,26 @@ static int bfin_serial_probe(struct platform_device *dev)
    continue;
    bfin_serial_ports[i].port.dev = &dev->dev;
    uart_add_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
    - platform_set_drvdata(dev, &bfin_serial_ports[i]);
    }
    }

    return 0;
    }

    -static int bfin_serial_remove(struct platform_device *pdev)
    +static int bfin_serial_remove(struct platform_device *dev)
    {
    - struct bfin_serial_port *uart = platform_get_drvdata(pdev);
    -
    + int i;

    + for (i = 0; i < nr_ports; i++) {
    + if (bfin_serial_ports[i].port.dev != &dev->dev)
    + continue;
    + uart_remove_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
    + bfin_serial_ports[i].port.dev = NULL;
    #ifdef CONFIG_SERIAL_BFIN_CTSRTS
    - gpio_free(uart->cts_pin);
    - gpio_free(uart->rts_pin);
    + gpio_free(bfin_serial_ports[i].cts_pin);
    + gpio_free(bfin_serial_ports[i].rts_pin);
    #endif
    -
    - platform_set_drvdata(pdev, NULL);
    -
    - if (uart)
    - uart_remove_one_port(&bfin_serial_reg, &uart->port);
    + }

    return 0;
    }


    \
     
     \ /
      Last update: 2008-10-10 12:51    [W:0.035 / U:0.224 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site