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

Commit 5f9a31d6 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

n_gsm: clean up printks 



[Original From Ken Mills but I redid it using pr_ helpers instead]

Also fix up coding style, there are two warnings left but that is where
the CodingStyle tools blow up because they cannot handle

	if (blah) {
		foo
	} else switch (x) {
		case 1:
		}

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c2f2f000

drivers/tty/n_gsm.c

+81 −73
Original line number Diff line number Diff line
@@ -73,8 +73,10 @@ module_param(debug, int, 0600); 
#define T2	(2 * HZ)

#endif



/* Semi-arbitary buffer size limits. 0710 is normally run with 32-64 byte

   limits so this is plenty */

/*

 * Semi-arbitary buffer size limits. 0710 is normally run with 32-64 byte

 * limits so this is plenty

 */

#define MAX_MRU 512

#define MAX_MTU 512
@@ -433,61 +435,63 @@ static void gsm_print_packet(const char *hdr, int addr, int cr, 
	if (!(debug & 1))

		return;



	printk(KERN_INFO "%s %d) %c: ", hdr, addr, "RC"[cr]);

	pr_info("%s %d) %c: ", hdr, addr, "RC"[cr]);



	switch (control & ~PF) {

	case SABM:

		printk(KERN_CONT "SABM");

		pr_cont("SABM");

		break;

	case UA:

		printk(KERN_CONT "UA");

		pr_cont("UA");

		break;

	case DISC:

		printk(KERN_CONT "DISC");

		pr_cont("DISC");

		break;

	case DM:

		printk(KERN_CONT "DM");

		pr_cont("DM");

		break;

	case UI:

		printk(KERN_CONT "UI");

		pr_cont("UI");

		break;

	case UIH:

		printk(KERN_CONT "UIH");

		pr_cont("UIH");

		break;

	default:

		if (!(control & 0x01)) {

			printk(KERN_CONT "I N(S)%d N(R)%d",

			pr_cont("I N(S)%d N(R)%d",

				(control & 0x0E) >> 1, (control & 0xE) >> 5);

		} else switch (control & 0x0F) {

			case RR:

			printk("RR(%d)", (control & 0xE0) >> 5);

				pr_cont("RR(%d)", (control & 0xE0) >> 5);

				break;

			case RNR:

			printk("RNR(%d)", (control & 0xE0) >> 5);

				pr_cont("RNR(%d)", (control & 0xE0) >> 5);

				break;

			case REJ:

			printk("REJ(%d)", (control & 0xE0) >> 5);

				pr_cont("REJ(%d)", (control & 0xE0) >> 5);

				break;

			default:

			printk(KERN_CONT "[%02X]", control);

				pr_cont("[%02X]", control);

		}

	}



	if (control & PF)

		printk(KERN_CONT "(P)");

		pr_cont("(P)");

	else

		printk(KERN_CONT "(F)");

		pr_cont("(F)");



	if (dlen) {

		int ct = 0;

		while (dlen--) {

			if (ct % 8 == 0)

				printk(KERN_CONT "\n    ");

			printk(KERN_CONT "%02X ", *data++);

			if (ct % 8 == 0) {

				pr_cont("\n");

				pr_debug("    ");

			}

			pr_cont("%02X ", *data++);

			ct++;

		}

	}

	printk(KERN_CONT "\n");

	pr_cont("\n");

}
@@ -526,11 +530,13 @@ static void hex_packet(const unsigned char *p, int len) 
{

	int i;

	for (i = 0; i < len; i++) {

		if (i && (i % 16) == 0)

			printk("\n");

		printk("%02X ", *p++);

		if (i && (i % 16) == 0) {

			pr_cont("\n");

			pr_debug("");

		}

		pr_cont("%02X ", *p++);

	}

	printk("\n");

	pr_cont("\n");

}



/**
@@ -680,7 +686,7 @@ static void gsm_data_kick(struct gsm_mux *gsm) 
		}



		if (debug & 4) {

			printk("gsm_data_kick: \n");

			pr_debug("gsm_data_kick:\n");

			hex_packet(gsm->txframe, len);

		}
@@ -1363,7 +1369,7 @@ static void gsm_dlci_close(struct gsm_dlci *dlci) 
{

	del_timer(&dlci->t1);

	if (debug & 8)

		printk("DLCI %d goes closed.\n", dlci->addr);

		pr_debug("DLCI %d goes closed.\n", dlci->addr);

	dlci->state = DLCI_CLOSED;

	if (dlci->addr != 0) {

		struct tty_struct  *tty = tty_port_tty_get(&dlci->port);
@@ -1394,7 +1400,7 @@ static void gsm_dlci_open(struct gsm_dlci *dlci) 
	/* This will let a tty open continue */

	dlci->state = DLCI_OPEN;

	if (debug & 8)

		printk("DLCI %d goes open.\n", dlci->addr);

		pr_debug("DLCI %d goes open.\n", dlci->addr);

	wake_up(&dlci->gsm->event);

}
@@ -1496,7 +1502,7 @@ static void gsm_dlci_data(struct gsm_dlci *dlci, u8 *data, int len) 
	unsigned int modem = 0;



	if (debug & 16)

		printk("%d bytes for tty %p\n", len, tty);

		pr_debug("%d bytes for tty %p\n", len, tty);

	if (tty) {

		switch (dlci->adaption)  {

		/* Unsupported types */
@@ -1656,7 +1662,7 @@ static void gsm_queue(struct gsm_mux *gsm) 
	if (gsm->fcs != GOOD_FCS) {

		gsm->bad_fcs++;

		if (debug & 4)

			printk("BAD FCS %02x\n", gsm->fcs);

			pr_debug("BAD FCS %02x\n", gsm->fcs);

		return;

	}

	address = gsm->address >> 1;
@@ -2085,7 +2091,7 @@ static int gsmld_output(struct gsm_mux *gsm, u8 *data, int len) 
		return -ENOSPC;

	}

	if (debug & 4) {

		printk("-->%d bytes out\n", len);

		pr_debug("-->%d bytes out\n", len);

		hex_packet(data, len);

	}

	gsm->tty->ops->write(gsm->tty, data, len);
@@ -2142,7 +2148,7 @@ static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp, 
	char flags;



	if (debug & 4) {

		printk("Inbytes %dd\n", count);

		pr_debug("Inbytes %dd\n", count);

		hex_packet(cp, count);

	}
@@ -2159,7 +2165,7 @@ static void gsmld_receive_buf(struct tty_struct *tty, const unsigned char *cp, 
			gsm->error(gsm, *dp, flags);

			break;

		default:

			printk(KERN_ERR "%s: unknown flag %d\n",

			WARN_ONCE("%s: unknown flag %d\n",

			       tty_name(tty, buf), flags);

			break;

		}
@@ -2448,7 +2454,7 @@ static int gsmld_ioctl(struct tty_struct *tty, struct file *file, 
			c.i = 1;

		else

			c.i = 2;

		printk("Ftype %d i %d\n", gsm->ftype, c.i);

		pr_debug("Ftype %d i %d\n", gsm->ftype, c.i);

		c.mru = gsm->mru;

		c.mtu = gsm->mtu;

		c.k = 0;
@@ -2742,14 +2748,15 @@ static int __init gsm_init(void) 
	/* Fill in our line protocol discipline, and register it */

	int status = tty_register_ldisc(N_GSM0710, &tty_ldisc_packet);

	if (status != 0) {

		printk(KERN_ERR "n_gsm: can't register line discipline (err = %d)\n", status);

		pr_err("n_gsm: can't register line discipline (err = %d)\n",

								status);

		return status;

	}



	gsm_tty_driver = alloc_tty_driver(256);

	if (!gsm_tty_driver) {

		tty_unregister_ldisc(N_GSM0710);

		printk(KERN_ERR "gsm_init: tty allocation failed.\n");

		pr_err("gsm_init: tty allocation failed.\n");

		return -EINVAL;

	}

	gsm_tty_driver->owner	= THIS_MODULE;
@@ -2771,10 +2778,11 @@ static int __init gsm_init(void) 
	if (tty_register_driver(gsm_tty_driver)) {

		put_tty_driver(gsm_tty_driver);

		tty_unregister_ldisc(N_GSM0710);

		printk(KERN_ERR "gsm_init: tty registration failed.\n");

		pr_err("gsm_init: tty registration failed.\n");

		return -EBUSY;

	}

	printk(KERN_INFO "gsm_init: loaded as %d,%d.\n", gsm_tty_driver->major, gsm_tty_driver->minor_start);

	pr_debug("gsm_init: loaded as %d,%d.\n",

			gsm_tty_driver->major, gsm_tty_driver->minor_start);

	return 0;

}
@@ -2782,10 +2790,10 @@ static void __exit gsm_exit(void) 
{

	int status = tty_unregister_ldisc(N_GSM0710);

	if (status != 0)

		printk(KERN_ERR "n_gsm: can't unregister line discipline (err = %d)\n", status);

		pr_err("n_gsm: can't unregister line discipline (err = %d)\n",

								status);

	tty_unregister_driver(gsm_tty_driver);

	put_tty_driver(gsm_tty_driver);

	printk(KERN_INFO "gsm_init: unloaded.\n");

}



module_init(gsm_init);