projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
isicom.c
diff --git
a/drivers/tty/isicom.c
b/drivers/tty/isicom.c
index 858291ca889cc869ecdd1c75c7c312997c762393..59ed783c4bcda1e34a559193a857a6a41332c6ff 100644
(file)
--- a/
drivers/tty/isicom.c
+++ b/
drivers/tty/isicom.c
@@
-249,7
+249,7
@@
static int lock_card(struct isi_board *card)
spin_unlock_irqrestore(&card->card_lock, card->flags);
msleep(10);
}
spin_unlock_irqrestore(&card->card_lock, card->flags);
msleep(10);
}
- pr_warn
ing
("Failed to lock Card (0x%lx)\n", card->base);
+ pr_warn("Failed to lock Card (0x%lx)\n", card->base);
return 0; /* Failed to acquire the card! */
}
return 0; /* Failed to acquire the card! */
}
@@
-378,13
+378,13
@@
static inline int __isicom_paranoia_check(struct isi_port const *port,
char *name, const char *routine)
{
if (!port) {
char *name, const char *routine)
{
if (!port) {
- pr_warn
ing("Warning: bad isicom magic for dev %s in %s.
\n",
-
name, routine);
+ pr_warn
("Warning: bad isicom magic for dev %s in %s
\n",
+ name, routine);
return 1;
}
if (port->magic != ISICOM_MAGIC) {
return 1;
}
if (port->magic != ISICOM_MAGIC) {
- pr_warn
ing("Warning: NULL isicom port for dev %s in %s.
\n",
-
name, routine);
+ pr_warn
("Warning: NULL isicom port for dev %s in %s
\n",
+ name, routine);
return 1;
}
return 1;
}
@@
-546,8
+546,8
@@
static irqreturn_t isicom_interrupt(int irq, void *dev_id)
byte_count = header & 0xff;
if (channel + 1 > card->port_count) {
byte_count = header & 0xff;
if (channel + 1 > card->port_count) {
- pr_warn
ing("%s(0x%lx): %d(channel) > port_count.
\n",
-
__func__, base, channel+
1);
+ pr_warn
("%s(0x%lx): %d(channel) > port_count
\n",
+
__func__, base, channel +
1);
outw(0x0000, base+0x04); /* enable interrupts */
spin_unlock(&card->card_lock);
return IRQ_HANDLED;
outw(0x0000, base+0x04); /* enable interrupts */
spin_unlock(&card->card_lock);
return IRQ_HANDLED;