summaryrefslogtreecommitdiffstats
path: root/drivers/staging/fwserial
diff options
context:
space:
mode:
authorRadek Dostal <rd@radekdostal.com>2014-06-14 16:13:08 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-18 15:25:56 -0700
commite22a955ca736d811e4014992cb88b59079f4d7c3 (patch)
tree6056b5f00310a6db11e5aac872664a858b6d8c83 /drivers/staging/fwserial
parentd734c05f081852a4e1a733440b9dceed64a9488e (diff)
downloadlinux-e22a955ca736d811e4014992cb88b59079f4d7c3.tar.gz
linux-e22a955ca736d811e4014992cb88b59079f4d7c3.tar.xz
staging/fwserial: (coding style) add blank line after every declaration
Style-only modifications to make checkpatch.pl -f a bit happier. Fixes warning: "Missing a blank line after declarations" Signed-off-by: Radek Dostal <rd@radekdostal.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/fwserial')
-rw-r--r--drivers/staging/fwserial/fwserial.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c
index 384758b11e3c..61eb304860e1 100644
--- a/drivers/staging/fwserial/fwserial.c
+++ b/drivers/staging/fwserial/fwserial.c
@@ -785,6 +785,7 @@ static int fwtty_tx(struct fwtty_port *port, bool drain)
len = dma_fifo_out_level(&port->tx_fifo);
if (len) {
unsigned long delay = (n == -ENOMEM) ? HZ : 1;
+
schedule_delayed_work(&port->drain, delay);
}
len = dma_fifo_level(&port->tx_fifo);
@@ -1995,6 +1996,7 @@ static struct fwtty_peer *__fwserial_peer_by_node_id(struct fw_card *card,
list_for_each_entry_rcu(peer, &serial->peer_list, list) {
int g = peer->generation;
+
smp_rmb();
if (generation == g && id == peer->node_id)
return peer;
@@ -2015,6 +2017,7 @@ static void __dump_peer_list(struct fw_card *card)
list_for_each_entry_rcu(peer, &serial->peer_list, list) {
int g = peer->generation;
+
smp_rmb();
fwtty_dbg(card, "peer(%d:%x) guid: %016llx\n",
g, peer->node_id, (unsigned long long) peer->guid);
@@ -2120,6 +2123,7 @@ static int fwserial_add_peer(struct fw_serial *serial, struct fw_unit *unit)
serial->self = peer;
if (create_loop_dev) {
struct fwtty_port *port;
+
port = fwserial_claim_port(peer, num_ttys);
if (!IS_ERR(port)) {
struct virt_plug_params params;