tty: pr_warning->pr_warn and logging neatening
Convert the pr_warning to the more common pr_warn. Other miscellanea: o Convert unusual PR_FMT define and uses to pr_fmt o Remove unnecessary OOM message o Fix grammar in an error message o Convert a pr_warning with a KERN_ERR to pr_err Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Цей коміт міститься в:

зафіксовано
Greg Kroah-Hartman

джерело
483e91a503
коміт
e620e54884
@@ -249,7 +249,7 @@ static int lock_card(struct isi_board *card)
|
||||
spin_unlock_irqrestore(&card->card_lock, card->flags);
|
||||
msleep(10);
|
||||
}
|
||||
pr_warning("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! */
|
||||
}
|
||||
@@ -378,13 +378,13 @@ static inline int __isicom_paranoia_check(struct isi_port const *port,
|
||||
char *name, const char *routine)
|
||||
{
|
||||
if (!port) {
|
||||
pr_warning("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) {
|
||||
pr_warning("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;
|
||||
}
|
||||
|
||||
@@ -546,8 +546,8 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
|
||||
byte_count = header & 0xff;
|
||||
|
||||
if (channel + 1 > card->port_count) {
|
||||
pr_warning("%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;
|
||||
|
Посилання в новій задачі
Заблокувати користувача