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

Commit 784d5858 authored by Tilman Schmidt's avatar Tilman Schmidt Committed by Linus Torvalds
Browse files

[PATCH] isdn4linux: Siemens Gigaset drivers: logging usage 



With Hansjoerg Lipp <hjlipp@web.de>

Improve error reporting of the Gigaset drivers, by using the
dev_err/dev_warn/dev_info macros from device.h instead of err/warn/info from
usb.h whereever possible.

Also rename the private dbg macro to gig_dbg in order to avoid confusion with
the macro of the same name in usb.h.

Signed-off-by: default avatarHansjoerg Lipp <hjlipp@web.de>
Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ec81b5e6

drivers/isdn/gigaset/asyncdata.c

+43 −37
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static inline int cmd_loop(unsigned char c, unsigned char *src, int numbytes, 
	for (;;) {

		cs->respdata[cbytes] = c;

		if (c == 10 || c == 13) {

			dbg(DEBUG_TRANSCMD, "%s: End of Command (%d Bytes)",

			gig_dbg(DEBUG_TRANSCMD, "%s: End of Command (%d Bytes)",

				__func__, cbytes);

			cs->cbytes = cbytes;

			gigaset_handle_modem_response(cs); /* can change
@@ -68,7 +68,7 @@ static inline int cmd_loop(unsigned char c, unsigned char *src, int numbytes, 
			if (cbytes < MAX_RESP_SIZE - 1)

				cbytes++;

			else

				warn("response too large");

				dev_warn(cs->dev, "response too large\n");

		}



		if (!numbytes)
@@ -154,39 +154,37 @@ byte_stuff: 
			c ^= PPP_TRANS;

#ifdef CONFIG_GIGASET_DEBUG

			if (unlikely(!muststuff(c)))

				dbg(DEBUG_HDLC,

				    "byte stuffed: 0x%02x", c);

				gig_dbg(DEBUG_HDLC, "byte stuffed: 0x%02x", c);

#endif

		} else if (unlikely(c == PPP_FLAG)) {

			if (unlikely(inputstate & INS_skip_frame)) {

				if (!(inputstate & INS_have_data)) { /* 7E 7E */

					//dbg(DEBUG_HDLC, "(7e)7e------------------------");

#ifdef CONFIG_GIGASET_DEBUG

					++bcs->emptycount;

#endif

				} else

					dbg(DEBUG_HDLC,

					gig_dbg(DEBUG_HDLC,

					    "7e----------------------------");



				/* end of frame */

				error = 1;

				gigaset_rcv_error(NULL, cs, bcs);

			} else if (!(inputstate & INS_have_data)) { /* 7E 7E */

				//dbg(DEBUG_HDLC, "(7e)7e------------------------");

#ifdef CONFIG_GIGASET_DEBUG

				++bcs->emptycount;

#endif

				break;

			} else {

				dbg(DEBUG_HDLC,

				gig_dbg(DEBUG_HDLC,

					"7e----------------------------");



				/* end of frame */

				error = 0;



				if (unlikely(fcs != PPP_GOODFCS)) {

					err("Packet checksum at %lu failed, "

					    "packet is corrupted (%u bytes)!",

					dev_err(cs->dev,

					    "Packet checksum at %lu failed, "

					    "packet is corrupted (%u bytes)!\n",

					    bcs->rcvbytes, skb->len);

					compskb = NULL;

					gigaset_rcv_error(compskb, cs, bcs);
@@ -200,9 +198,11 @@ byte_stuff: 
						skb = NULL;

						inputstate |= INS_skip_frame;

						if (l == 1) {

							err("invalid packet size (1)!");

							dev_err(cs->dev,

						  "invalid packet size (1)!\n");

							error = 1;

							gigaset_rcv_error(NULL, cs, bcs);

							gigaset_rcv_error(NULL,

								cs, bcs);

						}

					}

					if (likely(!(error ||
@@ -225,7 +225,8 @@ byte_stuff: 
			} else if (likely((skb = dev_alloc_skb(SBUFSIZE + HW_HDR_LEN)) != NULL)) {

				skb_reserve(skb, HW_HDR_LEN);

			} else {

				warn("could not allocate new skb");

				dev_warn(cs->dev,

					 "could not allocate new skb\n");

				inputstate |= INS_skip_frame;

			}
@@ -233,7 +234,7 @@ byte_stuff: 
#ifdef CONFIG_GIGASET_DEBUG

		} else if (unlikely(muststuff(c))) {

			/* Should not happen. Possible after ZDLE=1<CR><LF>. */

			dbg(DEBUG_HDLC, "not byte stuffed: 0x%02x", c);

			gig_dbg(DEBUG_HDLC, "not byte stuffed: 0x%02x", c);

#endif

		}
@@ -241,8 +242,8 @@ byte_stuff: 


#ifdef CONFIG_GIGASET_DEBUG

		if (unlikely(!(inputstate & INS_have_data))) {

			dbg(DEBUG_HDLC,

			    "7e (%d x) ================", bcs->emptycount);

			gig_dbg(DEBUG_HDLC, "7e (%d x) ================",

				bcs->emptycount);

			bcs->emptycount = 0;

		}

#endif
@@ -251,7 +252,7 @@ byte_stuff: 


		if (likely(!(inputstate & INS_skip_frame))) {

			if (unlikely(skb->len == SBUFSIZE)) {

				warn("received packet too long");

				dev_warn(cs->dev, "received packet too long\n");

				dev_kfree_skb_any(skb);

				skb = NULL;

				inputstate |= INS_skip_frame;
@@ -307,7 +308,7 @@ static inline int iraw_loop(unsigned char c, unsigned char *src, int numbytes, 
		if (likely(!(inputstate & INS_skip_frame))) {

			if (unlikely(skb->len == SBUFSIZE)) {

				//FIXME just pass skb up and allocate a new one

				warn("received packet too long");

				dev_warn(cs->dev, "received packet too long\n");

				dev_kfree_skb_any(skb);

				skb = NULL;

				inputstate |= INS_skip_frame;
@@ -341,7 +342,7 @@ static inline int iraw_loop(unsigned char c, unsigned char *src, int numbytes, 
				  != NULL)) {

			skb_reserve(skb, HW_HDR_LEN);

		} else {

			warn("could not allocate new skb");

			dev_warn(cs->dev, "could not allocate new skb\n");

			inputstate |= INS_skip_frame;

		}

	}
@@ -362,13 +363,13 @@ void gigaset_m10x_input(struct inbuf_t *inbuf) 


	head = atomic_read(&inbuf->head);

	tail = atomic_read(&inbuf->tail);

	dbg(DEBUG_INTR, "buffer state: %u -> %u", head, tail);

	gig_dbg(DEBUG_INTR, "buffer state: %u -> %u", head, tail);



	if (head != tail) {

		cs = inbuf->cs;

		src = inbuf->data + head;

		numbytes = (head > tail ? RBUFSIZE : tail) - head;

		dbg(DEBUG_INTR, "processing %u bytes", numbytes);

		gig_dbg(DEBUG_INTR, "processing %u bytes", numbytes);



		while (numbytes) {

			if (atomic_read(&cs->mstate) == MS_LOCKED) {
@@ -400,13 +401,14 @@ void gigaset_m10x_input(struct inbuf_t *inbuf) 


					src += procbytes;

					numbytes -= procbytes;

				} else {  /* DLE-char */

				} else {  /* DLE char */

					inbuf->inputstate &= ~INS_DLE_char;

					switch (c) {

					case 'X': /*begin of command*/

#ifdef CONFIG_GIGASET_DEBUG

						if (inbuf->inputstate & INS_command)

							err("received <DLE> 'X' in command mode");

							dev_err(cs->dev,

					"received <DLE> 'X' in command mode\n");

#endif

						inbuf->inputstate |=

							INS_command | INS_DLE_command;
@@ -414,7 +416,8 @@ void gigaset_m10x_input(struct inbuf_t *inbuf) 
					case '.': /*end of command*/

#ifdef CONFIG_GIGASET_DEBUG

						if (!(inbuf->inputstate & INS_command))

							err("received <DLE> '.' in hdlc mode");

							dev_err(cs->dev,

					"received <DLE> '.' in hdlc mode\n");

#endif

						inbuf->inputstate &= cs->dle ?

							~(INS_DLE_command|INS_command)
@@ -422,7 +425,9 @@ void gigaset_m10x_input(struct inbuf_t *inbuf) 
						break;

					//case DLE_FLAG: /*DLE_FLAG in data stream*/ /* schon oben behandelt! */

					default:

						err("received 0x10 0x%02x!", (int) c);

						dev_err(cs->dev,

						      "received 0x10 0x%02x!\n",

							(int) c);

						/* FIXME: reset driver?? */

					}

				}
@@ -441,7 +446,7 @@ nextbyte: 
			}

		}



		dbg(DEBUG_INTR, "setting head to %u", head);

		gig_dbg(DEBUG_INTR, "setting head to %u", head);

		atomic_set(&inbuf->head, head);

	}

}
@@ -483,7 +488,6 @@ static struct sk_buff *HDLC_Encode(struct sk_buff *skb, int head, int tail) 
	 */

	hdlc_skb = dev_alloc_skb(skb->len + stuf_cnt + 6 + tail + head);

	if (!hdlc_skb) {

		err("unable to allocate memory for HDLC encoding!");

		dev_kfree_skb(skb);

		return NULL;

	}
@@ -543,7 +547,6 @@ static struct sk_buff *iraw_encode(struct sk_buff *skb, int head, int tail) 
	/* worst case: every byte must be stuffed */

	iraw_skb = dev_alloc_skb(2*skb->len + tail + head);

	if (!iraw_skb) {

		err("unable to allocate memory for HDLC encoding!");

		dev_kfree_skb(skb);

		return NULL;

	}
@@ -584,8 +587,11 @@ int gigaset_m10x_send_skb(struct bc_state *bcs, struct sk_buff *skb) 
		skb = HDLC_Encode(skb, HW_HDR_LEN, 0);

	else

		skb = iraw_encode(skb, HW_HDR_LEN, 0);

	if (!skb)

	if (!skb) {

		dev_err(bcs->cs->dev,

			"unable to allocate memory for encoding!\n");

		return -ENOMEM;

	}



	skb_queue_tail(&bcs->squeue, skb);

	tasklet_schedule(&bcs->cs->write_tasklet);