5708 rid usbser/Makefile of CERRWARN

Reviewed by: Josef 'Jeff' Sipek<jeffpc@josefsipek.net>
Reviewed by: Dan McDonald<danmcd@omniti.com>
Approved by: Gordon Ross <gwr@nexenta.com>

4 files changed, 21 insertions, 23 deletions

diff --git a/usr/src/uts/common/io/usb/clients/usbser/usbser.c b/usr/src/uts/common/io/usb/clients/usbser/usbser.c
index 005b1b3ddd..5262ff39a2 100644
--- a/usr/src/uts/common/io/usb/clients/usbser/usbser.c
+++ b/usr/src/uts/common/io/usb/clients/usbser/usbser.c
@@ -133,9 +133,10 @@ static void	usbser_inbound_flow_ctl(usbser_port_t *);
 static int	usbser_dev_is_online(usbser_state_t *);
 static void	usbser_serialize_port_act(usbser_port_t *, int);
 static void	usbser_release_port_act(usbser_port_t *, int);
+#ifdef DEBUG
 static char	*usbser_msgtype2str(int);
 static char	*usbser_ioctl2str(int);
-
+#endif
 
 /* USBA events */
 usb_event_t usbser_usb_events = {
@@ -233,7 +234,8 @@ _init(void)
 	int err;
 
 	mutex_init(&usbser_lock, NULL, MUTEX_DRIVER, (void *)NULL);
-	if (err = mod_install(&modlinkage))
+
+	if ((err = mod_install(&modlinkage)) != 0)
 		mutex_destroy(&usbser_lock);
 
 	return (err);
@@ -245,8 +247,7 @@ _fini(void)
 {
 	int err;
 
-	if (err = mod_remove(&modlinkage))
-
+	if ((err = mod_remove(&modlinkage)) != 0)
 		return (err);
 
 	mutex_destroy(&usbser_lock);
@@ -1759,7 +1760,7 @@ usbser_close_drain(usbser_port_t *pp)
 {
 	int	need_drain;
 	clock_t	until;
-	int	rval;
+	int	rval = USB_SUCCESS;
 
 	/*
 	 * port_wq_data_cnt indicates amount of data on the write queue,
@@ -1780,7 +1781,7 @@ usbser_close_drain(usbser_port_t *pp)
 
 	/* don't drain if timed out or received a signal */
 	need_drain = (pp->port_wq_data_cnt == 0) || !USBSER_PORT_IS_BUSY(pp) ||
-	    (rval != 0);
+	    (rval != USB_SUCCESS);
 
 	mutex_exit(&pp->port_mutex);
 	/*
@@ -1864,6 +1865,7 @@ usbser_thr_dispatch(usbser_thread_t *thr)
 {
 	usbser_port_t	*pp = thr->thr_port;
 	usbser_state_t	*usp = pp->port_usp;
+	/*LINTED E_FUNC_SET_NOT_USED*/
 	int		rval;
 
 	ASSERT(mutex_owned(&pp->port_mutex));
@@ -1904,9 +1906,7 @@ usbser_thr_cancel(usbser_thread_t *thr)
 static void
 usbser_thr_wake(usbser_thread_t *thr)
 {
-	usbser_port_t	*pp = thr->thr_port;
-
-	ASSERT(mutex_owned(&pp->port_mutex));
+	ASSERT(mutex_owned(&thr->thr_port->port_mutex));
 
 	thr->thr_flags |= USBSER_THR_WAKE;
 	cv_signal(&thr->thr_cv);
@@ -2587,7 +2587,7 @@ usbser_ioctl(usbser_port_t *pp, mblk_t *mp)
 	struct iocblk	*iocp;
 	int		cmd;
 	mblk_t		*datamp;
-	int		error = 0, rval;
+	int		error = 0, rval = USB_SUCCESS;
 	int		val;
 
 	ASSERT(mutex_owned(&pp->port_mutex));
@@ -2864,7 +2864,7 @@ usbser_iocdata(usbser_port_t *pp, mblk_t *mp)
 	struct copyresp	*csp;
 	int		cmd;
 	int		val;
-	int		rval;
+	int		rval = USB_FAILURE;
 
 	ASSERT(mutex_owned(&pp->port_mutex));
 
@@ -3297,7 +3297,7 @@ usbser_release_port_act(usbser_port_t *pp, int act)
 	cv_broadcast(&pp->port_act_cv);
 }
 
-
+#ifdef DEBUG
 /*
  * message type to string and back conversion.
  *
@@ -3329,7 +3329,6 @@ usbser_msgtype2str(int type)
 	return (str);
 }
 
-
 static char *
 usbser_ioctl2str(int ioctl)
 {
@@ -3364,7 +3363,7 @@ usbser_ioctl2str(int ioctl)
 
 	return (str);
 }
-
+#endif
 /*
  * Polled IO support
  */
diff --git a/usr/src/uts/common/io/usb/clients/usbser/usbser_rseq.c b/usr/src/uts/common/io/usb/clients/usbser/usbser_rseq.c
index 78ccd213cd..69256e96c8 100644
--- a/usr/src/uts/common/io/usb/clients/usbser/usbser_rseq.c
+++ b/usr/src/uts/common/io/usb/clients/usbser/usbser_rseq.c
@@ -34,6 +34,7 @@
 #include <sys/debug.h>
 #include <sys/ddi.h>
 #include <sys/sunddi.h>
+/*LINTED E_STATIC_UNUSED*/
 static long rseq_random();
 #define	random	rseq_random
 #else
@@ -122,7 +123,7 @@ rseq_debug(rseq_t *rseq, int num, uintptr_t arg, int flags, int scenario,
 		uintptr_t sarg1, uintptr_t sarg2,
 		int (*func)(rseq_t *, int, uintptr_t, int, int, uintptr_t))
 {
-	int	rnd, rval, i;
+	int	rnd, rval = RSEQ_OK, i;
 
 	switch (scenario) {
 	case RSEQ_DBG_FAIL_ONE:
@@ -146,6 +147,7 @@ rseq_debug(rseq_t *rseq, int num, uintptr_t arg, int flags, int scenario,
 		break;
 	default:
 		ASSERT(!"rseq_debug: incorrect debug scenario");
+		rval = RSEQ_ABORT;
 	}
 	return (rval);
 }
diff --git a/usr/src/uts/common/sys/usb/usba/usbai_private.h b/usr/src/uts/common/sys/usb/usba/usbai_private.h
index a0891ca7f9..29661184c9 100644
--- a/usr/src/uts/common/sys/usb/usba/usbai_private.h
+++ b/usr/src/uts/common/sys/usb/usba/usbai_private.h
@@ -206,8 +206,8 @@ typedef struct usb_log_handle *usb_log_handle_t;
 #define	USB_LOG_L4	4	/* tracing, debug only */
 
 #ifdef DEBUG
-#define	USB_DPRINTF_L4	usb_dprintf4
-#define	USB_DPRINTF_L3	usb_dprintf3
+#define	USB_DPRINTF_L4(...)	usb_dprintf4(__VA_ARGS__)
+#define	USB_DPRINTF_L3(...)	usb_dprintf3(__VA_ARGS__)
 
 /*PRINTFLIKE3*/
 void usb_dprintf4(
@@ -220,8 +220,8 @@ void usb_dprintf3(
 	usb_log_handle_t handle,
 	char		*fmt, ...);
 #else
-#define	USB_DPRINTF_L4 0 &&
-#define	USB_DPRINTF_L3 0 &&
+#define	USB_DPRINTF_L4(...)	((void)0)
+#define	USB_DPRINTF_L3(...)	((void)0)
 #endif
 
 #define	USB_DPRINTF_L2	usb_dprintf2
diff --git a/usr/src/uts/intel/usbser/Makefile b/usr/src/uts/intel/usbser/Makefile
index 888e472c71..836d3c21a2 100644
--- a/usr/src/uts/intel/usbser/Makefile
+++ b/usr/src/uts/intel/usbser/Makefile
@@ -67,10 +67,7 @@ INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
 # Please do not carry these forward to new Makefiles.
 #
 LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
-
-CERRWARN	+= -_gcc=-Wno-uninitialized
-CERRWARN	+= -_gcc=-Wno-parentheses
-CERRWARN	+= -_gcc=-Wno-unused-label
+LINTTAGS	+= -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
 
 .KEEP_STATE: