projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kthread: kthread worker API cleanup
[deliverable/linux.git]
/
drivers
/
tty
/
serial
/
sc16is7xx.c
diff --git
a/drivers/tty/serial/sc16is7xx.c
b/drivers/tty/serial/sc16is7xx.c
index a9d94f7cf683d54ecdb6b5e7b4e7c1a8cfa3f241..2675792a8f5963a37b82d708b0ce87f8f070d5dd 100644
(file)
--- a/
drivers/tty/serial/sc16is7xx.c
+++ b/
drivers/tty/serial/sc16is7xx.c
@@
-708,7
+708,7
@@
static irqreturn_t sc16is7xx_irq(int irq, void *dev_id)
{
struct sc16is7xx_port *s = (struct sc16is7xx_port *)dev_id;
{
struct sc16is7xx_port *s = (struct sc16is7xx_port *)dev_id;
-
queue_kthread
_work(&s->kworker, &s->irq_work);
+
kthread_queue
_work(&s->kworker, &s->irq_work);
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
@@
-784,7
+784,7
@@
static void sc16is7xx_ier_clear(struct uart_port *port, u8 bit)
one->config.flags |= SC16IS7XX_RECONF_IER;
one->config.ier_clear |= bit;
one->config.flags |= SC16IS7XX_RECONF_IER;
one->config.ier_clear |= bit;
-
queue_kthread
_work(&s->kworker, &one->reg_work);
+
kthread_queue
_work(&s->kworker, &one->reg_work);
}
static void sc16is7xx_stop_tx(struct uart_port *port)
}
static void sc16is7xx_stop_tx(struct uart_port *port)
@@
-802,7
+802,7
@@
static void sc16is7xx_start_tx(struct uart_port *port)
struct sc16is7xx_port *s = dev_get_drvdata(port->dev);
struct sc16is7xx_one *one = to_sc16is7xx_one(port, port);
struct sc16is7xx_port *s = dev_get_drvdata(port->dev);
struct sc16is7xx_one *one = to_sc16is7xx_one(port, port);
-
queue_kthread
_work(&s->kworker, &one->tx_work);
+
kthread_queue
_work(&s->kworker, &one->tx_work);
}
static unsigned int sc16is7xx_tx_empty(struct uart_port *port)
}
static unsigned int sc16is7xx_tx_empty(struct uart_port *port)
@@
-828,7
+828,7
@@
static void sc16is7xx_set_mctrl(struct uart_port *port, unsigned int mctrl)
struct sc16is7xx_one *one = to_sc16is7xx_one(port, port);
one->config.flags |= SC16IS7XX_RECONF_MD;
struct sc16is7xx_one *one = to_sc16is7xx_one(port, port);
one->config.flags |= SC16IS7XX_RECONF_MD;
-
queue_kthread
_work(&s->kworker, &one->reg_work);
+
kthread_queue
_work(&s->kworker, &one->reg_work);
}
static void sc16is7xx_break_ctl(struct uart_port *port, int break_state)
}
static void sc16is7xx_break_ctl(struct uart_port *port, int break_state)
@@
-957,7
+957,7
@@
static int sc16is7xx_config_rs485(struct uart_port *port,
port->rs485 = *rs485;
one->config.flags |= SC16IS7XX_RECONF_RS485;
port->rs485 = *rs485;
one->config.flags |= SC16IS7XX_RECONF_RS485;
-
queue_kthread
_work(&s->kworker, &one->reg_work);
+
kthread_queue
_work(&s->kworker, &one->reg_work);
return 0;
}
return 0;
}
@@
-1030,7
+1030,7
@@
static void sc16is7xx_shutdown(struct uart_port *port)
sc16is7xx_power(port, 0);
sc16is7xx_power(port, 0);
-
flush_kthread
_worker(&s->kworker);
+
kthread_flush
_worker(&s->kworker);
}
static const char *sc16is7xx_type(struct uart_port *port)
}
static const char *sc16is7xx_type(struct uart_port *port)
@@
-1176,8
+1176,8
@@
static int sc16is7xx_probe(struct device *dev,
s->devtype = devtype;
dev_set_drvdata(dev, s);
s->devtype = devtype;
dev_set_drvdata(dev, s);
-
init_kthread
_worker(&s->kworker);
-
init_kthread
_work(&s->irq_work, sc16is7xx_ist);
+
kthread_init
_worker(&s->kworker);
+
kthread_init
_work(&s->irq_work, sc16is7xx_ist);
s->kworker_task = kthread_run(kthread_worker_fn, &s->kworker,
"sc16is7xx");
if (IS_ERR(s->kworker_task)) {
s->kworker_task = kthread_run(kthread_worker_fn, &s->kworker,
"sc16is7xx");
if (IS_ERR(s->kworker_task)) {
@@
-1234,8
+1234,8
@@
static int sc16is7xx_probe(struct device *dev,
SC16IS7XX_EFCR_RXDISABLE_BIT |
SC16IS7XX_EFCR_TXDISABLE_BIT);
/* Initialize kthread work structs */
SC16IS7XX_EFCR_RXDISABLE_BIT |
SC16IS7XX_EFCR_TXDISABLE_BIT);
/* Initialize kthread work structs */
-
init_kthread
_work(&s->p[i].tx_work, sc16is7xx_tx_proc);
-
init_kthread
_work(&s->p[i].reg_work, sc16is7xx_reg_proc);
+
kthread_init
_work(&s->p[i].tx_work, sc16is7xx_tx_proc);
+
kthread_init
_work(&s->p[i].reg_work, sc16is7xx_reg_proc);
/* Register port */
uart_add_one_port(&sc16is7xx_uart, &s->p[i].port);
/* Register port */
uart_add_one_port(&sc16is7xx_uart, &s->p[i].port);
@@
-1301,7
+1301,7
@@
static int sc16is7xx_remove(struct device *dev)
sc16is7xx_power(&s->p[i].port, 0);
}
sc16is7xx_power(&s->p[i].port, 0);
}
-
flush_kthread
_worker(&s->kworker);
+
kthread_flush
_worker(&s->kworker);
kthread_stop(s->kworker_task);
if (!IS_ERR(s->clk))
kthread_stop(s->kworker_task);
if (!IS_ERR(s->clk))
This page took
0.027374 seconds
and
5
git commands to generate.