diff options
Diffstat (limited to 'usr/src/uts/common/io')
| -rw-r--r-- | usr/src/uts/common/io/comstar/port/srpt/srpt_impl.h | 14 | ||||
| -rw-r--r-- | usr/src/uts/common/io/pciex/pcieb.h | 14 | ||||
| -rw-r--r-- | usr/src/uts/common/io/ppp/sppp/sppp.c | 3 | ||||
| -rw-r--r-- | usr/src/uts/common/io/softmac/softmac_dev.c | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/io/softmac/softmac_fp.c | 8 |
5 files changed, 30 insertions, 14 deletions
diff --git a/usr/src/uts/common/io/comstar/port/srpt/srpt_impl.h b/usr/src/uts/common/io/comstar/port/srpt/srpt_impl.h index e5ef739a87..17faa17087 100644 --- a/usr/src/uts/common/io/comstar/port/srpt/srpt_impl.h +++ b/usr/src/uts/common/io/comstar/port/srpt/srpt_impl.h @@ -23,6 +23,10 @@ * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. */ +/* + * Copyright 2019, Joyent, Inc. + */ + #ifndef _SRPT_IMPL_H_ #define _SRPT_IMPL_H_ @@ -92,7 +96,7 @@ struct srpt_target_port_s; * by a login. */ typedef struct srpt_session_s { - krwlock_t ss_rwlock; + krwlock_t ss_rwlock; list_node_t ss_node; /* @@ -167,7 +171,7 @@ typedef enum srpt_channel_state_e { } srpt_channel_state_t; typedef struct srpt_channel_s { - krwlock_t ch_rwlock; + krwlock_t ch_rwlock; kmutex_t ch_reflock; uint_t ch_refcnt; @@ -322,7 +326,7 @@ typedef struct srpt_target_port_s { typedef struct srpt_ioc_s { list_node_t ioc_node; - krwlock_t ioc_rwlock; + krwlock_t ioc_rwlock; ibt_hca_hdl_t ioc_ibt_hdl; ibt_hca_attr_t ioc_attr; ib_guid_t ioc_guid; @@ -518,8 +522,8 @@ extern uint_t srpt_errlevel; cmn_err(CE_NOTE, __VA_ARGS__);\ } #else -#define SRPT_DPRINTF_L3 0 && -#define SRPT_DPRINTF_L4 0 && +#define SRPT_DPRINTF_L3(...) +#define SRPT_DPRINTF_L4(...) #endif #ifdef __cplusplus diff --git a/usr/src/uts/common/io/pciex/pcieb.h b/usr/src/uts/common/io/pciex/pcieb.h index 635ed7c784..fdb66a7844 100644 --- a/usr/src/uts/common/io/pciex/pcieb.h +++ b/usr/src/uts/common/io/pciex/pcieb.h @@ -22,6 +22,10 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. */ +/* + * Copyright 2019, Joyent, Inc. + */ + #ifndef _SYS_PCIEB_H #define _SYS_PCIEB_H @@ -33,7 +37,7 @@ extern "C" { #define PCIEB_DEBUG pcieb_dbg extern void pcieb_dbg(uint_t bit, dev_info_t *dip, char *fmt, ...); #else /* DEBUG */ -#define PCIEB_DEBUG 0 && +#define PCIEB_DEBUG(...) #endif /* DEBUG */ typedef enum { /* same sequence as pcieb_debug_sym[] */ @@ -160,12 +164,12 @@ extern void *pcieb_state; extern void pcieb_set_pci_perf_parameters(dev_info_t *dip, ddi_acc_handle_t config_handle); extern void pcieb_plat_attach_workaround(dev_info_t *dip); -extern void pcieb_plat_intr_attach(pcieb_devstate_t *pcieb); -extern void pcieb_plat_initchild(dev_info_t *child); -extern void pcieb_plat_uninitchild(dev_info_t *child); +extern void pcieb_plat_intr_attach(pcieb_devstate_t *pcieb); +extern void pcieb_plat_initchild(dev_info_t *child); +extern void pcieb_plat_uninitchild(dev_info_t *child); extern int pcieb_plat_ctlops(dev_info_t *rdip, ddi_ctl_enum_t ctlop, void *arg); -extern int pcieb_plat_pcishpc_probe(dev_info_t *dip, +extern int pcieb_plat_pcishpc_probe(dev_info_t *dip, ddi_acc_handle_t config_handle); extern int pcieb_plat_peekpoke(dev_info_t *dip, dev_info_t *rdip, ddi_ctl_enum_t ctlop, void *arg, void *result); diff --git a/usr/src/uts/common/io/ppp/sppp/sppp.c b/usr/src/uts/common/io/ppp/sppp/sppp.c index 4cf02abe2e..1d9e9fed70 100644 --- a/usr/src/uts/common/io/ppp/sppp/sppp.c +++ b/usr/src/uts/common/io/ppp/sppp/sppp.c @@ -4,6 +4,7 @@ * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * Copyright (c) 2016 by Delphix. All rights reserved. + * Copyright 2019, Joyent, Inc. * * Permission to use, copy, modify, and distribute this software and its * documentation is hereby granted, provided that the above copyright @@ -1842,7 +1843,7 @@ sppp_lrsrv(queue_t *q) mblk_t *mp; while ((mp = getq(q)) != NULL) - sppp_lrput(q, mp); + (void) sppp_lrput(q, mp); return (0); } diff --git a/usr/src/uts/common/io/softmac/softmac_dev.c b/usr/src/uts/common/io/softmac/softmac_dev.c index 3b9c76a7e2..60415e3422 100644 --- a/usr/src/uts/common/io/softmac/softmac_dev.c +++ b/usr/src/uts/common/io/softmac/softmac_dev.c @@ -23,6 +23,9 @@ * Use is subject to license terms. */ +/* + * Copyright 2019, Joyent, Inc. + */ #include <sys/types.h> #include <inet/common.h> @@ -662,7 +665,7 @@ softmac_drv_wsrv(queue_t *wq) */ sup->su_tx_inprocess++; mutex_exit(&sup->su_mutex); - dld_wsrv(wq); + (void) dld_wsrv(wq); mutex_enter(&sup->su_mutex); if (--sup->su_tx_inprocess == 0) cv_signal(&sup->su_cv); diff --git a/usr/src/uts/common/io/softmac/softmac_fp.c b/usr/src/uts/common/io/softmac/softmac_fp.c index 8286ac4013..174a7b2e86 100644 --- a/usr/src/uts/common/io/softmac/softmac_fp.c +++ b/usr/src/uts/common/io/softmac/softmac_fp.c @@ -24,6 +24,10 @@ */ /* + * Copyright 2019, Joyent, Inc. + */ + +/* * Softmac data-path switching: * * - Fast-path model @@ -764,7 +768,7 @@ softmac_wput_single_nondata(softmac_upper_t *sup, mblk_t *mp) * operation is is serialized by softmac_wput_nondata_task(). */ if (sup->su_mode != SOFTMAC_FASTPATH) { - dld_wput(sup->su_wq, mp); + (void) dld_wput(sup->su_wq, mp); return; } @@ -986,7 +990,7 @@ softmac_wput_data(softmac_upper_t *sup, mblk_t *mp) * process of switching. */ if (sup->su_mode != SOFTMAC_FASTPATH) - dld_wput(sup->su_wq, mp); + (void) dld_wput(sup->su_wq, mp); else (void) softmac_fastpath_wput_data(sup, mp, (uintptr_t)NULL, 0); } |