leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Lubomir Rintel 2018-11-15 11:10:58 -08:00 committed by Dmitry Torokhov
parent 76d97b0f9c
commit af518342ef
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/input/serio/olpc_apsp.c
View File

@ -145,8 +145,15 @@ static int olpc_apsp_open(struct serio *port)
{ {
struct olpc_apsp *priv = port->port_data; struct olpc_apsp *priv = port->port_data;
unsigned int tmp; unsigned int tmp;
unsigned long l;
if (priv->open_count++ == 0) { 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 */ /* Enable interrupt 0 by clearing its bit */
tmp = readl(priv->base + PJ_INTERRUPT_MASK); tmp = readl(priv->base + PJ_INTERRUPT_MASK);
writel(tmp & ~INT_0, 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 olpc_apsp *priv;
struct resource *res; struct resource *res;
struct device_node *np; struct device_node *np;
unsigned long l;
int error; int error;
priv = devm_kzalloc(&pdev->dev, sizeof(struct olpc_apsp), GFP_KERNEL); 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) if (priv->irq < 0)
return priv->irq; 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 */ /* KEYBOARD */
kb_serio = kzalloc(sizeof(struct serio), GFP_KERNEL); kb_serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
if (!kb_serio) if (!kb_serio)