Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25f13048 authored by Tilman Schmidt's avatar Tilman Schmidt Committed by David S. Miller
Browse files

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: default avatarTilman Schmidt <tilman@imap.cc>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent af4218c3

drivers/isdn/gigaset/bas-gigaset.c

+1 −2
Original line number Diff line number Diff line
@@ -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:

drivers/isdn/gigaset/common.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

}

drivers/isdn/gigaset/gigaset.h

+0 −6
Original line number Diff line number Diff line
@@ -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

drivers/isdn/gigaset/interface.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/isdn/gigaset/ser-gigaset.c

+1 −2
Original line number Diff line number Diff line
@@ -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__);