Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 00:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

gigaset: get rid of info() and warn() macros

Browse Source 
Join the move away from the obsolete info() macro, opencoding the
remaining uses. While we're at it, also get rid of the warn() macro
by promoting the three remaining uses to err().

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tilman Schmidt 2008-11-29 21:38:28 -08:00 committed by David S. Miller
parent af4218c3a6
commit 25f13048bc
6 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/isdn/gigaset/bas-gigaset.c
View File

@ -2507,8 +2507,7 @@ static int __init bas_gigaset_init(void)
goto error;
}
info(DRIVER_AUTHOR);
info(DRIVER_DESC);
printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
return 0;
error:

5
drivers/isdn/gigaset/common.c
View File

@ -580,7 +580,7 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
} else if ((bcs->skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)
skb_reserve(bcs->skb, HW_HDR_LEN);
else {
warn("could not allocate skb");
err("could not allocate skb");
bcs->inputstate |= INS_skip_frame;
}
@ -1120,8 +1120,7 @@ static int __init gigaset_init_module(void)
if (gigaset_debuglevel == 1)
gigaset_debuglevel = DEBUG_DEFAULT;
info(DRIVER_AUTHOR);
info(DRIVER_DESC);
printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
return 0;
}

6
drivers/isdn/gigaset/gigaset.h
View File

@ -104,15 +104,9 @@ enum debuglevel {
* removed rather than fixed anyway.
*/
#undef err
#undef info
#undef warn
#define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \
format "\n" , ## arg)
#define info(format, arg...) printk(KERN_INFO KBUILD_MODNAME ": " \
format "\n" , ## arg)
#define warn(format, arg...) printk(KERN_WARNING KBUILD_MODNAME ": " \
format "\n" , ## arg)
#ifdef CONFIG_GIGASET_DEBUG

4
drivers/isdn/gigaset/interface.c
View File

@ -701,7 +701,7 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
ret = tty_register_driver(tty);
if (ret < 0) {
warn("failed to register tty driver (error %d)", ret);
err("failed to register tty driver (error %d)", ret);
goto error;
}
gig_dbg(DEBUG_IF, "tty driver initialized");
@ -709,7 +709,7 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
return;
enomem:
warn("could not allocate tty structures");
err("could not allocate tty structures");
error:
if (drv->tty)
put_tty_driver(drv->tty);

3
drivers/isdn/gigaset/ser-gigaset.c
View File

@ -513,8 +513,7 @@ gigaset_tty_open(struct tty_struct *tty)
gig_dbg(DEBUG_INIT, "Starting HLL for Gigaset M101");
info(DRIVER_AUTHOR);
info(DRIVER_DESC);
printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
if (!driver) {
err("%s: no driver structure", __func__);

3
drivers/isdn/gigaset/usb-gigaset.c
View File

@ -941,8 +941,7 @@ static int __init usb_gigaset_init(void)
goto error;
}
info(DRIVER_AUTHOR);
info(DRIVER_DESC);
printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
return 0;
error: