[PATCH] USB: UEAGLE : cosmetic (2a99b507) · Commits · 戴 / test

drivers/usb/atm/ueagle-atm.c

+29 −6

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@

		#include "usbatm.h"

		#define EAGLEUSBVERSION "ueagle 1.2"
		#define EAGLEUSBVERSION "ueagle 1.3"


		/*
		@@ -314,6 +314,10 @@ struct cmv {
		((d) & 0xff) << 16 \| \
		((a) & 0xff) << 8 \| \
		((b) & 0xff))
		#define GETSA1(a) ((a >> 8) & 0xff)
		#define GETSA2(a) (a & 0xff)
		#define GETSA3(a) ((a >> 24) & 0xff)
		#define GETSA4(a) ((a >> 16) & 0xff)

		#define SA_CNTL MAKESA('C', 'N', 'T', 'L')
		#define SA_DIAG MAKESA('D', 'I', 'A', 'G')
		@@ -733,6 +737,7 @@ bad1:

		static inline void wake_up_cmv_ack(struct uea_softc *sc)
		{
		BUG_ON(sc->cmv_ack);
		sc->cmv_ack = 1;
		wake_up(&sc->cmv_ack_wait);
		}
		@@ -743,6 +748,9 @@ static inline int wait_cmv_ack(struct uea_softc *sc)
		sc->cmv_ack, ACK_TIMEOUT);
		sc->cmv_ack = 0;

		uea_dbg(INS_TO_USBDEV(sc), "wait_event_timeout : %d ms\n",
		jiffies_to_msecs(ret));

		if (ret < 0)
		return ret;

		@@ -791,6 +799,12 @@ static int uea_cmv(struct uea_softc *sc,
		struct cmv cmv;
		int ret;

		uea_enters(INS_TO_USBDEV(sc));
		uea_vdbg(INS_TO_USBDEV(sc), "Function : %d-%d, Address : %c%c%c%c, "
		"offset : 0x%04x, data : 0x%08x\n",
		FUNCTION_TYPE(function), FUNCTION_SUBTYPE(function),
		GETSA1(address), GETSA2(address), GETSA3(address),
		GETSA4(address), offset, data);
		/* we send a request, but we expect a reply */
		sc->cmv_function = function \| 0x2;
		sc->cmv_idx++;
		@@ -808,7 +822,9 @@ static int uea_cmv(struct uea_softc *sc,
		ret = uea_request(sc, UEA_SET_BLOCK, UEA_MPTX_START, CMV_SIZE, &cmv);
		if (ret < 0)
		return ret;
		return wait_cmv_ack(sc);
		ret = wait_cmv_ack(sc);
		uea_leaves(INS_TO_USBDEV(sc));
		return ret;
		}

		static inline int uea_read_cmv(struct uea_softc *sc,
		@@ -922,7 +938,7 @@ static int uea_stat(struct uea_softc *sc)
		* we check the status again in order to detect the failure earlier
		*/
		if (sc->stats.phy.flags) {
		uea_dbg(INS_TO_USBDEV(sc), "Stat flag = %d\n",
		uea_dbg(INS_TO_USBDEV(sc), "Stat flag = 0x%x\n",
		sc->stats.phy.flags);
		return 0;
		}
		@@ -1101,6 +1117,8 @@ static int uea_start_reset(struct uea_softc *sc)
		if (ret < 0)
		return ret;

		uea_vdbg(INS_TO_USBDEV(sc), "Ready CMV received\n");

		/* Enter in R-IDLE (cmv) until instructed otherwise */
		ret = uea_write_cmv(sc, SA_CNTL, 0, 1);
		if (ret < 0)
		@@ -1121,6 +1139,7 @@ static int uea_start_reset(struct uea_softc *sc)
		}
		/* Enter in R-ACT-REQ */
		ret = uea_write_cmv(sc, SA_CNTL, 0, 2);
		uea_vdbg(INS_TO_USBDEV(sc), "Entering in R-ACT-REQ state\n");
		out:
		release_firmware(cmvs_fw);
		sc->reset = 0;
		@@ -1235,6 +1254,7 @@ static void uea_dispatch_cmv(struct uea_softc sc, struct cmv cmv)

		if (cmv->bFunction == MAKEFUNCTION(ADSLDIRECTIVE, MODEMREADY)) {
		wake_up_cmv_ack(sc);
		uea_leaves(INS_TO_USBDEV(sc));
		return;
		}

		@@ -1249,6 +1269,7 @@ static void uea_dispatch_cmv(struct uea_softc sc, struct cmv cmv)
		sc->data = sc->data << 16 \| sc->data >> 16;

		wake_up_cmv_ack(sc);
		uea_leaves(INS_TO_USBDEV(sc));
		return;

		bad2:
		@@ -1256,12 +1277,14 @@ bad2:
		"Function : %d, Subfunction : %d\n",
		FUNCTION_TYPE(cmv->bFunction),
		FUNCTION_SUBTYPE(cmv->bFunction));
		uea_leaves(INS_TO_USBDEV(sc));
		return;

		bad1:
		uea_err(INS_TO_USBDEV(sc), "invalid cmv received, "
		"wPreamble %d, bDirection %d\n",
		le16_to_cpu(cmv->wPreamble), cmv->bDirection);
		uea_leaves(INS_TO_USBDEV(sc));
		}

		/*

Admin message