Input: olpc_apsp - check FIFO status on open(), not probe()

Let's defer the FIFO status checking until open().

When we'll get a clk handle, this will allow us to defer clock enablement
until the device is actually used.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/serio/olpc_apsp.c b/drivers/input/serio/olpc_apsp.c
index 8e9a420..8b19a47 100644 (file)
--- a/drivers/input/serio/olpc_apsp.c
+++ b/drivers/input/serio/olpc_apsp.c
@@ -145,8 +145,15 @@ static int olpc_apsp_open(struct serio *port)
 {
        struct olpc_apsp *priv = port->port_data;
        unsigned int tmp;
+       unsigned long l;
 
        if (priv->open_count++ == 0) {
+               l = readl(priv->base + COMMAND_FIFO_STATUS);
+               if (!(l & CMD_STS_MASK)) {
+                       dev_err(priv->dev, "SP cannot accept commands.\n");
+                       return -EIO;
+               }
+
                /* Enable interrupt 0 by clearing its bit */
                tmp = readl(priv->base + PJ_INTERRUPT_MASK);
                writel(tmp & ~INT_0, priv->base + PJ_INTERRUPT_MASK);
@@ -173,7 +180,6 @@ static int olpc_apsp_probe(struct platform_device *pdev)
        struct olpc_apsp *priv;
        struct resource *res;
        struct device_node *np;
-       unsigned long l;
        int error;
 
        priv = devm_kzalloc(&pdev->dev, sizeof(struct olpc_apsp), GFP_KERNEL);
@@ -192,12 +198,6 @@ static int olpc_apsp_probe(struct platform_device *pdev)
        if (priv->irq < 0)
                return priv->irq;
 
-       l = readl(priv->base + COMMAND_FIFO_STATUS);
-       if (!(l & CMD_STS_MASK)) {
-               dev_err(&pdev->dev, "SP cannot accept commands.\n");
-               return -EIO;
-       }
-
        /* KEYBOARD */
        kb_serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
        if (!kb_serio)