aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorTilman Schmidt <tilman@imap.cc>2008-11-30 00:38:28 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-30 00:38:28 -0500
commit25f13048bce61f33f6a102e0bf377fd3922ed364 (patch)
tree1d73eb3432e324b3db90043ad80c51269b47fba9 /drivers/isdn
parentaf4218c3a699542adc9b76c8972828a726e7b0dc (diff)
gigaset: get rid of info() and warn() macros
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>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/gigaset/bas-gigaset.c3
-rw-r--r--drivers/isdn/gigaset/common.c5
-rw-r--r--drivers/isdn/gigaset/gigaset.h6
-rw-r--r--drivers/isdn/gigaset/interface.c4
-rw-r--r--drivers/isdn/gigaset/ser-gigaset.c3
-rw-r--r--drivers/isdn/gigaset/usb-gigaset.c3
6 files changed, 7 insertions, 17 deletions
diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
index 3f11910c7ccd..3eca9c8067f6 100644
--- a/drivers/isdn/gigaset/bas-gigaset.c
+++ b/drivers/isdn/gigaset/bas-gigaset.c
@@ -2507,8 +2507,7 @@ static int __init bas_gigaset_init(void)
2507 goto error; 2507 goto error;
2508 } 2508 }
2509 2509
2510 info(DRIVER_AUTHOR); 2510 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
2511 info(DRIVER_DESC);
2512 return 0; 2511 return 0;
2513 2512
2514error: 2513error:
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 9d3ce7718e58..1664e31a78c3 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -580,7 +580,7 @@ static struct bc_state *gigaset_initbcs(struct bc_state *bcs,
580 } else if ((bcs->skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL) 580 } else if ((bcs->skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)
581 skb_reserve(bcs->skb, HW_HDR_LEN); 581 skb_reserve(bcs->skb, HW_HDR_LEN);
582 else { 582 else {
583 warn("could not allocate skb"); 583 err("could not allocate skb");
584 bcs->inputstate |= INS_skip_frame; 584 bcs->inputstate |= INS_skip_frame;
585 } 585 }
586 586
@@ -1120,8 +1120,7 @@ static int __init gigaset_init_module(void)
1120 if (gigaset_debuglevel == 1) 1120 if (gigaset_debuglevel == 1)
1121 gigaset_debuglevel = DEBUG_DEFAULT; 1121 gigaset_debuglevel = DEBUG_DEFAULT;
1122 1122
1123 info(DRIVER_AUTHOR); 1123 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
1124 info(DRIVER_DESC);
1125 return 0; 1124 return 0;
1126} 1125}
1127 1126
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 003752954993..901ff437e700 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -104,15 +104,9 @@ enum debuglevel {
104 * removed rather than fixed anyway. 104 * removed rather than fixed anyway.
105 */ 105 */
106#undef err 106#undef err
107#undef info
108#undef warn
109 107
110#define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \ 108#define err(format, arg...) printk(KERN_ERR KBUILD_MODNAME ": " \
111 format "\n" , ## arg) 109 format "\n" , ## arg)
112#define info(format, arg...) printk(KERN_INFO KBUILD_MODNAME ": " \
113 format "\n" , ## arg)
114#define warn(format, arg...) printk(KERN_WARNING KBUILD_MODNAME ": " \
115 format "\n" , ## arg)
116 110
117#ifdef CONFIG_GIGASET_DEBUG 111#ifdef CONFIG_GIGASET_DEBUG
118 112
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index 521951a898ec..956381cd2774 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -701,7 +701,7 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
701 701
702 ret = tty_register_driver(tty); 702 ret = tty_register_driver(tty);
703 if (ret < 0) { 703 if (ret < 0) {
704 warn("failed to register tty driver (error %d)", ret); 704 err("failed to register tty driver (error %d)", ret);
705 goto error; 705 goto error;
706 } 706 }
707 gig_dbg(DEBUG_IF, "tty driver initialized"); 707 gig_dbg(DEBUG_IF, "tty driver initialized");
@@ -709,7 +709,7 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
709 return; 709 return;
710 710
711enomem: 711enomem:
712 warn("could not allocate tty structures"); 712 err("could not allocate tty structures");
713error: 713error:
714 if (drv->tty) 714 if (drv->tty)
715 put_tty_driver(drv->tty); 715 put_tty_driver(drv->tty);
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index 0b8c8f2b433f..b306a2ff7312 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -513,8 +513,7 @@ gigaset_tty_open(struct tty_struct *tty)
513 513
514 gig_dbg(DEBUG_INIT, "Starting HLL for Gigaset M101"); 514 gig_dbg(DEBUG_INIT, "Starting HLL for Gigaset M101");
515 515
516 info(DRIVER_AUTHOR); 516 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
517 info(DRIVER_DESC);
518 517
519 if (!driver) { 518 if (!driver) {
520 err("%s: no driver structure", __func__); 519 err("%s: no driver structure", __func__);
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index 4661830a49db..e847c6e6d3fd 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -941,8 +941,7 @@ static int __init usb_gigaset_init(void)
941 goto error; 941 goto error;
942 } 942 }
943 943
944 info(DRIVER_AUTHOR); 944 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
945 info(DRIVER_DESC);
946 return 0; 945 return 0;
947 946
948error: 947error: