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

Commit a4e6a852 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

usb: Convert pr_warning to pr_warn 



Use the more common logging mechanism.

Miscellanea:

o Realign multiline statements
o Coalesce format

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88aecde4

drivers/usb/gadget/function/rndis.c

+4 −5
Original line number Diff line number Diff line
@@ -474,8 +474,7 @@ static int gen_ndis_query_resp(struct rndis_params *params, u32 OID, u8 *buf, 
		break;



	default:

		pr_warning("%s: query unknown OID 0x%08X\n",

			 __func__, OID);

		pr_warn("%s: query unknown OID 0x%08X\n", __func__, OID);

	}

	if (retval < 0)

		length = 0;
@@ -546,7 +545,7 @@ static int gen_ndis_set_resp(struct rndis_params *params, u32 OID, 
		break;



	default:

		pr_warning("%s: set unknown OID 0x%08X, size %d\n",

		pr_warn("%s: set unknown OID 0x%08X, size %d\n",

			__func__, OID, buf_len);

	}
@@ -854,7 +853,7 @@ int rndis_msg_parser(struct rndis_params *params, u8 *buf) 
		 * In one case those messages seemed to relate to the host

		 * suspending itself.

		 */

		pr_warning("%s: unknown RNDIS message 0x%08X len %d\n",

		pr_warn("%s: unknown RNDIS message 0x%08X len %d\n",

			__func__, MsgType, MsgLength);

		print_hex_dump_bytes(__func__, DUMP_PREFIX_OFFSET,

				     buf, MsgLength);

drivers/usb/gadget/function/u_serial.c

+2 −2
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static void gs_write_complete(struct usb_ep *ep, struct usb_request *req) 
	switch (req->status) {

	default:

		/* presumably a transient fault */

		pr_warning("%s: unexpected %s status %d\n",

		pr_warn("%s: unexpected %s status %d\n",

			__func__, ep->name, req->status);

		/* FALL THROUGH */

	case 0:

drivers/usb/gadget/udc/at91_udc.h

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ struct at91_request { 
#endif



#define ERR(stuff...)		pr_err("udc: " stuff)

#define WARNING(stuff...)	pr_warning("udc: " stuff)

#define WARNING(stuff...)	pr_warn("udc: " stuff)

#define INFO(stuff...)		pr_info("udc: " stuff)

#define DBG(stuff...)		pr_debug("udc: " stuff)

drivers/usb/gadget/udc/atmel_usba_udc.c

+2 −2
Original line number Diff line number Diff line
@@ -1464,8 +1464,8 @@ static void usba_control_irq(struct usba_udc *udc, struct usba_ep *ep) 
		pkt_len = USBA_BFEXT(BYTE_COUNT, usba_ep_readl(ep, STA));

		DBG(DBG_HW, "Packet length: %u\n", pkt_len);

		if (pkt_len != sizeof(crq)) {

			pr_warning("udc: Invalid packet length %u "

				"(expected %zu)\n", pkt_len, sizeof(crq));

			pr_warn("udc: Invalid packet length %u (expected %zu)\n",

				pkt_len, sizeof(crq));

			set_protocol_stall(udc, ep);

			return;

		}

drivers/usb/gadget/udc/fsl_usb2_udc.h

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length) 
#endif



#define ERR(stuff...)		pr_err("udc: " stuff)

#define WARNING(stuff...)		pr_warning("udc: " stuff)

#define WARNING(stuff...)	pr_warn("udc: " stuff)

#define INFO(stuff...)		pr_info("udc: " stuff)



/*-------------------------------------------------------------------------*/