Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgrap
On Wed, Sep 02, 2020 at 12:41:43AM +0200, Michael Tuexen wrote: > > On 1. Sep 2020, at 23:19, Mateusz Guzik wrote: > > Author: mjg > > Date: Tue Sep 1 21:19:14 2020 > > New Revision: 365071 > > URL: https://svnweb.freebsd.org/changeset/base/365071 > > > > Log: > > net: clean up empty lines in .c and .h files > > Hi Mateusz, > > which rules are enforced? Why? This is common sense. I can't count how often I wanted to hack on something in the base/kernel and was turned away by this atrocious excessive whitespace mess. Thank you Mateusz for cleaning this up. ./danfe ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365232 - in head/sys/modules: nfscl nfsd
Author: rmacklem Date: Wed Sep 2 01:29:33 2020 New Revision: 365232 URL: https://svnweb.freebsd.org/changeset/base/365232 Log: Fix the standalone build of the nfscl and nfsd modules. Reported by: j...@berklix.com Modified: head/sys/modules/nfscl/Makefile head/sys/modules/nfsd/Makefile Modified: head/sys/modules/nfscl/Makefile == --- head/sys/modules/nfscl/Makefile Tue Sep 1 23:16:38 2020 (r365231) +++ head/sys/modules/nfscl/Makefile Wed Sep 2 01:29:33 2020 (r365232) @@ -17,6 +17,7 @@ SRCS= vnode_if.h \ opt_bootp.h \ opt_inet.h \ opt_inet6.h \ + opt_kern_tls.h \ opt_kgssapi.h \ opt_nfs.h \ opt_nfsroot.h \ Modified: head/sys/modules/nfsd/Makefile == --- head/sys/modules/nfsd/Makefile Tue Sep 1 23:16:38 2020 (r365231) +++ head/sys/modules/nfsd/Makefile Wed Sep 2 01:29:33 2020 (r365232) @@ -15,6 +15,7 @@ SRCS= vnode_if.h \ opt_nfs.h \ opt_inet.h \ opt_inet6.h \ + opt_kern_tls.h \ opt_kgssapi.h .include ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365231 - head/sys/dev/ixl
Author: erj
Date: Tue Sep 1 23:16:38 2020
New Revision: 365231
URL: https://svnweb.freebsd.org/changeset/base/365231
Log:
ixl(4): Add support for X710-T*L devices
Add support for new devices which are capable of 2.5 and 5G speeds, as well as
Energy Efficient Ethernet (EEE):
- introduce new device ids
- add ability to select 2.5 and 5G speeds on devices which support it
- add sysctls to enable EEE and read related statistics
Submitted by: Krzysztof Galazka
Reviewed by: #IntelNetworking
MFC after:3 days
Sponsored by: Intel Corporation
Differential Revision:https://reviews.freebsd.org/D25549
Modified:
head/sys/dev/ixl/i40e_adminq_cmd.h
head/sys/dev/ixl/i40e_common.c
head/sys/dev/ixl/i40e_devids.h
head/sys/dev/ixl/i40e_prototype.h
head/sys/dev/ixl/i40e_type.h
head/sys/dev/ixl/if_ixl.c
head/sys/dev/ixl/ixl_pf.h
head/sys/dev/ixl/ixl_pf_main.c
head/sys/dev/ixl/virtchnl.h
Modified: head/sys/dev/ixl/i40e_adminq_cmd.h
==
--- head/sys/dev/ixl/i40e_adminq_cmd.h Tue Sep 1 22:36:24 2020
(r365230)
+++ head/sys/dev/ixl/i40e_adminq_cmd.h Tue Sep 1 23:16:38 2020
(r365231)
@@ -1940,6 +1940,8 @@ enum i40e_aq_phy_type {
I40E_PHY_TYPE_25GBASE_LR= 0x22,
I40E_PHY_TYPE_25GBASE_AOC = 0x23,
I40E_PHY_TYPE_25GBASE_ACC = 0x24,
+ I40E_PHY_TYPE_2_5GBASE_T= 0x30,
+ I40E_PHY_TYPE_5GBASE_T = 0x31,
I40E_PHY_TYPE_MAX,
I40E_PHY_TYPE_NOT_SUPPORTED_HIGH_TEMP = 0xFD,
I40E_PHY_TYPE_EMPTY = 0xFE,
@@ -1981,19 +1983,25 @@ enum i40e_aq_phy_type {
BIT_ULL(I40E_PHY_TYPE_25GBASE_SR) | \
BIT_ULL(I40E_PHY_TYPE_25GBASE_LR) | \
BIT_ULL(I40E_PHY_TYPE_25GBASE_AOC) | \
- BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC))
+ BIT_ULL(I40E_PHY_TYPE_25GBASE_ACC) | \
+ BIT_ULL(I40E_PHY_TYPE_2_5GBASE_T) | \
+ BIT_ULL(I40E_PHY_TYPE_5GBASE_T))
+#define I40E_LINK_SPEED_2_5GB_SHIFT0x0
#define I40E_LINK_SPEED_100MB_SHIFT0x1
#define I40E_LINK_SPEED_1000MB_SHIFT 0x2
#define I40E_LINK_SPEED_10GB_SHIFT 0x3
#define I40E_LINK_SPEED_40GB_SHIFT 0x4
#define I40E_LINK_SPEED_20GB_SHIFT 0x5
#define I40E_LINK_SPEED_25GB_SHIFT 0x6
+#define I40E_LINK_SPEED_5GB_SHIFT 0x7
enum i40e_aq_link_speed {
I40E_LINK_SPEED_UNKNOWN = 0,
I40E_LINK_SPEED_100MB = (1 << I40E_LINK_SPEED_100MB_SHIFT),
I40E_LINK_SPEED_1GB = (1 << I40E_LINK_SPEED_1000MB_SHIFT),
+ I40E_LINK_SPEED_2_5GB = (1 << I40E_LINK_SPEED_2_5GB_SHIFT),
+ I40E_LINK_SPEED_5GB = (1 << I40E_LINK_SPEED_5GB_SHIFT),
I40E_LINK_SPEED_10GB= (1 << I40E_LINK_SPEED_10GB_SHIFT),
I40E_LINK_SPEED_40GB= (1 << I40E_LINK_SPEED_40GB_SHIFT),
I40E_LINK_SPEED_20GB= (1 << I40E_LINK_SPEED_20GB_SHIFT),
@@ -2030,6 +2038,8 @@ struct i40e_aq_get_phy_abilities_resp {
#define I40E_AQ_EEE_1000BASE_KX0x0010
#define I40E_AQ_EEE_10GBASE_KX40x0020
#define I40E_AQ_EEE_10GBASE_KR 0x0040
+#define I40E_AQ_EEE_2_5GBASE_T 0x0100
+#define I40E_AQ_EEE_5GBASE_T 0x0200
__le32 eeer_val;
u8 d3_lpan;
#define I40E_AQ_SET_PHY_D3_LPAN_ENA0x01
@@ -2040,6 +2050,8 @@ struct i40e_aq_get_phy_abilities_resp {
#define I40E_AQ_PHY_TYPE_EXT_25G_LR0x08
#define I40E_AQ_PHY_TYPE_EXT_25G_AOC 0x10
#define I40E_AQ_PHY_TYPE_EXT_25G_ACC 0x20
+#define I40E_AQ_PHY_TYPE_EXT_2_5GBASE_T0x40
+#define I40E_AQ_PHY_TYPE_EXT_5GBASE_T 0x80
u8 fec_cfg_curr_mod_ext_info;
#define I40E_AQ_ENABLE_FEC_KR 0x01
#define I40E_AQ_ENABLE_FEC_RS 0x02
@@ -2282,15 +2294,32 @@ enum i40e_aq_phy_reg_type {
I40E_AQC_PHY_REG_EXERNAL_MODULE = 0x3
};
+#pragma pack(1)
/* Run PHY Activity (0x0626) */
struct i40e_aqc_run_phy_activity {
- __le16 activity_id;
- u8 flags;
- u8 reserved1;
- __le32 control;
- __le32 data;
- u8 reserved2[4];
+ u8 cmd_flags;
+ __le16 activity_id;
+#define I40E_AQ_RUN_PHY_ACT_ID_USR_DFND0x10
+ u8 reserved;
+ union {
+ struct {
+ __le32 dnl_opcode;
+#define I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT_DUR0x801a
+#define I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_STAT0x801b
+#define I40E_AQ_RUN_PHY_ACT_DNL_OPCODE_GET_EEE_DUR 0x1801b
+ __le32 data;
+ u8 reserved2[4];
+ } cmd;
+ struct {
+ __le32 cmd_status;
+#define I40E_AQ_RUN_PHY_ACT_CMD_STAT_SUCC 0x4
Re: svn commit: r365071 - in head/sys: net net/altq net/route net80211 netgraph netgraph/atm netgraph/atm/ccatm netgraph/atm/sscfu netgraph/atm/sscop netgraph/atm/uni netgraph/bluetooth/common netgrap
> On 1. Sep 2020, at 23:19, Mateusz Guzik wrote: > > Author: mjg > Date: Tue Sep 1 21:19:14 2020 > New Revision: 365071 > URL: https://svnweb.freebsd.org/changeset/base/365071 > > Log: > net: clean up empty lines in .c and .h files Hi Mateusz, which rules are enforced? Why? Best regards Michael > > Modified: > head/sys/net/altq/altq.h > head/sys/net/altq/altq_cbq.c > head/sys/net/altq/altq_cbq.h > head/sys/net/altq/altq_codel.c > head/sys/net/altq/altq_fairq.c > head/sys/net/altq/altq_hfsc.c > head/sys/net/altq/altq_hfsc.h > head/sys/net/altq/altq_priq.c > head/sys/net/altq/altq_priq.h > head/sys/net/altq/altq_red.c > head/sys/net/altq/altq_red.h > head/sys/net/altq/altq_rio.c > head/sys/net/altq/altq_rio.h > head/sys/net/altq/altq_rmclass.c > head/sys/net/altq/altq_subr.c > head/sys/net/altq/if_altq.h > head/sys/net/bpf.c > head/sys/net/bridgestp.c > head/sys/net/bridgestp.h > head/sys/net/debugnet_inet.c > head/sys/net/ieee8023ad_lacp.c > head/sys/net/if.c > head/sys/net/if.h > head/sys/net/if_bridge.c > head/sys/net/if_clone.c > head/sys/net/if_dl.h > head/sys/net/if_epair.c > head/sys/net/if_ethersubr.c > head/sys/net/if_gif.c > head/sys/net/if_ipsec.c > head/sys/net/if_lagg.c > head/sys/net/if_llatbl.c > head/sys/net/if_loop.c > head/sys/net/if_media.c > head/sys/net/if_media.h > head/sys/net/if_mib.c > head/sys/net/if_pfsync.h > head/sys/net/if_spppsubr.c > head/sys/net/if_tuntap.c > head/sys/net/if_vlan.c > head/sys/net/iflib.c > head/sys/net/iflib.h > head/sys/net/iflib_clone.c > head/sys/net/ifq.h > head/sys/net/mp_ring.c > head/sys/net/netisr.c > head/sys/net/netmap.h > head/sys/net/netmap_legacy.h > head/sys/net/netmap_user.h > head/sys/net/pfvar.h > head/sys/net/radix.c > head/sys/net/radix_mpath.c > head/sys/net/route.c > head/sys/net/route/nhop.c > head/sys/net/route/nhop.h > head/sys/net/route/nhop_ctl.c > head/sys/net/route/nhop_utils.c > head/sys/net/route/nhop_utils.h > head/sys/net/route/nhop_var.h > head/sys/net/route/route_ctl.c > head/sys/net/route/route_ctl.h > head/sys/net/route/route_helpers.c > head/sys/net/route/route_tables.c > head/sys/net/route/route_temporal.c > head/sys/net/route/route_var.h > head/sys/net/rss_config.c > head/sys/net/rtsock.c > head/sys/net/sff8436.h > head/sys/net/sff8472.h > head/sys/net/slcompress.c > head/sys/net/slcompress.h > head/sys/net/vnet.h > head/sys/net80211/ieee80211.h > head/sys/net80211/ieee80211_action.c > head/sys/net80211/ieee80211_ageq.c > head/sys/net80211/ieee80211_crypto.c > head/sys/net80211/ieee80211_crypto_tkip.c > head/sys/net80211/ieee80211_freebsd.c > head/sys/net80211/ieee80211_freebsd.h > head/sys/net80211/ieee80211_hostap.c > head/sys/net80211/ieee80211_ht.c > head/sys/net80211/ieee80211_hwmp.c > head/sys/net80211/ieee80211_input.c > head/sys/net80211/ieee80211_ioctl.c > head/sys/net80211/ieee80211_ioctl.h > head/sys/net80211/ieee80211_mesh.c > head/sys/net80211/ieee80211_mesh.h > head/sys/net80211/ieee80211_node.c > head/sys/net80211/ieee80211_output.c > head/sys/net80211/ieee80211_phy.c > head/sys/net80211/ieee80211_power.c > head/sys/net80211/ieee80211_proto.c > head/sys/net80211/ieee80211_radiotap.c > head/sys/net80211/ieee80211_radiotap.h > head/sys/net80211/ieee80211_scan.c > head/sys/net80211/ieee80211_scan_sta.c > head/sys/net80211/ieee80211_scan_sw.c > head/sys/net80211/ieee80211_sta.c > head/sys/net80211/ieee80211_superg.c > head/sys/net80211/ieee80211_tdma.h > head/sys/net80211/ieee80211_vht.c > head/sys/netgraph/atm/ccatm/ng_ccatm.c > head/sys/netgraph/atm/ng_sscop.h > head/sys/netgraph/atm/ngatmbase.c > head/sys/netgraph/atm/sscfu/ng_sscfu.c > head/sys/netgraph/atm/sscfu/ng_sscfu_cust.h > head/sys/netgraph/atm/sscop/ng_sscop.c > head/sys/netgraph/atm/sscop/ng_sscop_cust.h > head/sys/netgraph/atm/uni/ng_uni.c > head/sys/netgraph/bluetooth/common/ng_bluetooth.c > head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c > head/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h > head/sys/netgraph/bluetooth/drivers/h4/ng_h4.c > head/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h > head/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h > head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c > head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h > head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c > head/sys/netgraph/bluetooth/hci/ng_hci_cmds.c > head/sys/netgraph/bluetooth/hci/ng_hci_cmds.h > head/sys/netgraph/bluetooth/hci/ng_hci_evnt.c > head/sys/netgraph/bluetooth/hci/ng_hci_evnt.h > head/sys/netgraph/bluetooth/hci/ng_hci_main.c > head/sys/netgraph/bluetooth/hci/ng_hci_misc.c > head/sys/netgraph/bluetooth/hci/ng_hci_misc.h > head/sys/netgraph/bluetooth/hci/ng_hci_prse.h > head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c > head/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h > head/sys/netgraph/bluetooth/hci/ng_hci_var.h > head/sys/netgraph/bluetooth/include/ng_bluetooth.h >
svn commit: r365229 - in head/sys/kgssapi: . krb5
Author: mjg
Date: Tue Sep 1 22:15:02 2020
New Revision: 365229
URL: https://svnweb.freebsd.org/changeset/base/365229
Log:
kgssapi: clean up empty lines in .c and .h files
Modified:
head/sys/kgssapi/gss_canonicalize_name.c
head/sys/kgssapi/gss_delete_sec_context.c
head/sys/kgssapi/gss_display_status.c
head/sys/kgssapi/gss_get_mic.c
head/sys/kgssapi/gss_import_name.c
head/sys/kgssapi/gss_names.c
head/sys/kgssapi/gss_release_buffer.c
head/sys/kgssapi/gss_release_name.c
head/sys/kgssapi/gss_unwrap.c
head/sys/kgssapi/gss_verify_mic.c
head/sys/kgssapi/gssapi.h
head/sys/kgssapi/gsstest.c
head/sys/kgssapi/krb5/kcrypto_aes.c
head/sys/kgssapi/krb5/krb5_mech.c
Modified: head/sys/kgssapi/gss_canonicalize_name.c
==
--- head/sys/kgssapi/gss_canonicalize_name.cTue Sep 1 22:14:52 2020
(r365228)
+++ head/sys/kgssapi/gss_canonicalize_name.cTue Sep 1 22:15:02 2020
(r365229)
@@ -61,7 +61,7 @@ gss_canonicalize_name(OM_uint32 *minor_status,
args.input_name = input_name->handle;
args.mech_type = mech_type;
-
+
bzero(, sizeof(res));
stat = gssd_canonicalize_name_1(, , cl);
CLNT_RELEASE(cl);
Modified: head/sys/kgssapi/gss_delete_sec_context.c
==
--- head/sys/kgssapi/gss_delete_sec_context.c Tue Sep 1 22:14:52 2020
(r365228)
+++ head/sys/kgssapi/gss_delete_sec_context.c Tue Sep 1 22:15:02 2020
(r365229)
@@ -70,7 +70,7 @@ gss_delete_sec_context(OM_uint32 *minor_status, gss_ct
cl = kgss_gssd_client();
if (cl == NULL)
return (GSS_S_FAILURE);
-
+
bzero(, sizeof(res));
stat = gssd_delete_sec_context_1(, , cl);
CLNT_RELEASE(cl);
Modified: head/sys/kgssapi/gss_display_status.c
==
--- head/sys/kgssapi/gss_display_status.c Tue Sep 1 22:14:52 2020
(r365228)
+++ head/sys/kgssapi/gss_display_status.c Tue Sep 1 22:15:02 2020
(r365229)
@@ -64,7 +64,7 @@ gss_display_status(OM_uint32 *minor_status,
args.status_type = status_type;
args.mech_type = mech_type;
args.message_context = *message_context;
-
+
bzero(, sizeof(res));
stat = gssd_display_status_1(, , cl);
CLNT_RELEASE(cl);
Modified: head/sys/kgssapi/gss_get_mic.c
==
--- head/sys/kgssapi/gss_get_mic.c Tue Sep 1 22:14:52 2020
(r365228)
+++ head/sys/kgssapi/gss_get_mic.c Tue Sep 1 22:15:02 2020
(r365229)
@@ -88,4 +88,3 @@ gss_get_mic_mbuf(OM_uint32 *minor_status, const gss_ct
return (KGSS_GET_MIC(ctx, minor_status, qop_req, m, micp));
}
-
Modified: head/sys/kgssapi/gss_import_name.c
==
--- head/sys/kgssapi/gss_import_name.c Tue Sep 1 22:14:52 2020
(r365228)
+++ head/sys/kgssapi/gss_import_name.c Tue Sep 1 22:15:02 2020
(r365229)
@@ -63,7 +63,7 @@ gss_import_name(OM_uint32 *minor_status,
args.input_name_buffer = *input_name_buffer;
args.input_name_type = input_name_type;
-
+
bzero(, sizeof(res));
stat = gssd_import_name_1(, , cl);
CLNT_RELEASE(cl);
Modified: head/sys/kgssapi/gss_names.c
==
--- head/sys/kgssapi/gss_names.cTue Sep 1 22:14:52 2020
(r365228)
+++ head/sys/kgssapi/gss_names.cTue Sep 1 22:15:02 2020
(r365229)
@@ -174,5 +174,3 @@ gss_OID GSS_KRB5_NT_MACHINE_UID_NAME = _C_NT_MACHI
* this type is "GSS_KRB5_NT_STRING_UID_NAME".
*/
gss_OID GSS_KRB5_NT_STRING_UID_NAME = _C_NT_STRING_UID_NAME_storage;
-
-
Modified: head/sys/kgssapi/gss_release_buffer.c
==
--- head/sys/kgssapi/gss_release_buffer.c Tue Sep 1 22:14:52 2020
(r365228)
+++ head/sys/kgssapi/gss_release_buffer.c Tue Sep 1 22:15:02 2020
(r365229)
@@ -51,4 +51,3 @@ gss_release_buffer(OM_uint32 *minor_status, gss_buffer
return (GSS_S_COMPLETE);
}
-
Modified: head/sys/kgssapi/gss_release_name.c
==
--- head/sys/kgssapi/gss_release_name.c Tue Sep 1 22:14:52 2020
(r365228)
+++ head/sys/kgssapi/gss_release_name.c Tue Sep 1 22:15:02 2020
(r365229)
@@ -59,7 +59,7 @@ gss_release_name(OM_uint32 *minor_status, gss_name_t *
if (*input_name) {
name = *input_name;
args.input_name = name->handle;
-
+
cl =
svn commit: r365228 - head/sys/nlm
Author: mjg
Date: Tue Sep 1 22:14:52 2020
New Revision: 365228
URL: https://svnweb.freebsd.org/changeset/base/365228
Log:
nlm: clean up empty lines in .c and .h files
Modified:
head/sys/nlm/nlm_advlock.c
head/sys/nlm/nlm_prot_impl.c
Modified: head/sys/nlm/nlm_advlock.c
==
--- head/sys/nlm/nlm_advlock.c Tue Sep 1 22:14:30 2020(r365227)
+++ head/sys/nlm/nlm_advlock.c Tue Sep 1 22:14:52 2020(r365228)
@@ -940,7 +940,6 @@ nlm_setlock(struct nlm_host *host, struct rpc_callextr
*/
break;
}
-
}
} else {
error = nlm_map_status(res.stat.stat);
Modified: head/sys/nlm/nlm_prot_impl.c
==
--- head/sys/nlm/nlm_prot_impl.cTue Sep 1 22:14:30 2020
(r365227)
+++ head/sys/nlm/nlm_prot_impl.cTue Sep 1 22:14:52 2020
(r365228)
@@ -167,7 +167,6 @@ struct timeval nlm_zero_tv = { 0, 0 };
*/
int nlm_nsm_state;
-
/*
* A lock to protect the host list and waiting lock list.
*/
@@ -326,7 +325,6 @@ nlm_copy_netobj(struct netobj *dst, struct netobj *src
nlm_make_netobj(dst, src->n_bytes, src->n_len, type);
}
-
/*
* Create an RPC client handle for the given (address,prog,vers)
* triple using UDP.
@@ -644,7 +642,7 @@ nlm_cancel_async_lock(struct nlm_async_lock *af)
}
mtx_lock(>nh_lock);
-
+
if (!error) {
NLM_DEBUG(2, "NLM: async lock %p for %s (sysid %d) "
"cancelled\n", af, host->nh_caller_name, host->nh_sysid);
@@ -1061,7 +1059,6 @@ nlm_find_host_by_addr(const struct sockaddr *addr, int
strlcpy(tmp, "", sizeof(tmp));
}
-
mtx_lock(_global_lock);
/*
@@ -1334,7 +1331,7 @@ nlm_deregister_wait_lock(void *handle)
mtx_lock(_global_lock);
TAILQ_REMOVE(_waiting_locks, nw, nw_link);
mtx_unlock(_global_lock);
-
+
free(nw, M_NLM);
}
@@ -1394,7 +1391,6 @@ nlm_cancel_wait(struct vnode *vp)
mtx_unlock(_global_lock);
}
-
/**/
/*
@@ -1703,7 +1699,6 @@ sys_nlm_syscall(struct thread *td, struct nlm_syscall_
* NLM implementation details, called from the RPC stubs.
*/
-
void
nlm_sm_notify(struct nlm_sm_status *argp)
{
@@ -1738,7 +1733,7 @@ nlm_get_vfs_state(struct nlm_host *host, struct svc_re
int error;
uint64_t exflags;
struct ucred *cred = NULL, *credanon = NULL;
-
+
memset(vs, 0, sizeof(*vs));
vs->vs_mp = vfs_getvfs(>fh_fsid);
@@ -1840,7 +1835,7 @@ nlm_do_test(nlm4_testargs *argp, nlm4_testres *result,
int error, sysid;
struct flock fl;
accmode_t accmode;
-
+
memset(result, 0, sizeof(*result));
memset(, 0, sizeof(vs));
@@ -1938,7 +1933,7 @@ nlm_do_lock(nlm4_lockargs *argp, nlm4_res *result, str
int error, sysid;
struct flock fl;
accmode_t accmode;
-
+
memset(result, 0, sizeof(*result));
memset(, 0, sizeof(vs));
@@ -2127,7 +2122,7 @@ nlm_do_cancel(nlm4_cancargs *argp, nlm4_res *result, s
int error, sysid;
struct flock fl;
struct nlm_async_lock *af;
-
+
memset(result, 0, sizeof(*result));
memset(, 0, sizeof(vs));
@@ -2216,7 +2211,7 @@ nlm_do_unlock(nlm4_unlockargs *argp, nlm4_res *result,
struct nlm_host *host;
int error, sysid;
struct flock fl;
-
+
memset(result, 0, sizeof(*result));
memset(, 0, sizeof(vs));
@@ -2276,7 +2271,7 @@ nlm_do_granted(nlm4_testargs *argp, nlm4_res *result,
{
struct nlm_host *host;
struct nlm_waiting_lock *nw;
-
+
memset(result, 0, sizeof(*result));
host = nlm_find_host_by_addr(svc_getrpccaller(rqstp), rqstp->rq_vers);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365226 - in head/sys/geom: . bde cache concat eli gate label mirror mountver multipath nop part raid raid3 uzip vinum virstor zero
Author: mjg
Date: Tue Sep 1 22:14:09 2020
New Revision: 365226
URL: https://svnweb.freebsd.org/changeset/base/365226
Log:
geom: clean up empty lines in .c and .h files
Modified:
head/sys/geom/bde/g_bde.c
head/sys/geom/bde/g_bde.h
head/sys/geom/bde/g_bde_crypt.c
head/sys/geom/cache/g_cache.c
head/sys/geom/concat/g_concat.c
head/sys/geom/eli/g_eli.c
head/sys/geom/eli/g_eli_ctl.c
head/sys/geom/gate/g_gate.c
head/sys/geom/geom_ccd.c
head/sys/geom/geom_ctl.c
head/sys/geom/geom_disk.c
head/sys/geom/geom_dump.c
head/sys/geom/geom_event.c
head/sys/geom/geom_flashmap.h
head/sys/geom/geom_io.c
head/sys/geom/geom_kern.c
head/sys/geom/geom_map.c
head/sys/geom/geom_subr.c
head/sys/geom/label/g_label.c
head/sys/geom/label/g_label_disk_ident.c
head/sys/geom/label/g_label_iso9660.c
head/sys/geom/label/g_label_msdosfs.c
head/sys/geom/mirror/g_mirror.c
head/sys/geom/mountver/g_mountver.c
head/sys/geom/multipath/g_multipath.c
head/sys/geom/nop/g_nop.c
head/sys/geom/part/g_part.c
head/sys/geom/part/g_part_bsd64.c
head/sys/geom/part/g_part_ebr.c
head/sys/geom/part/g_part_ldm.c
head/sys/geom/raid/g_raid_ctl.c
head/sys/geom/raid/md_ddf.c
head/sys/geom/raid/md_intel.c
head/sys/geom/raid/md_jmicron.c
head/sys/geom/raid/md_nvidia.c
head/sys/geom/raid/md_promise.c
head/sys/geom/raid/md_sii.c
head/sys/geom/raid/tr_concat.c
head/sys/geom/raid/tr_raid1.c
head/sys/geom/raid/tr_raid1e.c
head/sys/geom/raid3/g_raid3.c
head/sys/geom/raid3/g_raid3_ctl.c
head/sys/geom/uzip/g_uzip_wrkthr.h
head/sys/geom/vinum/geom_vinum.c
head/sys/geom/vinum/geom_vinum.h
head/sys/geom/vinum/geom_vinum_drive.c
head/sys/geom/vinum/geom_vinum_init.c
head/sys/geom/vinum/geom_vinum_list.c
head/sys/geom/vinum/geom_vinum_plex.c
head/sys/geom/vinum/geom_vinum_raid5.c
head/sys/geom/vinum/geom_vinum_share.c
head/sys/geom/vinum/geom_vinum_state.c
head/sys/geom/vinum/geom_vinum_subr.c
head/sys/geom/virstor/binstream.c
head/sys/geom/virstor/binstream.h
head/sys/geom/virstor/g_virstor.c
head/sys/geom/virstor/g_virstor.h
head/sys/geom/virstor/g_virstor_md.c
head/sys/geom/virstor/g_virstor_md.h
head/sys/geom/zero/g_zero.c
Modified: head/sys/geom/bde/g_bde.c
==
--- head/sys/geom/bde/g_bde.c Tue Sep 1 22:13:48 2020(r365225)
+++ head/sys/geom/bde/g_bde.c Tue Sep 1 22:14:09 2020(r365226)
@@ -129,7 +129,6 @@ g_bde_create_geom(struct gctl_req *req, struct g_class
g_topology_assert();
gp = NULL;
-
gp = g_new_geomf(mp, "%s.bde", pp->name);
cp = g_new_consumer(gp);
g_attach(cp, pp);
@@ -225,7 +224,6 @@ g_bde_create_geom(struct gctl_req *req, struct g_class
}
return;
}
-
static int
g_bde_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp)
Modified: head/sys/geom/bde/g_bde.h
==
--- head/sys/geom/bde/g_bde.h Tue Sep 1 22:13:48 2020(r365225)
+++ head/sys/geom/bde/g_bde.h Tue Sep 1 22:14:09 2020(r365226)
@@ -54,7 +54,6 @@
#define G_BDE_LOCKSIZE 384
#define NLOCK_FIELDS 13
-
/* This just needs to be "large enough" */
#define G_BDE_KEYBYTES 304
Modified: head/sys/geom/bde/g_bde_crypt.c
==
--- head/sys/geom/bde/g_bde_crypt.c Tue Sep 1 22:13:48 2020
(r365225)
+++ head/sys/geom/bde/g_bde_crypt.c Tue Sep 1 22:14:09 2020
(r365226)
@@ -124,7 +124,6 @@ g_bde_crypt_read(struct g_bde_work *wp)
u_char skey[G_BDE_SKEYLEN];
keyInstance ki;
cipherInstance ci;
-
AES_init();
sc = wp->softc;
@@ -164,7 +163,6 @@ g_bde_crypt_write(struct g_bde_work *wp)
AES_init();
o = 0;
for (n = 0; o < wp->length; n++, o += sc->sectorsize) {
-
s = (u_char *)wp->data + o;
d = (u_char *)wp->sp->data + o;
arc4rand(skey, sizeof skey, 0);
Modified: head/sys/geom/cache/g_cache.c
==
--- head/sys/geom/cache/g_cache.c Tue Sep 1 22:13:48 2020
(r365225)
+++ head/sys/geom/cache/g_cache.c Tue Sep 1 22:14:09 2020
(r365226)
@@ -93,7 +93,6 @@ SYSCTL_PROC(_kern_geom_cache, OID_AUTO, used_hi,
sysctl_handle_pct, "IU",
"");
-
static int g_cache_destroy(struct g_cache_softc *sc, boolean_t force);
static g_ctl_destroy_geom_t g_cache_destroy_geom;
@@ -111,7 +110,6 @@ struct g_class g_cache_class = {
#defineOFF2BNO(off, sc)((off) >> (sc)->sc_bshift)
#defineBNO2OFF(bno, sc)((bno) << (sc)->sc_bshift)
-
static struct g_cache_desc *
g_cache_alloc(struct g_cache_softc *sc)
Modified: head/sys/geom/concat/g_concat.c
svn commit: r365227 - head/sys/ddb
Author: mjg
Date: Tue Sep 1 22:14:30 2020
New Revision: 365227
URL: https://svnweb.freebsd.org/changeset/base/365227
Log:
ddb: clean up empty lines in .c and .h files
Modified:
head/sys/ddb/db_break.c
head/sys/ddb/db_output.c
head/sys/ddb/db_ps.c
head/sys/ddb/db_sym.c
head/sys/ddb/db_watch.c
head/sys/ddb/db_write_cmd.c
Modified: head/sys/ddb/db_break.c
==
--- head/sys/ddb/db_break.c Tue Sep 1 22:14:09 2020(r365226)
+++ head/sys/ddb/db_break.c Tue Sep 1 22:14:30 2020(r365227)
@@ -178,7 +178,6 @@ db_set_breakpoints(void)
register db_breakpoint_tbkpt;
if (!db_breakpoints_inserted) {
-
for (bkpt = db_breakpoint_list;
bkpt != 0;
bkpt = bkpt->link)
@@ -195,7 +194,6 @@ db_clear_breakpoints(void)
register db_breakpoint_tbkpt;
if (db_breakpoints_inserted) {
-
for (bkpt = db_breakpoint_list;
bkpt != 0;
bkpt = bkpt->link)
Modified: head/sys/ddb/db_output.c
==
--- head/sys/ddb/db_output.cTue Sep 1 22:14:09 2020(r365226)
+++ head/sys/ddb/db_output.cTue Sep 1 22:14:30 2020(r365227)
@@ -124,11 +124,9 @@ db_putchar(int c, void *arg)
struct dbputchar_arg *dap = arg;
if (dap->da_pbufr == NULL) {
-
/* No bufferized output is provided. */
db_putc(c);
} else {
-
*dap->da_pnext++ = c;
dap->da_remain--;
Modified: head/sys/ddb/db_ps.c
==
--- head/sys/ddb/db_ps.cTue Sep 1 22:14:09 2020(r365226)
+++ head/sys/ddb/db_ps.cTue Sep 1 22:14:30 2020(r365227)
@@ -266,7 +266,7 @@ dumpthread(volatile struct proc *p, volatile struct th
char state[9], wprefix;
const char *wmesg;
const void *wchan;
-
+
if (all) {
db_printf("%6d ", td->td_tid);
switch (td->td_state) {
Modified: head/sys/ddb/db_sym.c
==
--- head/sys/ddb/db_sym.c Tue Sep 1 22:14:09 2020(r365226)
+++ head/sys/ddb/db_sym.c Tue Sep 1 22:14:30 2020(r365227)
@@ -205,7 +205,6 @@ db_qualify(c_db_sym_t sym, char *symtabname)
return tmp;
}
-
bool
db_eqname(const char *src, const char *dst, int c)
{
@@ -407,7 +406,6 @@ db_symbol_values(c_db_sym_t sym, const char **namep, d
if (valuep)
*valuep = value;
}
-
/*
* Print a the closest symbol to value
Modified: head/sys/ddb/db_watch.c
==
--- head/sys/ddb/db_watch.c Tue Sep 1 22:14:09 2020(r365226)
+++ head/sys/ddb/db_watch.c Tue Sep 1 22:14:30 2020(r365227)
@@ -277,8 +277,6 @@ db_find_watchpoint(vm_map_t map, db_addr_t addr, db_re
}
#endif
-
-
/* Delete hardware watchpoint */
/*ARGSUSED*/
void
Modified: head/sys/ddb/db_write_cmd.c
==
--- head/sys/ddb/db_write_cmd.c Tue Sep 1 22:14:09 2020(r365226)
+++ head/sys/ddb/db_write_cmd.c Tue Sep 1 22:14:30 2020(r365227)
@@ -90,4 +90,3 @@ db_write_cmd(db_expr_t address, bool have_addr, db_exp
db_skip_to_eol();
}
-
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365225 - in head/sys/cam: . ata ctl mmc nvme scsi
Author: mjg
Date: Tue Sep 1 22:13:48 2020
New Revision: 365225
URL: https://svnweb.freebsd.org/changeset/base/365225
Log:
cam: clean up empty lines in .c and .h files
Modified:
head/sys/cam/ata/ata_all.c
head/sys/cam/ata/ata_da.c
head/sys/cam/ata/ata_pmp.c
head/sys/cam/cam.c
head/sys/cam/cam.h
head/sys/cam/cam_ccb.h
head/sys/cam/cam_compat.c
head/sys/cam/cam_compat.h
head/sys/cam/cam_iosched.c
head/sys/cam/cam_periph.c
head/sys/cam/cam_queue.c
head/sys/cam/cam_queue.h
head/sys/cam/cam_sim.h
head/sys/cam/cam_xpt.c
head/sys/cam/cam_xpt.h
head/sys/cam/cam_xpt_internal.h
head/sys/cam/cam_xpt_sim.h
head/sys/cam/ctl/README.ctl.txt
head/sys/cam/ctl/ctl.c
head/sys/cam/ctl/ctl_backend.c
head/sys/cam/ctl/ctl_backend.h
head/sys/cam/ctl/ctl_backend_block.c
head/sys/cam/ctl/ctl_cmd_table.c
head/sys/cam/ctl/ctl_frontend_ioctl.c
head/sys/cam/ctl/ctl_frontend_iscsi.c
head/sys/cam/ctl/ctl_ha.c
head/sys/cam/ctl/ctl_io.h
head/sys/cam/ctl/ctl_scsi_all.c
head/sys/cam/ctl/ctl_ser_table.c
head/sys/cam/ctl/ctl_tpc.c
head/sys/cam/ctl/ctl_tpc_local.c
head/sys/cam/ctl/scsi_ctl.c
head/sys/cam/mmc/mmc_da.c
head/sys/cam/mmc/mmc_xpt.c
head/sys/cam/nvme/nvme_all.c
head/sys/cam/nvme/nvme_da.c
head/sys/cam/nvme/nvme_xpt.c
head/sys/cam/scsi/scsi_all.c
head/sys/cam/scsi/scsi_all.h
head/sys/cam/scsi/scsi_cd.c
head/sys/cam/scsi/scsi_cd.h
head/sys/cam/scsi/scsi_ch.c
head/sys/cam/scsi/scsi_da.c
head/sys/cam/scsi/scsi_da.h
head/sys/cam/scsi/scsi_enc.c
head/sys/cam/scsi/scsi_enc_safte.c
head/sys/cam/scsi/scsi_enc_ses.c
head/sys/cam/scsi/scsi_message.h
head/sys/cam/scsi/scsi_pass.c
head/sys/cam/scsi/scsi_pt.c
head/sys/cam/scsi/scsi_sa.c
head/sys/cam/scsi/scsi_sa.h
head/sys/cam/scsi/scsi_ses.h
head/sys/cam/scsi/scsi_sg.c
head/sys/cam/scsi/scsi_targ_bh.c
head/sys/cam/scsi/scsi_target.c
head/sys/cam/scsi/scsi_xpt.c
head/sys/cam/scsi/smp_all.c
Modified: head/sys/cam/ata/ata_all.c
==
--- head/sys/cam/ata/ata_all.c Tue Sep 1 22:13:28 2020(r365224)
+++ head/sys/cam/ata/ata_all.c Tue Sep 1 22:13:48 2020(r365225)
@@ -920,7 +920,6 @@ ata_string2mode(char *str)
return (-1);
}
-
u_int
ata_mode2speed(int mode)
{
@@ -995,7 +994,7 @@ ata_identify_match(caddr_t identbuffer, caddr_t table_
{
struct scsi_inquiry_pattern *entry;
struct ata_params *ident;
-
+
entry = (struct scsi_inquiry_pattern *)table_entry;
ident = (struct ata_params *)identbuffer;
@@ -1013,7 +1012,7 @@ ata_static_identify_match(caddr_t identbuffer, caddr_t
{
struct scsi_static_inquiry_pattern *entry;
struct ata_params *ident;
-
+
entry = (struct scsi_static_inquiry_pattern *)table_entry;
ident = (struct ata_params *)identbuffer;
@@ -1107,7 +1106,6 @@ semb_write_buffer(struct ccb_ataio *ataio,
ata_28bit_cmd(ataio, ATA_SEP_ATTN,
length > 0 ? data_ptr[0] : 0, 0x80, length / 4);
}
-
void
ata_zac_mgmt_out(struct ccb_ataio *ataio, uint32_t retries,
Modified: head/sys/cam/ata/ata_da.c
==
--- head/sys/cam/ata/ata_da.c Tue Sep 1 22:13:28 2020(r365224)
+++ head/sys/cam/ata/ata_da.c Tue Sep 1 22:13:48 2020(r365225)
@@ -211,7 +211,6 @@ static struct ada_zone_desc {
{ADA_ZONE_FLAG_RWP_SUP, "Reset Write Pointer" },
};
-
/* Offsets into our private area for storing information */
#define ccb_state ppriv_field0
#define ccb_bp ppriv_ptr1
@@ -1009,7 +1008,6 @@ adaclose(struct disk *dp)
(softc->flags & ADA_FLAG_CAN_FLUSHCACHE) != 0 &&
(periph->flags & CAM_PERIPH_INVALID) == 0 &&
cam_periph_hold(periph, PRIBIO) == 0) {
-
ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
cam_fill_ataio(>ataio,
1,
@@ -1198,7 +1196,6 @@ adainit(void)
printf("ada: Failed to attach master async callback "
"due to status 0x%x!\n", status);
} else if (ada_send_ordered) {
-
/* Register our event handlers */
if ((EVENTHANDLER_REGISTER(power_suspend, adasuspend,
NULL, EVENTHANDLER_PRI_LAST)) ==
NULL)
@@ -1462,7 +1459,6 @@ adazonesupsysctl(SYSCTL_HANDLER_ARGS)
return (error);
}
-
static void
adasysctlinit(void *context, int pending)
{
@@ -2573,7 +2569,6 @@ out:
break;
}
-
ata_read_log(ataio,
/*retries*/1,
/*cbfcnp*/adadone,
@@ -2838,7 +2833,6 @@ adazonedone(struct cam_periph *periph, union ccb *ccb)
free(ccb->ataio.data_ptr, M_ATADA);
}
-
static void
adadone(struct cam_periph *periph, union ccb *done_ccb)
{
@@ -3082,8 +3076,6 @@
svn commit: r365224 - head/sys/xdr
Author: mjg
Date: Tue Sep 1 22:13:28 2020
New Revision: 365224
URL: https://svnweb.freebsd.org/changeset/base/365224
Log:
xdr: clean up empty lines in .c and .h files
Modified:
head/sys/xdr/xdr.c
head/sys/xdr/xdr_array.c
head/sys/xdr/xdr_mbuf.c
head/sys/xdr/xdr_mem.c
head/sys/xdr/xdr_reference.c
Modified: head/sys/xdr/xdr.c
==
--- head/sys/xdr/xdr.c Tue Sep 1 22:12:58 2020(r365223)
+++ head/sys/xdr/xdr.c Tue Sep 1 22:13:28 2020(r365224)
@@ -81,7 +81,7 @@ void
xdr_free(xdrproc_t proc, void *objp)
{
XDR x;
-
+
x.x_op = XDR_FREE;
(*proc)(, objp);
}
@@ -96,7 +96,6 @@ xdr_void(void)
return (TRUE);
}
-
/*
* XDR integers
*/
@@ -106,7 +105,6 @@ xdr_int(XDR *xdrs, int *ip)
long l;
switch (xdrs->x_op) {
-
case XDR_ENCODE:
l = (long) *ip;
return (XDR_PUTLONG(xdrs, ));
@@ -134,7 +132,6 @@ xdr_u_int(XDR *xdrs, u_int *up)
u_long l;
switch (xdrs->x_op) {
-
case XDR_ENCODE:
l = (u_long) *up;
return (XDR_PUTLONG(xdrs, (long *)));
@@ -153,7 +150,6 @@ xdr_u_int(XDR *xdrs, u_int *up)
return (FALSE);
}
-
/*
* XDR long integers
* same as xdr_u_long - open coded to save a proc call!
@@ -192,7 +188,6 @@ xdr_u_long(XDR *xdrs, u_long *ulp)
return (FALSE);
}
-
/*
* XDR 32-bit integers
* same as xdr_uint32_t - open coded to save a proc call!
@@ -203,7 +198,6 @@ xdr_int32_t(XDR *xdrs, int32_t *int32_p)
long l;
switch (xdrs->x_op) {
-
case XDR_ENCODE:
l = (long) *int32_p;
return (XDR_PUTLONG(xdrs, ));
@@ -232,7 +226,6 @@ xdr_uint32_t(XDR *xdrs, uint32_t *uint32_p)
u_long l;
switch (xdrs->x_op) {
-
case XDR_ENCODE:
l = (u_long) *uint32_p;
return (XDR_PUTLONG(xdrs, (long *)));
@@ -251,7 +244,6 @@ xdr_uint32_t(XDR *xdrs, uint32_t *uint32_p)
return (FALSE);
}
-
/*
* XDR short integers
*/
@@ -261,7 +253,6 @@ xdr_short(XDR *xdrs, short *sp)
long l;
switch (xdrs->x_op) {
-
case XDR_ENCODE:
l = (long) *sp;
return (XDR_PUTLONG(xdrs, ));
@@ -289,7 +280,6 @@ xdr_u_short(XDR *xdrs, u_short *usp)
u_long l;
switch (xdrs->x_op) {
-
case XDR_ENCODE:
l = (u_long) *usp;
return (XDR_PUTLONG(xdrs, (long *)));
@@ -308,7 +298,6 @@ xdr_u_short(XDR *xdrs, u_short *usp)
return (FALSE);
}
-
/*
* XDR 16-bit integers
*/
@@ -318,7 +307,6 @@ xdr_int16_t(XDR *xdrs, int16_t *int16_p)
long l;
switch (xdrs->x_op) {
-
case XDR_ENCODE:
l = (long) *int16_p;
return (XDR_PUTLONG(xdrs, ));
@@ -346,7 +334,6 @@ xdr_uint16_t(XDR *xdrs, uint16_t *uint16_p)
u_long l;
switch (xdrs->x_op) {
-
case XDR_ENCODE:
l = (u_long) *uint16_p;
return (XDR_PUTLONG(xdrs, (long *)));
@@ -365,7 +352,6 @@ xdr_uint16_t(XDR *xdrs, uint16_t *uint16_p)
return (FALSE);
}
-
/*
* XDR a char
*/
@@ -407,7 +393,6 @@ xdr_bool(XDR *xdrs, bool_t *bp)
long lb;
switch (xdrs->x_op) {
-
case XDR_ENCODE:
lb = *bp ? XDR_TRUE : XDR_FALSE;
return (XDR_PUTLONG(xdrs, ));
@@ -524,7 +509,6 @@ xdr_bytes(XDR *xdrs, char **cpp, u_int *sizep, u_int m
* now deal with the actual bytes
*/
switch (xdrs->x_op) {
-
case XDR_DECODE:
if (nodesize == 0) {
return (TRUE);
@@ -614,13 +598,11 @@ xdr_union(XDR *xdrs,
(*dfault)(xdrs, unp));
}
-
/*
* Non-portable xdr primitives.
* Care should be taken when moving these routines to new architectures.
*/
-
/*
* XDR null terminated ASCII strings
* xdr_string deals with "C strings" - arrays of bytes that are
@@ -664,7 +646,6 @@ xdr_string(XDR *xdrs, char **cpp, u_int maxsize)
* now deal with the actual bytes
*/
switch (xdrs->x_op) {
-
case XDR_DECODE:
if (nodesize == 0) {
return (TRUE);
@@ -747,7 +728,6 @@ xdr_int64_t(XDR *xdrs, int64_t *llp)
return (FALSE);
}
-
/*
* XDR unsigned 64-bit integers
*/
@@ -778,7 +758,6 @@ xdr_uint64_t(XDR *xdrs, uint64_t *ullp)
return (FALSE);
}
-
/*
* XDR hypers
*/
@@ -793,7 +772,6 @@ xdr_hyper(XDR *xdrs, longlong_t *llp)
return (xdr_int64_t(xdrs, (int64_t *)llp));
}
-
/*
* XDR unsigned hypers
*/
@@ -808,7 +786,6 @@ xdr_u_hyper(XDR *xdrs, u_longlong_t *ullp)
return (xdr_uint64_t(xdrs, (uint64_t *)ullp));
}
-
/*
* XDR longlong_t's
*/
@@ -822,7 +799,6 @@ xdr_longlong_t(XDR *xdrs, longlong_t *llp)
*/
return (xdr_int64_t(xdrs, (int64_t *)llp));
}
-
/*
* XDR
svn commit: r365223 - head/sys/sys
Author: mjg
Date: Tue Sep 1 22:12:58 2020
New Revision: 365223
URL: https://svnweb.freebsd.org/changeset/base/365223
Log:
sys: clean up empty lines in .c and .h files
Modified:
head/sys/sys/_atomic64e.h
head/sys/sys/_rangeset.h
head/sys/sys/_stdarg.h
head/sys/sys/_termios.h
head/sys/sys/assym.h
head/sys/sys/ata.h
head/sys/sys/blist.h
head/sys/sys/buf_ring.h
head/sys/sys/bus.h
head/sys/sys/bus_dma_internal.h
head/sys/sys/cdio.h
head/sys/sys/chio.h
head/sys/sys/cnv.h
head/sys/sys/conf.h
head/sys/sys/copyright.h
head/sys/sys/disk.h
head/sys/sys/domainset.h
head/sys/sys/endian.h
head/sys/sys/event.h
head/sys/sys/fail.h
head/sys/sys/fcntl.h
head/sys/sys/fdcio.h
head/sys/sys/imgact_aout.h
head/sys/sys/intr.h
head/sys/sys/iov.h
head/sys/sys/ipmi.h
head/sys/sys/kernel.h
head/sys/sys/kobj.h
head/sys/sys/kthread.h
head/sys/sys/libkern.h
head/sys/sys/linker.h
head/sys/sys/lock.h
head/sys/sys/lock_profile.h
head/sys/sys/lockstat.h
head/sys/sys/mtio.h
head/sys/sys/pmc.h
head/sys/sys/posix4.h
head/sys/sys/power.h
head/sys/sys/proc.h
head/sys/sys/queue.h
head/sys/sys/random.h
head/sys/sys/rwlock.h
head/sys/sys/serial.h
head/sys/sys/socket.h
head/sys/sys/sockopt.h
head/sys/sys/soundcard.h
head/sys/sys/stats.h
head/sys/sys/stdatomic.h
head/sys/sys/sysproto.h
head/sys/sys/systm.h
head/sys/sys/tiio.h
head/sys/sys/tim_filter.h
head/sys/sys/timeet.h
head/sys/sys/timepps.h
head/sys/sys/tree.h
head/sys/sys/vnode.h
Modified: head/sys/sys/_atomic64e.h
==
--- head/sys/sys/_atomic64e.h Tue Sep 1 22:12:32 2020(r365222)
+++ head/sys/sys/_atomic64e.h Tue Sep 1 22:12:58 2020(r365223)
@@ -27,7 +27,6 @@
* $FreeBSD$
*/
-
#ifndef _SYS_ATOMIC64E_H_
#define _SYS_ATOMIC64E_H_
Modified: head/sys/sys/_rangeset.h
==
--- head/sys/sys/_rangeset.hTue Sep 1 22:12:32 2020(r365222)
+++ head/sys/sys/_rangeset.hTue Sep 1 22:12:58 2020(r365223)
@@ -48,4 +48,3 @@ struct rangeset {
};
#endif
-
Modified: head/sys/sys/_stdarg.h
==
--- head/sys/sys/_stdarg.h Tue Sep 1 22:12:32 2020(r365222)
+++ head/sys/sys/_stdarg.h Tue Sep 1 22:12:58 2020(r365223)
@@ -52,4 +52,3 @@
#endif
#endif /* ! _SYS__STDARG_H_ */
-
Modified: head/sys/sys/_termios.h
==
--- head/sys/sys/_termios.h Tue Sep 1 22:12:32 2020(r365222)
+++ head/sys/sys/_termios.h Tue Sep 1 22:12:58 2020(r365223)
@@ -146,7 +146,6 @@
#defineCNO_RTSDTR 0x0020 /* Do not assert RTS or DTR
automatically */
#endif
-
/*
* "Local" flags - dumping ground for other state
*
Modified: head/sys/sys/assym.h
==
--- head/sys/sys/assym.hTue Sep 1 22:12:32 2020(r365222)
+++ head/sys/sys/assym.hTue Sep 1 22:12:58 2020(r365223)
@@ -43,7 +43,6 @@ char name ## w1[((ASSYM_ABS(value) & 0xUL) >>
char name ## w2[((ASSYM_ABS(value) & 0xULL) >> 32) + ASSYM_BIAS]; \
char name ## w3[((ASSYM_ABS(value) & 0xULL) >> 48) +
ASSYM_BIAS]
-
/* char name ## _datatype_ ## STRINGIFY(typeof(((struct parenttype *)(0x0))->
name)) [1]; */
#ifdef OFFSET_TEST
#define OFFSET_CTASSERT CTASSERT
Modified: head/sys/sys/ata.h
==
--- head/sys/sys/ata.h Tue Sep 1 22:12:32 2020(r365222)
+++ head/sys/sys/ata.h Tue Sep 1 22:12:58 2020(r365223)
@@ -384,7 +384,6 @@ struct ata_params {
#define ATA_SA600 0x49
#define ATA_DMA_MAX 0x4f
-
/* ATA commands */
#define ATA_NOP 0x00/* NOP */
#define ATA_NF_FLUSHQUEUE 0x00/* flush queued cmd's */
@@ -517,7 +516,6 @@ struct ata_params {
#define ATA_READ_NATIVE_MAX_ADDRESS 0xf8/* read native max address */
#define ATA_SET_MAX_ADDRESS 0xf9/* set max address */
-
/* ATAPI commands */
#define ATAPI_TEST_UNIT_READY 0x00/* check if device is ready */
#define ATAPI_REZERO0x01/* rewind */
@@ -578,7 +576,6 @@ struct ata_params {
#define ATAPI_READ_CD 0xbe/* read data */
#define ATAPI_POLL_DSC 0xff/* poll DSC status bit */
-
struct ata_ioc_devices {
int channel;
charname[2][32];
@@ -629,7 +626,7 @@ struct atapi_sense {
u_int8_t specific; /* sense key specific */
#defineATA_SENSE_SPEC_VALID0x80
#defineATA_SENSE_SPEC_MASK 0x7f
-
+
svn commit: r365222 - head/sys/kern
Author: mjg
Date: Tue Sep 1 22:12:32 2020
New Revision: 365222
URL: https://svnweb.freebsd.org/changeset/base/365222
Log:
kern: clean up empty lines in .c and .h files
Modified:
head/sys/kern/imgact_elf.c
head/sys/kern/init_main.c
head/sys/kern/kern_acct.c
head/sys/kern/kern_alq.c
head/sys/kern/kern_clock.c
head/sys/kern/kern_conf.c
head/sys/kern/kern_cons.c
head/sys/kern/kern_cpu.c
head/sys/kern/kern_cpuset.c
head/sys/kern/kern_environment.c
head/sys/kern/kern_et.c
head/sys/kern/kern_event.c
head/sys/kern/kern_fail.c
head/sys/kern/kern_fork.c
head/sys/kern/kern_jail.c
head/sys/kern/kern_ktr.c
head/sys/kern/kern_linker.c
head/sys/kern/kern_lock.c
head/sys/kern/kern_lockf.c
head/sys/kern/kern_malloc.c
head/sys/kern/kern_mbuf.c
head/sys/kern/kern_module.c
head/sys/kern/kern_ntptime.c
head/sys/kern/kern_pmc.c
head/sys/kern/kern_proc.c
head/sys/kern/kern_prot.c
head/sys/kern/kern_racct.c
head/sys/kern/kern_rctl.c
head/sys/kern/kern_resource.c
head/sys/kern/kern_sendfile.c
head/sys/kern/kern_sig.c
head/sys/kern/kern_sysctl.c
head/sys/kern/kern_time.c
head/sys/kern/kern_timeout.c
head/sys/kern/kern_xxx.c
head/sys/kern/link_elf.c
head/sys/kern/link_elf_obj.c
head/sys/kern/posix4_mib.c
head/sys/kern/sched_4bsd.c
head/sys/kern/subr_blist.c
head/sys/kern/subr_bufring.c
head/sys/kern/subr_bus.c
head/sys/kern/subr_busdma_bufalloc.c
head/sys/kern/subr_counter.c
head/sys/kern/subr_csan.c
head/sys/kern/subr_devmap.c
head/sys/kern/subr_filter.c
head/sys/kern/subr_intr.c
head/sys/kern/subr_kobj.c
head/sys/kern/subr_lock.c
head/sys/kern/subr_log.c
head/sys/kern/subr_mchain.c
head/sys/kern/subr_module.c
head/sys/kern/subr_msgbuf.c
head/sys/kern/subr_power.c
head/sys/kern/subr_scanf.c
head/sys/kern/subr_smp.c
head/sys/kern/subr_terminal.c
head/sys/kern/subr_turnstile.c
head/sys/kern/subr_uio.c
head/sys/kern/subr_unit.c
head/sys/kern/subr_witness.c
head/sys/kern/sys_generic.c
head/sys/kern/sys_pipe.c
head/sys/kern/sys_socket.c
head/sys/kern/sysv_msg.c
head/sys/kern/uipc_mbuf.c
head/sys/kern/uipc_mqueue.c
head/sys/kern/uipc_sem.c
head/sys/kern/uipc_shm.c
head/sys/kern/uipc_sockbuf.c
head/sys/kern/uipc_socket.c
head/sys/kern/uipc_usrreq.c
head/sys/kern/vfs_bio.c
head/sys/kern/vfs_export.c
head/sys/kern/vfs_subr.c
Modified: head/sys/kern/imgact_elf.c
==
--- head/sys/kern/imgact_elf.c Tue Sep 1 22:11:48 2020(r365221)
+++ head/sys/kern/imgact_elf.c Tue Sep 1 22:12:32 2020(r365222)
@@ -908,7 +908,7 @@ __elfN(enforce_limits)(struct image_params *imgp, cons
}
total_size += seg_size;
}
-
+
if (data_addr == 0 && data_size == 0) {
data_addr = text_addr;
data_size = text_size;
Modified: head/sys/kern/init_main.c
==
--- head/sys/kern/init_main.c Tue Sep 1 22:11:48 2020(r365221)
+++ head/sys/kern/init_main.c Tue Sep 1 22:12:32 2020(r365222)
@@ -277,7 +277,6 @@ restart:
* Perform each task, and continue on to the next task.
*/
for (sipp = sysinit; sipp < sysinit_end; sipp++) {
-
if ((*sipp)->subsystem == SI_SUB_DUMMY)
continue; /* skip dummy task(s)*/
@@ -723,7 +722,7 @@ start_init(void *dummy)
freeenv(var);
}
free_init_path = tmp_init_path = strdup(init_path, M_TEMP);
-
+
while ((path = strsep(_init_path, ":")) != NULL) {
if (bootverbose)
printf("start_init: trying %s\n", path);
Modified: head/sys/kern/kern_acct.c
==
--- head/sys/kern/kern_acct.c Tue Sep 1 22:11:48 2020(r365221)
+++ head/sys/kern/kern_acct.c Tue Sep 1 22:12:32 2020(r365222)
@@ -635,7 +635,6 @@ acct_thread(void *dummy)
/* Loop until we are asked to exit. */
while (!(acct_state & ACCT_EXITREQ)) {
-
/* Perform our periodic checks. */
acctwatch();
Modified: head/sys/kern/kern_alq.c
==
--- head/sys/kern/kern_alq.cTue Sep 1 22:11:48 2020(r365221)
+++ head/sys/kern/kern_alq.cTue Sep 1 22:12:32 2020(r365222)
@@ -923,7 +923,7 @@ static int
alq_load_handler(module_t mod, int what, void *arg)
{
int ret;
-
+
ret = 0;
switch (what) {
Modified: head/sys/kern/kern_clock.c
==
--- head/sys/kern/kern_clock.c Tue Sep 1 22:11:48 2020(r365221)
+++ head/sys/kern/kern_clock.c Tue Sep 1 22:12:32 2020(r365222)
@@ -229,7 +229,6 @@
svn commit: r365221 - head/sys/dev/cpufreq
Author: mjg
Date: Tue Sep 1 22:11:48 2020
New Revision: 365221
URL: https://svnweb.freebsd.org/changeset/base/365221
Log:
cpufreq: clean up empty lines in .c and .h files
Modified:
head/sys/dev/cpufreq/cpufreq_dt.c
Modified: head/sys/dev/cpufreq/cpufreq_dt.c
==
--- head/sys/dev/cpufreq/cpufreq_dt.c Tue Sep 1 22:11:22 2020
(r365220)
+++ head/sys/dev/cpufreq/cpufreq_dt.c Tue Sep 1 22:11:48 2020
(r365221)
@@ -253,7 +253,6 @@ cpufreq_dt_set(device_t dev, const struct cf_setting *
return (0);
}
-
static int
cpufreq_dt_type(device_t dev, int *type)
{
@@ -546,7 +545,6 @@ cpufreq_dt_attach(device_t dev)
return (0);
}
-
static device_method_t cpufreq_dt_methods[] = {
/* Device interface */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365219 - head/sys/dev/cmx
Author: mjg
Date: Tue Sep 1 22:11:05 2020
New Revision: 365219
URL: https://svnweb.freebsd.org/changeset/base/365219
Log:
cmx: clean up empty lines in .c and .h files
Modified:
head/sys/dev/cmx/cmx.c
head/sys/dev/cmx/cmx_pccard.c
Modified: head/sys/dev/cmx/cmx.c
==
--- head/sys/dev/cmx/cmx.c Tue Sep 1 22:10:55 2020(r365218)
+++ head/sys/dev/cmx/cmx.c Tue Sep 1 22:11:05 2020(r365219)
@@ -700,4 +700,3 @@ cmx_intr(void *arg)
return;
}
#endif
-
Modified: head/sys/dev/cmx/cmx_pccard.c
==
--- head/sys/dev/cmx/cmx_pccard.c Tue Sep 1 22:10:55 2020
(r365218)
+++ head/sys/dev/cmx/cmx_pccard.c Tue Sep 1 22:11:05 2020
(r365219)
@@ -103,7 +103,6 @@ static device_method_t cmx_pccard_methods[] = {
DEVMETHOD(device_probe, cmx_pccard_probe),
DEVMETHOD(device_attach, cmx_pccard_attach),
DEVMETHOD(device_detach, cmx_detach),
-
{ 0, 0 }
};
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365218 - head/sys/dev/ciss
Author: mjg
Date: Tue Sep 1 22:10:55 2020
New Revision: 365218
URL: https://svnweb.freebsd.org/changeset/base/365218
Log:
ciss: clean up empty lines in .c and .h files
Modified:
head/sys/dev/ciss/ciss.c
head/sys/dev/ciss/cissreg.h
head/sys/dev/ciss/cissvar.h
Modified: head/sys/dev/ciss/ciss.c
==
--- head/sys/dev/ciss/ciss.cTue Sep 1 22:10:34 2020(r365217)
+++ head/sys/dev/ciss/ciss.cTue Sep 1 22:10:55 2020(r365218)
@@ -272,7 +272,6 @@ TUNABLE_INT("hw.ciss.force_transport", _force_tra
static int ciss_force_interrupt = 0;
TUNABLE_INT("hw.ciss.force_interrupt", _force_interrupt);
-
/
* CISS adapters amazingly don't have a defined programming interface
* value. (One could say some very despairing things about PCI and
@@ -1457,7 +1456,6 @@ ciss_init_logical(struct ciss_softc *sc)
sc->ciss_logical[i][j].cl_status = CISS_LD_NONEXISTENT;
}
-
for (i = 0; i < sc->ciss_cfg->max_logical_supported; i++) {
if (i < ndrives) {
struct ciss_ldrive *ld;
@@ -1476,7 +1474,6 @@ ciss_init_logical(struct ciss_softc *sc)
*/
if (ld->cl_lstatus->media_exchanged)
ciss_accept_media(sc, ld);
-
}
}
@@ -2127,7 +2124,6 @@ ciss_done(struct ciss_softc *sc, cr_qhead_t *qh)
* to the completed queue.
*/
for (;;) {
-
tag = CISS_TL_SIMPLE_FETCH_CMD(sc);
if (tag == CISS_TL_SIMPLE_OPQ_EMPTY)
break;
@@ -2229,7 +2225,6 @@ ciss_perf_msi_intr(void *arg)
mtx_unlock(>ciss_mtx);
}
-
/
* Process completed requests.
*
@@ -2482,7 +2477,6 @@ ciss_abort_request(struct ciss_request *ar)
}
#endif
-
/
* Fetch and initialise a request
*/
@@ -2983,7 +2977,6 @@ ciss_cam_action(struct cam_sim *sim, union ccb *ccb)
physical = CISS_IS_PHYSICAL(bus);
switch (ccb->ccb_h.func_code) {
-
/* perform SCSI I/O */
case XPT_SCSI_IO:
if (!ciss_cam_action_io(sim, csio))
@@ -3399,7 +3392,6 @@ ciss_cam_complete_fixup(struct ciss_softc *sc, struct
(cdb[1] & SI_EVPD) == 0 &&
(csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN &&
csio->dxfer_len >= SHORT_INQUIRY_LENGTH) {
-
inq = (struct scsi_inquiry_data *)csio->data_ptr;
target = csio->ccb_h.target_id;
bus = cam_sim_bus(xpt_path_sim(csio->ccb_h.path));
@@ -3430,7 +3422,6 @@ ciss_cam_complete_fixup(struct ciss_softc *sc, struct
}
}
-
/
* Name the device at (target)
*
@@ -4205,7 +4196,6 @@ ciss_notify_thread(void *arg)
}
ciss_release_request(cr);
-
}
sc->ciss_notify_thread = NULL;
wakeup(>ciss_notify_thread);
@@ -4478,7 +4468,6 @@ ciss_decode_ldrive_status(int status)
return(CISS_LD_OFFLINE);
}
}
-
/
* Return a name for a logical drive's organisation.
Modified: head/sys/dev/ciss/cissreg.h
==
--- head/sys/dev/ciss/cissreg.h Tue Sep 1 22:10:34 2020(r365217)
+++ head/sys/dev/ciss/cissreg.h Tue Sep 1 22:10:55 2020(r365218)
@@ -855,6 +855,4 @@ struct ciss_bmic_flush_cache {
CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IMR, \
CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_IMR) &
~(sc)->ciss_interrupt_mask)
-
-
#endif /* _KERNEL */
Modified: head/sys/dev/ciss/cissvar.h
==
--- head/sys/dev/ciss/cissvar.h Tue Sep 1 22:10:34 2020(r365217)
+++ head/sys/dev/ciss/cissvar.h Tue Sep 1 22:10:55 2020(r365218)
@@ -315,7 +315,6 @@ struct ciss_softc
sc->ciss_qstat[qname].q_max = 0;\
} while(0)
-
#define CISSQ_REQUEST_QUEUE(name, index) \
static __inline void \
ciss_initq_ ## name (struct ciss_softc *sc)\
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365220 - head/sys/dev/cpuctl
Author: mjg
Date: Tue Sep 1 22:11:22 2020
New Revision: 365220
URL: https://svnweb.freebsd.org/changeset/base/365220
Log:
cpuctl: clean up empty lines in .c and .h files
Modified:
head/sys/dev/cpuctl/cpuctl.c
Modified: head/sys/dev/cpuctl/cpuctl.c
==
--- head/sys/dev/cpuctl/cpuctl.cTue Sep 1 22:11:05 2020
(r365219)
+++ head/sys/dev/cpuctl/cpuctl.cTue Sep 1 22:11:22 2020
(r365220)
@@ -552,7 +552,6 @@ cpuctl_do_eval_cpu_features(int cpu, struct thread *td
return (0);
}
-
int
cpuctl_open(struct cdev *dev, int flags, int fmt __unused, struct thread *td)
{
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365214 - head/sys/dev/ce
Author: mjg
Date: Tue Sep 1 22:10:00 2020
New Revision: 365214
URL: https://svnweb.freebsd.org/changeset/base/365214
Log:
ce: clean up empty lines in .c and .h files
Modified:
head/sys/dev/ce/ceddk.c
head/sys/dev/ce/ceddk.h
head/sys/dev/ce/if_ce.c
Modified: head/sys/dev/ce/ceddk.c
==
--- head/sys/dev/ce/ceddk.c Tue Sep 1 22:09:41 2020(r365213)
+++ head/sys/dev/ce/ceddk.c Tue Sep 1 22:10:00 2020(r365214)
@@ -72,13 +72,13 @@ __FBSDID("$FreeBSD$");
(*last) = (item); \
(item)->next = NULL; \
} while (0)
-
+
#define CE_ENQUEUE_HEAD(list,item) \
do { \
(item)->next = list; \
list = item; \
} while (0)
-
+
#define CE_DEQUEUE(list,item) \
do { \
item = list; \
@@ -86,7 +86,7 @@ __FBSDID("$FreeBSD$");
list = (item)->next; \
} \
} while (0)
-
+
#define CE_PREREQUEST(b,c,list,item) \
do { \
item = list; \
@@ -120,7 +120,7 @@ __FBSDID("$FreeBSD$");
} \
} \
} while (0)
-
+
#define CE_LAST_ITEM(list,item) \
do { \
TAU32_UserRequest **last; \
@@ -227,7 +227,7 @@ static void TAU32_CALLBACK_TYPE ce_on_receive
len = req->Io.Rx.Received;
error = req->ErrorCode;
-
+
c->rintr++;
if (error == TAU32_SUCCESSFUL) {
if (req->Io.Rx.FrameEnd) {
@@ -247,7 +247,7 @@ static void TAU32_CALLBACK_TYPE ce_on_receive
CE_DDK_DEBUG (b, c, ("Another receive error: %x\n", error));
/* Do some procesing */
}
-
+
CE_ASSERT (!req->pInternal);
CE_ENQUEUE (c->rx_queue, req);
while (c->rx_queue) {
@@ -285,7 +285,7 @@ static void TAU32_CALLBACK_TYPE ce_on_transmit
len = req->Io.Tx.Transmitted;
error = req->ErrorCode;
-
+
c->tintr++;
if (error == TAU32_SUCCESSFUL) {
c->obytes += len;
@@ -299,10 +299,10 @@ static void TAU32_CALLBACK_TYPE ce_on_transmit
error));
/* Do some procesing */
}
-
+
CE_ENQUEUE (c->tx_queue, req);
c->tx_pending--;
-
+
if (c->transmit)
c->transmit (c, 0, len);
EXIT ();
@@ -317,7 +317,7 @@ int ce_send_packet (ce_chan_t *c, unsigned char *buf,
{
TAU32_UserRequest *req;
ce_buf_item_t *item;
-
+
ENTER ();
if (!ce_transmit_space (c)) {
@@ -372,7 +372,7 @@ static void TAU32_CALLBACK_TYPE ce_on_config_stop
TAU32_UserRequest *rreq;
ce_board_t *b = (ce_board_t *) pContext;
ce_chan_t *c = b->chan + req->Io.ChannelNumber;
-
+
ENTER ();
/* Stop all requests */
CE_ASSERT (0);/* Buggy */
@@ -397,7 +397,7 @@ static void TAU32_CALLBACK_TYPE ce_on_config_stop
break;
}
}
-
+
c->tx_pending = 0;
/* c->rx_pending = 0;*/
EXIT ();
@@ -414,7 +414,7 @@ static int ce_cfg_submit (ce_board_t *b)
req->pCallback = ce_on_config;
b->cr.pending++;
-
+
CE_DDK_DEBUG (b, (ce_chan_t *)0, ("config request pending: %d\n",
b->cr.pending));
@@ -424,7 +424,7 @@ static int ce_cfg_submit (ce_board_t *b)
b->cr.pending--;
EXIT (0);
}
-
+
EXIT (1);
}
@@ -558,7 +558,7 @@ void ce_start_chan (ce_chan_t *c, int tx, int rx, ce_b
c->tx_pending = 0;
c->rx_pending = 0;
}
-
+
/* submit rx */
while (1) {
ce_buf_item_t *item;
@@ -583,7 +583,7 @@ void ce_start_chan (ce_chan_t *c, int tx, int rx, ce_b
break;
}
}
-
+
if (tx | rx) {
TAU32_UserRequest *req;
CE_PREREQUEST (b, c, b->cr.queue, req);
@@ -599,7 +599,7 @@ void ce_start_chan (ce_chan_t *c, int tx, int rx, ce_b
return;
}
}
-
+
/* If we run just after ce_board_init we have prope values.
* Else I hope you didn't set ts to incorrect value.
*/
@@ -638,7 +638,7 @@ void ce_stop_chan (ce_chan_t *c)
req->Io.ChannelNumber = c->num;
req->pCallback = ce_on_config_stop;
b->cr.pending++;
-
+
if (!TAU32_SubmitRequest (b->ddk.pControllerObject, req)) {
CE_ENQUEUE_HEAD (b->cr.queue, req);
CE_DDK_DEBUG (b, c, ("Can't stop chan\n"));
@@ -646,7 +646,6 @@ void ce_stop_chan (ce_chan_t *c)
}
}
-
void ce_register_transmit (ce_chan_t *c,
void (*func) (ce_chan_t*, void*, int))
{
@@ -758,10 +757,10 @@ void ce_e1_timer (ce_chan_t *c)
svn commit: r365215 - head/sys/dev/cesa
Author: mjg
Date: Tue Sep 1 22:10:11 2020
New Revision: 365215
URL: https://svnweb.freebsd.org/changeset/base/365215
Log:
cesa: clean up empty lines in .c and .h files
Modified:
head/sys/dev/cesa/cesa.c
Modified: head/sys/dev/cesa/cesa.c
==
--- head/sys/dev/cesa/cesa.cTue Sep 1 22:10:00 2020(r365214)
+++ head/sys/dev/cesa/cesa.cTue Sep 1 22:10:11 2020(r365215)
@@ -1413,7 +1413,7 @@ cesa_detach(device_t dev)
{
struct cesa_softc *sc;
int i;
-
+
sc = device_get_softc(dev);
/* TODO: Wait for queued requests completion before shutdown. */
@@ -1639,7 +1639,7 @@ cesa_newsession(device_t dev, crypto_session_t cses,
struct cesa_session *cs;
struct cesa_softc *sc;
int error;
-
+
sc = device_get_softc(dev);
error = 0;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365217 - head/sys/dev/cfi
Author: mjg
Date: Tue Sep 1 22:10:34 2020
New Revision: 365217
URL: https://svnweb.freebsd.org/changeset/base/365217
Log:
cfi: clean up empty lines in .c and .h files
Modified:
head/sys/dev/cfi/cfi_bus_nexus.c
head/sys/dev/cfi/cfi_core.c
head/sys/dev/cfi/cfi_disk.c
Modified: head/sys/dev/cfi/cfi_bus_nexus.c
==
--- head/sys/dev/cfi/cfi_bus_nexus.cTue Sep 1 22:10:24 2020
(r365216)
+++ head/sys/dev/cfi/cfi_bus_nexus.cTue Sep 1 22:10:34 2020
(r365217)
@@ -72,7 +72,6 @@ static device_method_t cfi_nexus_methods[] = {
DEVMETHOD(device_probe, cfi_nexus_probe),
DEVMETHOD(device_attach,cfi_nexus_attach),
DEVMETHOD(device_detach,cfi_detach),
-
{0, 0}
};
Modified: head/sys/dev/cfi/cfi_core.c
==
--- head/sys/dev/cfi/cfi_core.c Tue Sep 1 22:10:24 2020(r365216)
+++ head/sys/dev/cfi/cfi_core.c Tue Sep 1 22:10:34 2020(r365217)
@@ -162,7 +162,7 @@ uint8_t
cfi_read_qry(struct cfi_softc *sc, u_int ofs)
{
uint8_t val;
-
+
cfi_write(sc, CFI_QRY_CMD_ADDR * sc->sc_width, CFI_QRY_CMD_DATA);
val = cfi_read(sc, ofs * sc->sc_width);
cfi_reset_default(sc);
@@ -751,12 +751,10 @@ cfi_write_block(struct cfi_softc *sc)
/* Fall through to single word case */
break;
}
-
}
/* Write the block one byte/word at a time. */
for (i = 0; i < sc->sc_wrbufsz; i += sc->sc_width) {
-
/* Avoid writing unless we are actually changing bits */
if (!neederase) {
switch (sc->sc_width) {
Modified: head/sys/dev/cfi/cfi_disk.c
==
--- head/sys/dev/cfi/cfi_disk.c Tue Sep 1 22:10:24 2020(r365216)
+++ head/sys/dev/cfi/cfi_disk.c Tue Sep 1 22:10:34 2020(r365217)
@@ -309,7 +309,6 @@ cfi_disk_getattr(struct bio *bp)
return (0);
}
-
static void
cfi_disk_strategy(struct bio *bp)
{
@@ -350,7 +349,6 @@ static device_method_t cfi_disk_methods[] = {
DEVMETHOD(device_probe, cfi_disk_probe),
DEVMETHOD(device_attach,cfi_disk_attach),
DEVMETHOD(device_detach,cfi_disk_detach),
-
{ 0, 0 }
};
static driver_t cfi_disk_driver = {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365216 - head/sys/dev/cfe
Author: mjg
Date: Tue Sep 1 22:10:24 2020
New Revision: 365216
URL: https://svnweb.freebsd.org/changeset/base/365216
Log:
cfe: clean up empty lines in .c and .h files
Modified:
head/sys/dev/cfe/cfe_api.h
head/sys/dev/cfe/cfe_error.h
head/sys/dev/cfe/cfe_ioctl.h
Modified: head/sys/dev/cfe/cfe_api.h
==
--- head/sys/dev/cfe/cfe_api.h Tue Sep 1 22:10:11 2020(r365215)
+++ head/sys/dev/cfe/cfe_api.h Tue Sep 1 22:10:24 2020(r365216)
@@ -71,7 +71,6 @@
#definecfe_strlen(x) strlen(x)
/* End customization. */
-
/* *
* Constants
* */
@@ -123,7 +122,6 @@ typedef struct {
int64_t fwi_bootarea_pa; /* PA of boot area */
int64_t fwi_bootarea_size; /* size of boot area */
} cfe_fwinfo_t;
-
/*
* cfe_strlen is handled specially: If already defined, it has been
Modified: head/sys/dev/cfe/cfe_error.h
==
--- head/sys/dev/cfe/cfe_error.hTue Sep 1 22:10:11 2020
(r365215)
+++ head/sys/dev/cfe/cfe_error.hTue Sep 1 22:10:24 2020
(r365216)
@@ -48,7 +48,6 @@
*
* */
-
#define CFE_OK 0
#define CFE_ERR -1 /* generic error */
#define CFE_ERR_INV_COMMAND-2
Modified: head/sys/dev/cfe/cfe_ioctl.h
==
--- head/sys/dev/cfe/cfe_ioctl.hTue Sep 1 22:10:11 2020
(r365215)
+++ head/sys/dev/cfe/cfe_ioctl.hTue Sep 1 22:10:24 2020
(r365216)
@@ -46,7 +46,6 @@
*
* */
-
/* *
* NVFAM and FLASH stuff
* */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365213 - head/sys/dev/cardbus
Author: mjg
Date: Tue Sep 1 22:09:41 2020
New Revision: 365213
URL: https://svnweb.freebsd.org/changeset/base/365213
Log:
cardbus: clean up empty lines in .c and .h files
Modified:
head/sys/dev/cardbus/cardbus.c
head/sys/dev/cardbus/cardbus_cis.c
Modified: head/sys/dev/cardbus/cardbus.c
==
--- head/sys/dev/cardbus/cardbus.c Tue Sep 1 22:09:26 2020
(r365212)
+++ head/sys/dev/cardbus/cardbus.c Tue Sep 1 22:09:41 2020
(r365213)
@@ -360,7 +360,6 @@ static device_method_t cardbus_methods[] = {
/* PCI interface */
DEVMETHOD(pci_alloc_devinfo,cardbus_alloc_devinfo),
-
{0,0}
};
Modified: head/sys/dev/cardbus/cardbus_cis.c
==
--- head/sys/dev/cardbus/cardbus_cis.c Tue Sep 1 22:09:26 2020
(r365212)
+++ head/sys/dev/cardbus/cardbus_cis.c Tue Sep 1 22:09:41 2020
(r365213)
@@ -108,7 +108,6 @@ static int decode_tuple(device_t cbdev, device_t child
int len, uint8_t *tupledata, uint32_t start,
uint32_t *off, struct tuple_callbacks *callbacks,
void *);
-
#defineMAKETUPLE(NAME,FUNC) { CISTPL_ ## NAME, #NAME, decode_tuple_ ##
FUNC }
static char *funcnames[] = {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365211 - head/sys/dev/md
Author: mjg
Date: Tue Sep 1 22:08:52 2020
New Revision: 365211
URL: https://svnweb.freebsd.org/changeset/base/365211
Log:
md: clean up empty lines in .c and .h files
Modified:
head/sys/dev/md/md.c
Modified: head/sys/dev/md/md.c
==
--- head/sys/dev/md/md.cTue Sep 1 22:08:39 2020(r365210)
+++ head/sys/dev/md/md.cTue Sep 1 22:08:52 2020(r365211)
@@ -226,7 +226,6 @@ struct g_class g_md_class = {
DECLARE_GEOM_CLASS(g_md_class, g_md);
-
static LIST_HEAD(, md_s) md_softc_list = LIST_HEAD_INITIALIZER(md_softc_list);
#define NINDIR (PAGE_SIZE / sizeof(uintptr_t))
@@ -444,7 +443,6 @@ s_write(struct indir *ip, off_t offset, uintptr_t ptr)
return (0);
}
-
static int
g_md_access(struct g_provider *pp, int r, int w, int e)
{
@@ -1373,7 +1371,6 @@ mdcreate_malloc(struct md_s *sc, struct md_req *mdr)
}
return (error);
}
-
static int
mdsetcred(struct md_s *sc, struct ucred *cred)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365212 - head/sys/dev/cadence
Author: mjg
Date: Tue Sep 1 22:09:26 2020
New Revision: 365212
URL: https://svnweb.freebsd.org/changeset/base/365212
Log:
cadence: clean up empty lines in .c and .h files
Modified:
head/sys/dev/cadence/if_cgem.c
Modified: head/sys/dev/cadence/if_cgem.c
==
--- head/sys/dev/cadence/if_cgem.c Tue Sep 1 22:08:52 2020
(r365211)
+++ head/sys/dev/cadence/if_cgem.c Tue Sep 1 22:09:26 2020
(r365212)
@@ -89,7 +89,6 @@ __FBSDID("$FreeBSD$");
#define MAX_DESC_RING_SIZE (MAX(CGEM_NUM_RX_DESCS*sizeof(struct cgem_rx_desc),\
CGEM_NUM_TX_DESCS*sizeof(struct cgem_tx_desc)))
-
/* Default for sysctl rxbufs. Must be < CGEM_NUM_RX_DESCS of course. */
#define DEFAULT_NUM_RX_BUFS256 /* number of receive bufs to queue. */
@@ -511,7 +510,6 @@ cgem_recv(struct cgem_softc *sc)
m_tl = _hd;
while (sc->rxring_queued > 0 &&
(sc->rxring[sc->rxring_tl_ptr].addr & CGEM_RXDESC_OWN) != 0) {
-
ctl = sc->rxring[sc->rxring_tl_ptr].ctl;
/* Grab filled mbuf. */
@@ -611,7 +609,6 @@ cgem_clean_tx(struct cgem_softc *sc)
while (sc->txring_queued > 0 &&
((ctl = sc->txring[sc->txring_tl_ptr].ctl) &
CGEM_TXDESC_USED) != 0) {
-
/* Sync cache. */
bus_dmamap_sync(sc->mbuf_dma_tag,
sc->txring_m_dmamap[sc->txring_tl_ptr],
@@ -689,7 +686,6 @@ cgem_start_locked(if_t ifp)
/* Check that there is room in the descriptor ring. */
if (sc->txring_queued >=
CGEM_NUM_TX_DESCS - TX_MAX_DMA_SEGS * 2) {
-
/* Try to make room. */
cgem_clean_tx(sc);
@@ -1135,7 +1131,6 @@ cgem_stop(struct cgem_softc *sc)
sc->mii_media_active = 0;
}
-
static int
cgem_ioctl(if_t ifp, u_long cmd, caddr_t data)
{
@@ -1625,7 +1620,6 @@ cgem_add_sysctls(device_t dev)
CTLFLAG_RD, >stats.rx_udp_csum_errs, 0,
"Number frames received with UDP checksum errors");
}
-
static int
cgem_probe(device_t dev)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365208 - head/sys/dev/mgb
Author: mjg
Date: Tue Sep 1 22:08:14 2020
New Revision: 365208
URL: https://svnweb.freebsd.org/changeset/base/365208
Log:
mgb: clean up empty lines in .c and .h files
Modified:
head/sys/dev/mgb/if_mgb.c
head/sys/dev/mgb/if_mgb.h
Modified: head/sys/dev/mgb/if_mgb.c
==
--- head/sys/dev/mgb/if_mgb.c Tue Sep 1 22:07:59 2020(r365207)
+++ head/sys/dev/mgb/if_mgb.c Tue Sep 1 22:08:14 2020(r365208)
@@ -241,7 +241,6 @@ static device_method_t mgb_iflib_methods[] = {
DEVMETHOD(ifdi_intr_enable, mgb_intr_enable_all),
DEVMETHOD(ifdi_intr_disable, mgb_intr_disable_all),
-
#if 0 /* Not yet implemented IFLIB methods */
/*
* Set multicast addresses, mtu and promiscuous mode
@@ -323,7 +322,6 @@ struct if_shared_ctx mgb_sctx_init = {
};
/*/
-
static void *
mgb_register(device_t dev)
Modified: head/sys/dev/mgb/if_mgb.h
==
--- head/sys/dev/mgb/if_mgb.h Tue Sep 1 22:07:59 2020(r365207)
+++ head/sys/dev/mgb/if_mgb.h Tue Sep 1 22:08:14 2020(r365208)
@@ -217,7 +217,6 @@
#define MGB_INTR_VEC_STS(_v) (1 << (_v))
#define MGB_INTR_RX_VEC_STS(_qid) MGB_INTR_VEC_STS((_qid) + 1)
-
#define MGB_STS_OK ( 0 )
#define MGB_STS_TIMEOUT(-1 )
@@ -322,7 +321,6 @@ struct mgb_softc {
struct mtx mtx;
struct callout watchdog;
int timer;
-
bus_dma_tag_tdma_parent_tag;
struct mgb_ring_data rx_ring_data;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365209 - head/sys/dev/mfi
Author: mjg
Date: Tue Sep 1 22:08:26 2020
New Revision: 365209
URL: https://svnweb.freebsd.org/changeset/base/365209
Log:
mfi: clean up empty lines in .c and .h files
Modified:
head/sys/dev/mfi/mfi.c
head/sys/dev/mfi/mfi_cam.c
head/sys/dev/mfi/mfi_tbolt.c
head/sys/dev/mfi/mfireg.h
head/sys/dev/mfi/mfivar.h
Modified: head/sys/dev/mfi/mfi.c
==
--- head/sys/dev/mfi/mfi.c Tue Sep 1 22:08:14 2020(r365208)
+++ head/sys/dev/mfi/mfi.c Tue Sep 1 22:08:26 2020(r365209)
@@ -362,7 +362,6 @@ mfi_addr_cb(void *arg, bus_dma_segment_t *segs, int ns
*addr = segs[0].ds_addr;
}
-
int
mfi_attach(struct mfi_softc *sc)
{
@@ -422,7 +421,6 @@ mfi_attach(struct mfi_softc *sc)
sc->mfi_issue_cmd = mfi_issue_cmd_ppc;
}
-
/* Before we get too far, see if the firmware is working */
if ((error = mfi_transition_firmware(sc)) != 0) {
device_printf(sc->mfi_dev, "Firmware not in READY state, "
@@ -1330,7 +1328,6 @@ mfi_shutdown(struct mfi_softc *sc)
struct mfi_command *cm;
int error;
-
if (sc->mfi_aen_cm != NULL) {
sc->cm_aen_abort = 1;
mfi_abort(sc, >mfi_aen_cm);
@@ -2525,7 +2522,6 @@ mfi_std_send_frame(struct mfi_softc *sc, struct mfi_co
return (0);
}
-
void
mfi_complete(struct mfi_softc *sc, struct mfi_command *cm)
{
@@ -2932,7 +2928,6 @@ mfi_check_for_sscd(struct mfi_softc *sc, struct mfi_co
mfi_release_command(ld_cm);
free(ld_info, M_MFIBUF);
-
}
return error;
}
@@ -3031,7 +3026,6 @@ mfi_user_command(struct mfi_softc *sc, struct mfi_ioc_
void *ioc_buf = NULL;
uint32_t context;
int error = 0, locked;
-
if (ioc->buf_size > 0) {
if (ioc->buf_size > 1024 * 1024)
Modified: head/sys/dev/mfi/mfi_cam.c
==
--- head/sys/dev/mfi/mfi_cam.c Tue Sep 1 22:08:14 2020(r365208)
+++ head/sys/dev/mfi/mfi_cam.c Tue Sep 1 22:08:26 2020(r365209)
@@ -474,4 +474,3 @@ mfip_cam_poll(struct cam_sim *sim)
mfisc->mfi_intr_ptr(mfisc);
}
-
Modified: head/sys/dev/mfi/mfi_tbolt.c
==
--- head/sys/dev/mfi/mfi_tbolt.cTue Sep 1 22:08:14 2020
(r365208)
+++ head/sys/dev/mfi/mfi_tbolt.cTue Sep 1 22:08:26 2020
(r365209)
@@ -31,7 +31,6 @@
* official policies,either expressed or implied, of the FreeBSD Project.
*/
-
#include
__FBSDID("$FreeBSD$");
@@ -84,7 +83,6 @@ static void mfi_queue_map_sync(struct mfi_softc *sc);
#define MFI_FUSION_ENABLE_INTERRUPT_MASK (0x0008)
-
extern int mfi_polled_cmd_timeout;
static int mfi_fw_reset_test = 0;
#ifdef MFI_DEBUG
@@ -135,7 +133,6 @@ mfi_tbolt_check_clear_intr_ppc(struct mfi_softc *sc)
return 0;
}
-
void
mfi_tbolt_issue_cmd_ppc(struct mfi_softc *sc, bus_addr_t bus_add,
uint32_t frame_cnt)
@@ -804,7 +801,6 @@ mfi_tbolt_get_request_descriptor(struct mfi_softc *sc,
return (union mfi_mpi2_request_descriptor *)p;
}
-
/* Used to build IOCTL cmd */
uint8_t
mfi_build_mpt_pass_thru(struct mfi_softc *sc, struct mfi_command *mfi_cmd)
@@ -939,7 +935,6 @@ mfi_tbolt_build_io(struct mfi_softc *sc, struct mfi_co
return 0;
}
-
static int
mfi_tbolt_make_sgl(struct mfi_softc *sc, struct mfi_command *mfi_cmd,
pMpi25IeeeSgeChain64_t sgl_ptr, struct mfi_cmd_tbolt *cmd)
@@ -1186,7 +1181,6 @@ mfi_issue_pending_cmds_again(struct mfi_softc *sc)
mtx_assert(>mfi_io_lock, MA_OWNED);
TAILQ_FOREACH_REVERSE_SAFE(cm, >mfi_busy, BUSYQ, cm_link, tmp) {
-
cm->retry_for_fw_reset++;
/*
Modified: head/sys/dev/mfi/mfireg.h
==
--- head/sys/dev/mfi/mfireg.h Tue Sep 1 22:08:14 2020(r365208)
+++ head/sys/dev/mfi/mfireg.h Tue Sep 1 22:08:26 2020(r365209)
@@ -307,7 +307,6 @@ typedef enum {
#define MR_CTRL_EVENT_WAIT_SMID 2
#define MR_INTERNAL_DRIVER_RESET_SMID 3
-
/* MFI Status codes */
typedef enum {
MFI_STAT_OK = 0x00,
@@ -1545,7 +1544,6 @@ typedef struct _MPI2_SCSI_IO_VENDOR_UNIQUE {
#define MPI2_HEADER_VERSION ((MPI2_HEADER_VERSION_UNIT << 8) | \
MPI2_HEADER_VERSION_DEV)
-
/* IOCInit Request message */
struct MPI2_IOC_INIT_REQUEST {
uint8_t WhoInit;/* 0x00 */
@@ -1685,7 +1683,6 @@ typedef struct {
uint32_tTransferLength; /* 0x1C */
} MPI2_SCSI_IO_CDB_EEDP32;
-
typedef union _MPI2_IEEE_SGE_CHAIN_UNION {
struct MPI2_IEEE_SGE_SIMPLE32 Chain32;
struct
svn commit: r365207 - head/sys/dev/mii
Author: mjg Date: Tue Sep 1 22:07:59 2020 New Revision: 365207 URL: https://svnweb.freebsd.org/changeset/base/365207 Log: mii: clean up empty lines in .c and .h files Modified: head/sys/dev/mii/amphyreg.h head/sys/dev/mii/bmtphyreg.h head/sys/dev/mii/brgphy.c head/sys/dev/mii/brgphyreg.h head/sys/dev/mii/icsphyreg.h head/sys/dev/mii/mlphy.c head/sys/dev/mii/nsphyterreg.h head/sys/dev/mii/qsphy.c head/sys/dev/mii/rlswitch.c head/sys/dev/mii/tdkphyreg.h head/sys/dev/mii/tlphyreg.h Modified: head/sys/dev/mii/amphyreg.h == --- head/sys/dev/mii/amphyreg.h Tue Sep 1 22:07:37 2020(r365206) +++ head/sys/dev/mii/amphyreg.h Tue Sep 1 22:07:59 2020(r365207) @@ -41,7 +41,6 @@ * AMD Am79C873 registers. */ - #define MII_AMPHY_DSCR 0x10/* Specified configuration register */a #define DSCR_BP4B5B0x8000 /* Bypass 4B5B encoding */ #define DSCR_BPSCR 0x4000 /* Bypass scrambler */ Modified: head/sys/dev/mii/bmtphyreg.h == --- head/sys/dev/mii/bmtphyreg.hTue Sep 1 22:07:37 2020 (r365206) +++ head/sys/dev/mii/bmtphyreg.hTue Sep 1 22:07:59 2020 (r365207) @@ -49,7 +49,6 @@ #defineAUX_CTL_BASEWANDER_DIS 0x0040 /* disable baseline wander correction */ #defineAUX_CTL_FEF_EN 0x0020 /* far-end fault enable */ - #defineMII_BMTPHY_AUX_STS 0x11/* auxiliary status */ #defineAUX_STS_FX_MODE 0x0400 /* 100base-FX mode (strap pin) */ #defineAUX_STS_LOCKED 0x0200 /* descrambler locked */ @@ -63,22 +62,17 @@ #defineAUX_STS_LOCKERROR 0x0002 /* lock error detected */ #defineAUX_STS_MLT3ERROR 0x0001 /* MLT3 code error detected */ - #defineMII_BMTPHY_RXERROR_CTR 0x12/* 100base-X Rx error counter */ #defineRXERROR_CTR_MASK0x00ff - #defineMII_BMTPHY_FCS_CTR 0x13/* 100base-X false carrier counter */ #defineFCS_CTR_MASK0x00ff - #defineMII_BMTPHY_DIS_CTR 0x14/* 100base-X disconnect counter */ #defineDIS_CTR_MASK0x00ff - #defineMII_BMTPHY_PTEST0x17/* PTEST */ - #defineMII_BMTPHY_AUX_CSR 0x18/* auxiliary control/status */ #defineAUX_CSR_JABBER_DIS 0x8000 /* jabber disable */ #defineAUX_CSR_FLINK 0x4000 /* force 10baseT link pass */ @@ -91,7 +85,6 @@ #defineAUX_CSR_SPEED 0x0002 /* 1 = 100, 0 = 10 */ #defineAUX_CSR_FDX 0x0001 /* full-duplex */ - #defineMII_BMTPHY_AUX_SS 0x19/* auxiliary status summary */ #defineAUX_SS_ACOMP0x8000 /* auto-negotiation complete */ #defineAUX_SS_ACOMP_ACK0x4000 /* auto-negotiation compl. ack */ @@ -114,7 +107,6 @@ #defineAUX_SS_ANEN 0x0002 /* auto-neg. enabled */ #defineAUX_SS_JABBER 0x0001 /* jabber detected */ - #defineMII_BMTPHY_INTR 0x1a/* interrupt register */ #defineINTR_FDX_LED0x8000 /* full-duplex led enable */ #defineINTR_INTR_EN0x4000 /* interrupt enable */ @@ -127,7 +119,6 @@ #defineINTR_LINK_CHANGE0x0002 /* link change */ #defineINTR_INTR_STATUS0x0001 /* interrupt status */ - #defineMII_BMTPHY_AUX2 0x1b/* auliliary mode 2 */ #defineAUX2_BLOCK_RXDV 0x0200 /* block RXDV mode enabled */ #defineAUX2_ANPDQ 0x0100 /* auto-neg parallel detection Q mode */ @@ -138,7 +129,6 @@ #defineAUX2_TWOLINK_LED0x0004 /* two link LEDs */ #defineAUX2_SQE_DIS0x0002 /* disable SQE pulse */ - #defineMII_BMTPHY_AUXERR 0x1c/* auxiliary error */ #defineAUXERR_MANCHESTER 0x0400 /* Manchester code error */ #defineAUXERR_EOF 0x0200 /* EOF detection error */ @@ -148,13 +138,11 @@ #defineAUXERR_SPEED0x0002 /* 1 = 100, 0 = 10 */ #defineAUXERR_FDX 0x0001 /* full-duplex */ - #defineMII_BMTPHY_AUXMODE 0x1d/* auxiliary mode */ #defineAUXMODE_ACT_LED_DIS 0x0010 /* activity LED disable */ #defineAUXMODE_LINK_LED_DIS0x0008 /* link LED disable */ #defineAUXMODE_BLOCK_TXEN 0x0002 /* enable block TXEN */ - #defineMII_BMTPHY_AUXMPHY 0x1e/* auxiliary multiple phy register */ #defineAUXMPHY_HCD_TX_FDX 0x8000 /* res. is 100baseTX-FDX */ #defineAUXMPHY_HCD_T4 0x4000 /* res. is 100baseT4 */ @@ -169,8 +157,6 @@ #defineAUXMPHY_SUPER_ISO 0x0008 /* super-isolate mode */ #define
svn commit: r365210 - head/sys/dev/mem
Author: mjg Date: Tue Sep 1 22:08:39 2020 New Revision: 365210 URL: https://svnweb.freebsd.org/changeset/base/365210 Log: mem: clean up empty lines in .c and .h files Modified: head/sys/dev/mem/memdev.c Modified: head/sys/dev/mem/memdev.c == --- head/sys/dev/mem/memdev.c Tue Sep 1 22:08:26 2020(r365209) +++ head/sys/dev/mem/memdev.c Tue Sep 1 22:08:39 2020(r365210) @@ -108,7 +108,6 @@ mem_modevent(module_t mod __unused, int type, void *da default: return(EOPNOTSUPP); - } return (0); ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365203 - in head/sys/dev/mps: . mpi
Author: mjg
Date: Tue Sep 1 22:07:00 2020
New Revision: 365203
URL: https://svnweb.freebsd.org/changeset/base/365203
Log:
mps: clean up empty lines in .c and .h files
Modified:
head/sys/dev/mps/mpi/mpi2.h
head/sys/dev/mps/mpi/mpi2_cnfg.h
head/sys/dev/mps/mpi/mpi2_hbd.h
head/sys/dev/mps/mpi/mpi2_init.h
head/sys/dev/mps/mpi/mpi2_ioc.h
head/sys/dev/mps/mpi/mpi2_ra.h
head/sys/dev/mps/mpi/mpi2_raid.h
head/sys/dev/mps/mpi/mpi2_sas.h
head/sys/dev/mps/mpi/mpi2_targ.h
head/sys/dev/mps/mpi/mpi2_tool.h
head/sys/dev/mps/mpi/mpi2_type.h
head/sys/dev/mps/mps.c
head/sys/dev/mps/mps_config.c
head/sys/dev/mps/mps_ioctl.h
head/sys/dev/mps/mps_mapping.c
head/sys/dev/mps/mps_mapping.h
head/sys/dev/mps/mps_pci.c
head/sys/dev/mps/mps_sas.c
head/sys/dev/mps/mps_sas_lsi.c
head/sys/dev/mps/mps_table.c
head/sys/dev/mps/mps_user.c
head/sys/dev/mps/mpsvar.h
Modified: head/sys/dev/mps/mpi/mpi2.h
==
--- head/sys/dev/mps/mpi/mpi2.h Tue Sep 1 22:06:41 2020(r365202)
+++ head/sys/dev/mps/mpi/mpi2.h Tue Sep 1 22:07:00 2020(r365203)
@@ -106,7 +106,6 @@
#ifndef MPI2_H
#define MPI2_H
-
/*
*
*MPI Version Definitions
@@ -133,7 +132,6 @@
#define MPI2_HEADER_VERSION_DEV_SHIFT (0)
#define MPI2_HEADER_VERSION ((MPI2_HEADER_VERSION_UNIT << 8) |
MPI2_HEADER_VERSION_DEV)
-
/*
*
*IOC State Definitions
@@ -152,7 +150,6 @@
#define MPI2_FAULT_PRODUCT_SPECIFIC_MIN (0x)
#define MPI2_FAULT_PRODUCT_SPECIFIC_MAX (0xEFFF)
-
/*
*
*System Interface Register Definitions
@@ -206,7 +203,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS
#define MPI2_DOORBELL_ADD_DWORDS_MASK (0x00FF)
#define MPI2_DOORBELL_ADD_DWORDS_SHIFT (16)
-
/*
* Defines for the WriteSequence register
*/
@@ -302,7 +298,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS
#define MPI2_REQUEST_DESCRIPTOR_POST_LOW_OFFSET (0x00C0)
#define MPI2_REQUEST_DESCRIPTOR_POST_HIGH_OFFSET(0x00C4)
-
/*
*
*Message Descriptors
@@ -333,7 +328,6 @@ typedef struct _MPI2_DEFAULT_REQUEST_DESCRIPTOR
#define MPI2_REQ_DESCRIPT_FLAGS_IOC_FIFO_MARKER (0x01)
-
/* High Priority Request Descriptor */
typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR
{
@@ -347,7 +341,6 @@ typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR
Mpi2HighPriorityRequestDescriptor_t,
MPI2_POINTER pMpi2HighPriorityRequestDescriptor_t;
-
/* SCSI IO Request Descriptor */
typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR
{
@@ -360,7 +353,6 @@ typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR
MPI2_POINTER PTR_MPI2_SCSI_IO_REQUEST_DESCRIPTOR,
Mpi2SCSIIORequestDescriptor_t, MPI2_POINTER pMpi2SCSIIORequestDescriptor_t;
-
/* SCSI Target Request Descriptor */
typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR
{
@@ -374,7 +366,6 @@ typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR
Mpi2SCSITargetRequestDescriptor_t,
MPI2_POINTER pMpi2SCSITargetRequestDescriptor_t;
-
/* RAID Accelerator Request Descriptor */
typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR
{
@@ -388,7 +379,6 @@ typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR
Mpi2RAIDAcceleratorRequestDescriptor_t,
MPI2_POINTER pMpi2RAIDAcceleratorRequestDescriptor_t;
-
/* union of Request Descriptors */
typedef union _MPI2_REQUEST_DESCRIPTOR_UNION
{
@@ -401,7 +391,6 @@ typedef union _MPI2_REQUEST_DESCRIPTOR_UNION
} MPI2_REQUEST_DESCRIPTOR_UNION, MPI2_POINTER
PTR_MPI2_REQUEST_DESCRIPTOR_UNION,
Mpi2RequestDescriptorUnion_t, MPI2_POINTER pMpi2RequestDescriptorUnion_t;
-
/* Reply Descriptors */
/* Default Reply Descriptor */
@@ -439,7 +428,6 @@ typedef struct _MPI2_ADDRESS_REPLY_DESCRIPTOR
#define MPI2_ADDRESS_REPLY_SMID_INVALID (0x00)
-
/* SCSI IO Success Reply Descriptor */
typedef struct _MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR
{
@@ -453,7 +441,6 @@ typedef struct _MPI2_SCSI_IO_SUCCESS_REPLY_DESCRIPTOR
Mpi2SCSIIOSuccessReplyDescriptor_t,
MPI2_POINTER pMpi2SCSIIOSuccessReplyDescriptor_t;
-
/* TargetAssist Success Reply Descriptor */
typedef struct _MPI2_TARGETASSIST_SUCCESS_REPLY_DESCRIPTOR
{
@@ -468,7 +455,6 @@ typedef struct _MPI2_TARGETASSIST_SUCCESS_REPLY_DESCRI
Mpi2TargetAssistSuccessReplyDescriptor_t,
MPI2_POINTER pMpi2TargetAssistSuccessReplyDescriptor_t;
-
/* Target Command Buffer Reply Descriptor */
typedef struct _MPI2_TARGET_COMMAND_BUFFER_REPLY_DESCRIPTOR
{
@@ -486,7 +472,6 @@ typedef struct _MPI2_TARGET_COMMAND_BUFFER_REPLY_DESCR
/* defines for Flags field */
#define
svn commit: r365206 - head/sys/dev/mly
Author: mjg
Date: Tue Sep 1 22:07:37 2020
New Revision: 365206
URL: https://svnweb.freebsd.org/changeset/base/365206
Log:
mly: clean up empty lines in .c and .h files
Modified:
head/sys/dev/mly/mly.c
head/sys/dev/mly/mlyvar.h
Modified: head/sys/dev/mly/mly.c
==
--- head/sys/dev/mly/mly.c Tue Sep 1 22:07:26 2020(r365205)
+++ head/sys/dev/mly/mly.c Tue Sep 1 22:07:37 2020(r365206)
@@ -123,7 +123,6 @@ static void mly_timeout(void *arg);
#endif
void mly_print_controller(int controller);
-
static d_open_tmly_user_open;
static d_close_t mly_user_close;
static d_ioctl_t mly_user_ioctl;
@@ -1411,7 +1410,6 @@ mly_periodic(void *data)
for (bus = 0; bus < sc->mly_cam_channels; bus++) {
if (MLY_BUS_IS_VALID(sc, bus)) {
for (target = 0; target < MLY_MAX_TARGETS; target++) {
-
/* ignore the controller in this scan */
if (target == sc->mly_controllerparam->initiator_id)
continue;
@@ -1504,7 +1502,7 @@ mly_start(struct mly_command *mc)
return(EBUSY);
}
mc->mc_flags |= MLY_CMD_BUSY;
-
+
/*
* It's ready, send the command.
*/
@@ -1520,7 +1518,7 @@ mly_start(struct mly_command *mc)
return(EBUSY);
}
mc->mc_flags |= MLY_CMD_BUSY;
-
+
/* copy in new command */
bcopy(mc->mc_packet->mmbox.data, pkt->mmbox.data,
sizeof(pkt->mmbox.data));
/* barrier to ensure completion of previous write before we write the
flag */
@@ -1641,7 +1639,6 @@ mly_complete(struct mly_softc *sc)
* Spin pulling commands off the completed queue and processing them.
*/
while ((mc = mly_dequeue_complete(sc)) != NULL) {
-
/*
* Free controller resources, mark command complete.
*
@@ -1746,7 +1743,7 @@ mly_alloc_commands(struct mly_softc *sc)
{
struct mly_command *mc;
inti, ncmd;
-
+
if (sc->mly_controllerinfo == NULL) {
ncmd = 4;
} else {
@@ -1801,7 +1798,6 @@ mly_release_commands(struct mly_softc *sc)
}
}
-
/
* Command-mapping helper function - populate this command's s/g table
* with the s/g entries for its data.
@@ -1916,7 +1912,6 @@ mly_unmap_command(struct mly_command *mc)
mc->mc_flags &= ~MLY_CMD_MAPPED;
}
-
/
CAM
interface
@@ -1958,7 +1953,6 @@ mly_cam_attach(struct mly_softc *sc)
if (testenv("hw.mly.register_physical_channels")) {
chn = 0;
for (i = 0; i < sc->mly_controllerinfo->physical_channels_present; i++,
chn++) {
-
if ((sc->mly_cam_sim[chn] = cam_sim_alloc(mly_cam_action,
mly_cam_poll, "mly", sc,
device_get_unit(sc->mly_dev),
>mly_lock,
@@ -2067,7 +2061,6 @@ mly_cam_action(struct cam_sim *sim, union ccb *ccb)
MLY_ASSERT_LOCKED(sc);
switch (ccb->ccb_h.func_code) {
-
/* perform SCSI I/O */
case XPT_SCSI_IO:
if (!mly_cam_action_io(sim, (struct ccb_scsiio *)>csio))
@@ -2816,7 +2809,6 @@ mly_print_controller(int controller)
}
}
#endif
-
/
Modified: head/sys/dev/mly/mlyvar.h
==
--- head/sys/dev/mly/mlyvar.h Tue Sep 1 22:07:26 2020(r365205)
+++ head/sys/dev/mly/mlyvar.h Tue Sep 1 22:07:37 2020(r365206)
@@ -309,7 +309,6 @@ struct mly_softc {
sc->mly_qstat[qname].q_max = 0; \
} while(0)
-
#define MLYQ_COMMAND_QUEUE(name, index)
\
static __inline void \
mly_initq_ ## name (struct mly_softc *sc) \
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365205 - in head/sys/dev/mmc: . host
Author: mjg
Date: Tue Sep 1 22:07:26 2020
New Revision: 365205
URL: https://svnweb.freebsd.org/changeset/base/365205
Log:
mmc: clean up empty lines in .c and .h files
Modified:
head/sys/dev/mmc/host/dwmmc.c
head/sys/dev/mmc/mmc.c
Modified: head/sys/dev/mmc/host/dwmmc.c
==
--- head/sys/dev/mmc/host/dwmmc.c Tue Sep 1 22:07:12 2020
(r365204)
+++ head/sys/dev/mmc/host/dwmmc.c Tue Sep 1 22:07:26 2020
(r365205)
@@ -1478,7 +1478,6 @@ dwmmc_cam_action(struct cam_sim *sim, union ccb *ccb)
}
case XPT_SET_TRAN_SETTINGS:
{
-
dwmmc_cam_settran_settings(sc, ccb);
ccb->ccb_h.status = CAM_REQ_CMP;
break;
Modified: head/sys/dev/mmc/mmc.c
==
--- head/sys/dev/mmc/mmc.c Tue Sep 1 22:07:12 2020(r365204)
+++ head/sys/dev/mmc/mmc.c Tue Sep 1 22:07:26 2020(r365205)
@@ -130,7 +130,6 @@ static const struct mmc_quirk mmc_quirks[] = {
*/
{ 0x70, MMC_QUIRK_OID_ANY, "V10008", MMC_QUIRK_BROKEN_TRIM },
{ 0x70, MMC_QUIRK_OID_ANY, "V10016", MMC_QUIRK_BROKEN_TRIM },
-
{ 0x0, 0x0, NULL, 0x0 }
};
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365204 - in head/sys/dev/mpr: . mpi
Author: mjg
Date: Tue Sep 1 22:07:12 2020
New Revision: 365204
URL: https://svnweb.freebsd.org/changeset/base/365204
Log:
mpr: clean up empty lines in .c and .h files
Modified:
head/sys/dev/mpr/mpi/mpi2.h
head/sys/dev/mpr/mpi/mpi2_cnfg.h
head/sys/dev/mpr/mpi/mpi2_hbd.h
head/sys/dev/mpr/mpi/mpi2_init.h
head/sys/dev/mpr/mpi/mpi2_ioc.h
head/sys/dev/mpr/mpi/mpi2_pci.h
head/sys/dev/mpr/mpi/mpi2_ra.h
head/sys/dev/mpr/mpi/mpi2_raid.h
head/sys/dev/mpr/mpi/mpi2_sas.h
head/sys/dev/mpr/mpi/mpi2_targ.h
head/sys/dev/mpr/mpi/mpi2_tool.h
head/sys/dev/mpr/mpi/mpi2_type.h
head/sys/dev/mpr/mpr.c
head/sys/dev/mpr/mpr_config.c
head/sys/dev/mpr/mpr_ioctl.h
head/sys/dev/mpr/mpr_mapping.c
head/sys/dev/mpr/mpr_pci.c
head/sys/dev/mpr/mpr_sas.c
head/sys/dev/mpr/mpr_sas_lsi.c
head/sys/dev/mpr/mpr_table.c
head/sys/dev/mpr/mpr_user.c
head/sys/dev/mpr/mprvar.h
Modified: head/sys/dev/mpr/mpi/mpi2.h
==
--- head/sys/dev/mpr/mpi/mpi2.h Tue Sep 1 22:07:00 2020(r365203)
+++ head/sys/dev/mpr/mpi/mpi2.h Tue Sep 1 22:07:12 2020(r365204)
@@ -160,7 +160,6 @@
#ifndef MPI2_H
#define MPI2_H
-
/*
*
*MPI Version Definitions
@@ -181,21 +180,18 @@
MPI2_VERSION_MINOR)
#define MPI2_VERSION_02_00 (0x0200)
-
/* minor version for MPI v2.5 compatible products */
#define MPI25_VERSION_MINOR (0x05)
#define MPI25_VERSION ((MPI2_VERSION_MAJOR << MPI2_VERSION_MAJOR_SHIFT) | \
MPI25_VERSION_MINOR)
#define MPI2_VERSION_02_05 (0x0205)
-
/* minor version for MPI v2.6 compatible products */
#define MPI26_VERSION_MINOR (0x06)
#define MPI26_VERSION ((MPI2_VERSION_MAJOR << MPI2_VERSION_MAJOR_SHIFT) | \
MPI26_VERSION_MINOR)
#define MPI2_VERSION_02_06 (0x0206)
-
/* Unit and Dev versioning for this MPI header set */
#define MPI2_HEADER_VERSION_UNIT(0x34)
#define MPI2_HEADER_VERSION_DEV (0x00)
@@ -205,7 +201,6 @@
#define MPI2_HEADER_VERSION_DEV_SHIFT (0)
#define MPI2_HEADER_VERSION ((MPI2_HEADER_VERSION_UNIT << 8) |
MPI2_HEADER_VERSION_DEV)
-
/*
*
*IOC State Definitions
@@ -224,7 +219,6 @@
#define MPI2_FAULT_PRODUCT_SPECIFIC_MIN (0x)
#define MPI2_FAULT_PRODUCT_SPECIFIC_MAX (0xEFFF)
-
/*
*
*System Interface Register Definitions
@@ -280,7 +274,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS
#define MPI2_DOORBELL_ADD_DWORDS_MASK (0x00FF)
#define MPI2_DOORBELL_ADD_DWORDS_SHIFT (16)
-
/*
* Defines for the WriteSequence register
*/
@@ -371,7 +364,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS
#define MPI2_RPHI_MSIX_INDEX_SHIFT (24)
#define MPI25_SUP_REPLY_POST_HOST_INDEX_OFFSET (0x030C) /* MPI v2.5 only
*/
-
/*
* Defines for the HCBSize and address
*/
@@ -397,7 +389,6 @@ typedef volatile struct _MPI2_SYSTEM_INTERFACE_REGS
#define MPI2_REQUEST_DESCRIPTOR_POST_HIGH_OFFSET(0x00C4)
#define MPI26_ATOMIC_REQUEST_DESCRIPTOR_POST_OFFSET (0x00C8)
-
/* Hard Reset delay timings */
#define MPI2_HARD_RESET_PCIE_FIRST_READ_DELAY_MICRO_SEC (5)
#define MPI2_HARD_RESET_PCIE_RESET_READ_WINDOW_MICRO_SEC(255000)
@@ -436,7 +427,6 @@ typedef struct _MPI2_DEFAULT_REQUEST_DESCRIPTOR
#define MPI2_REQ_DESCRIPT_FLAGS_IOC_FIFO_MARKER (0x01)
-
/* High Priority Request Descriptor */
typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR
{
@@ -450,7 +440,6 @@ typedef struct _MPI2_HIGH_PRIORITY_REQUEST_DESCRIPTOR
Mpi2HighPriorityRequestDescriptor_t,
MPI2_POINTER pMpi2HighPriorityRequestDescriptor_t;
-
/* SCSI IO Request Descriptor */
typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR
{
@@ -463,7 +452,6 @@ typedef struct _MPI2_SCSI_IO_REQUEST_DESCRIPTOR
MPI2_POINTER PTR_MPI2_SCSI_IO_REQUEST_DESCRIPTOR,
Mpi2SCSIIORequestDescriptor_t, MPI2_POINTER pMpi2SCSIIORequestDescriptor_t;
-
/* SCSI Target Request Descriptor */
typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR
{
@@ -477,7 +465,6 @@ typedef struct _MPI2_SCSI_TARGET_REQUEST_DESCRIPTOR
Mpi2SCSITargetRequestDescriptor_t,
MPI2_POINTER pMpi2SCSITargetRequestDescriptor_t;
-
/* RAID Accelerator Request Descriptor */
typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR
{
@@ -491,7 +478,6 @@ typedef struct _MPI2_RAID_ACCEL_REQUEST_DESCRIPTOR
Mpi2RAIDAcceleratorRequestDescriptor_t,
MPI2_POINTER pMpi2RAIDAcceleratorRequestDescriptor_t;
-
/* Fast Path SCSI IO Request Descriptor */
typedef MPI2_SCSI_IO_REQUEST_DESCRIPTOR
svn commit: r365202 - in head/sys/dev/mpt: . mpilib
Author: mjg
Date: Tue Sep 1 22:06:41 2020
New Revision: 365202
URL: https://svnweb.freebsd.org/changeset/base/365202
Log:
mpt: clean up empty lines in .c and .h files
Modified:
head/sys/dev/mpt/mpilib/mpi.h
head/sys/dev/mpt/mpilib/mpi_cnfg.h
head/sys/dev/mpt/mpilib/mpi_fc.h
head/sys/dev/mpt/mpilib/mpi_init.h
head/sys/dev/mpt/mpilib/mpi_ioc.h
head/sys/dev/mpt/mpilib/mpi_lan.h
head/sys/dev/mpt/mpilib/mpi_log_fc.h
head/sys/dev/mpt/mpilib/mpi_log_sas.h
head/sys/dev/mpt/mpilib/mpi_raid.h
head/sys/dev/mpt/mpilib/mpi_sas.h
head/sys/dev/mpt/mpilib/mpi_targ.h
head/sys/dev/mpt/mpilib/mpi_tool.h
head/sys/dev/mpt/mpilib/mpi_type.h
head/sys/dev/mpt/mpt.c
head/sys/dev/mpt/mpt.h
head/sys/dev/mpt/mpt_cam.c
head/sys/dev/mpt/mpt_debug.c
head/sys/dev/mpt/mpt_raid.c
head/sys/dev/mpt/mpt_user.c
Modified: head/sys/dev/mpt/mpilib/mpi.h
==
--- head/sys/dev/mpt/mpilib/mpi.h Tue Sep 1 22:06:23 2020
(r365201)
+++ head/sys/dev/mpt/mpilib/mpi.h Tue Sep 1 22:06:41 2020
(r365202)
@@ -118,7 +118,6 @@
#ifndef MPI_H
#define MPI_H
-
/*
*
*M P IV e r s i o nD e f i n i t i o n s
@@ -175,7 +174,6 @@
#define MPI_FAULT_DATA_RECEIVE_PCI_PARITY_ERROR (0x8117)
#define MPI_FAULT_DATA_RECEIVE_PCI_BUS_FAULT(0x8118)
-
/*
*
*P C IS y s t e mI n t e r f a c eR e g i s t e r s
@@ -206,7 +204,6 @@
#define MPI_DB_HPBAC_DISABLE_ACCESS (0x02)
#define MPI_DB_HPBAC_FREE_BUFFER(0x03)
-
#define MPI_WRITE_SEQUENCE_OFFSET (0x0004)
#define MPI_WRSEQ_KEY_VALUE_MASK(0x000F)
#define MPI_WRSEQ_1ST_KEY_VALUE (0x04)
@@ -250,8 +247,6 @@
#define MPI_HI_PRI_REQUEST_QUEUE_OFFSET (0x0048)
-
-
/*
*
*M e s s a g eF r a m eD e s c r i p t o r s
@@ -273,7 +268,6 @@
#define MPI_CONTEXT_REPLY_TYPE_SHIFT(29)
#define MPI_CONTEXT_REPLY_CONTEXT_MASK (0x1FFF)
-
//
/* Context Reply macros */
//
@@ -286,7 +280,6 @@
(((typ) << MPI_CONTEXT_REPLY_TYPE_SHIFT) & \
MPI_CONTEXT_REPLY_TYPE_MASK))
-
/*
*
*M e s s a g eF u n c t i o n s
@@ -354,7 +347,6 @@
#define MPI_FUNCTION_REPLY_FRAME_REMOVAL(0x43)
#define MPI_FUNCTION_HOST_PAGEBUF_ACCESS_CONTROL(0x44)
-
/* standard version format */
typedef struct _MPI_VERSION_STRUCT
{
@@ -372,7 +364,6 @@ typedef union _MPI_VERSION_FORMAT
} MPI_VERSION_FORMAT, MPI_POINTER PTR_MPI_VERSION_FORMAT,
MpiVersionFormat_t, MPI_POINTER pMpiVersionFormat_t;
-
/*
*
*S c a t t e rG a t h e rE l e m e n t s
@@ -508,7 +499,6 @@ typedef struct _SGE_TRANSACTION_UNION
} SGE_TRANSACTION_UNION, MPI_POINTER PTR_SGE_TRANSACTION_UNION,
SGETransactionUnion_t, MPI_POINTER pSGETransactionUnion_t;
-
//
/* SGE IO types union for IO SGL's*/
//
@@ -553,7 +543,6 @@ typedef struct _SGE_MPI_UNION
MPI_SGE_UNION_t, MPI_POINTER pMPI_SGE_UNION_t,
SGEAllUnion_t, MPI_POINTER pSGEAllUnion_t;
-
//
/* SGE field definition and masks */
//
@@ -604,7 +593,6 @@ typedef struct _SGE_MPI_UNION
#define MPI_SGE_CHAIN_OFFSET_MASK (0x00FF)
#define MPI_SGE_CHAIN_OFFSET_SHIFT (16)
-
//
/* SGE operation Macros*/
//
@@ -626,8 +614,6 @@ typedef struct _SGE_MPI_UNION
#define MPI_GET_CHAIN_OFFSET(x)
((x_SGE_CHAIN_OFFSET_MASK)>>MPI_SGE_CHAIN_OFFSET_SHIFT)
-
-
/*
*
*S t a n d a r dM e s s a g eS t r u c t u r e s
@@ -649,7 +635,6 @@ typedef struct _MSG_REQUEST_HEADER
} MSG_REQUEST_HEADER, MPI_POINTER PTR_MSG_REQUEST_HEADER,
MPIHeader_t,
svn commit: r365200 - head/sys/dev/mthca
Author: mjg
Date: Tue Sep 1 22:06:07 2020
New Revision: 365200
URL: https://svnweb.freebsd.org/changeset/base/365200
Log:
mthca: clean up empty lines in .c and .h files
Modified:
head/sys/dev/mthca/mthca_cmd.c
head/sys/dev/mthca/mthca_mad.c
head/sys/dev/mthca/mthca_mr.c
head/sys/dev/mthca/mthca_qp.c
Modified: head/sys/dev/mthca/mthca_cmd.c
==
--- head/sys/dev/mthca/mthca_cmd.c Tue Sep 1 22:05:53 2020
(r365199)
+++ head/sys/dev/mthca/mthca_cmd.c Tue Sep 1 22:06:07 2020
(r365200)
@@ -301,7 +301,6 @@ static int mthca_cmd_post(struct mthca_dev *dev,
return err;
}
-
static int mthca_status_to_errno(u8 status)
{
static const int trans_table[] = {
@@ -331,7 +330,6 @@ static int mthca_status_to_errno(u8 status)
return trans_table[status];
}
-
static int mthca_cmd_poll(struct mthca_dev *dev,
u64 in_param,
Modified: head/sys/dev/mthca/mthca_mad.c
==
--- head/sys/dev/mthca/mthca_mad.c Tue Sep 1 22:05:53 2020
(r365199)
+++ head/sys/dev/mthca/mthca_mad.c Tue Sep 1 22:06:07 2020
(r365200)
@@ -311,7 +311,6 @@ int mthca_create_agents(struct mthca_dev *dev)
dev->send_agent[p][q] = agent;
}
-
for (p = 1; p <= dev->limits.num_ports; ++p) {
ret = mthca_update_rate(dev, p);
if (ret) {
Modified: head/sys/dev/mthca/mthca_mr.c
==
--- head/sys/dev/mthca/mthca_mr.c Tue Sep 1 22:05:53 2020
(r365199)
+++ head/sys/dev/mthca/mthca_mr.c Tue Sep 1 22:06:07 2020
(r365200)
@@ -713,7 +713,6 @@ static inline int mthca_check_fmr(struct mthca_fmr *fm
return 0;
}
-
int mthca_tavor_map_phys_fmr(struct ib_fmr *ibfmr, u64 *page_list,
int list_len, u64 iova)
{
@@ -869,7 +868,6 @@ int mthca_init_mr_table(struct mthca_dev *dev)
if (!mthca_is_memfree(dev) &&
(dev->mthca_flags & MTHCA_FLAG_FMR)) {
-
addr = pci_resource_start(dev->pdev, 4) +
((pci_resource_len(dev->pdev, 4) - 1) &
dev->mr_table.mpt_base);
Modified: head/sys/dev/mthca/mthca_qp.c
==
--- head/sys/dev/mthca/mthca_qp.c Tue Sep 1 22:05:53 2020
(r365199)
+++ head/sys/dev/mthca/mthca_qp.c Tue Sep 1 22:06:07 2020
(r365200)
@@ -1086,7 +1086,6 @@ static int mthca_map_memfree(struct mthca_dev *dev,
qp->qpn << dev->qp_table.rdb_shift);
if (ret)
goto err_eqpc;
-
}
return 0;
@@ -1218,7 +1217,6 @@ static int mthca_alloc_qp_common(struct mthca_dev *dev
next->nda_op = htonli + 1) % qp->rq.max) <<
qp->rq.wqe_shift) | 1);
}
-
}
qp->sq.last = get_send_wqe(qp, qp->sq.max - 1);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365201 - head/sys/dev/mrsas
Author: mjg
Date: Tue Sep 1 22:06:23 2020
New Revision: 365201
URL: https://svnweb.freebsd.org/changeset/base/365201
Log:
mrsas: clean up empty lines in .c and .h files
Modified:
head/sys/dev/mrsas/mrsas.c
head/sys/dev/mrsas/mrsas.h
head/sys/dev/mrsas/mrsas_cam.c
head/sys/dev/mrsas/mrsas_fp.c
head/sys/dev/mrsas/mrsas_ioctl.h
Modified: head/sys/dev/mrsas/mrsas.c
==
--- head/sys/dev/mrsas/mrsas.c Tue Sep 1 22:06:07 2020(r365200)
+++ head/sys/dev/mrsas/mrsas.c Tue Sep 1 22:06:23 2020(r365201)
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-
/*
* Function prototypes
*/
@@ -177,7 +176,6 @@ void
mrsas_write_64bit_req_desc(struct mrsas_softc *sc, u_int32_t req_desc_lo,
u_int32_t req_desc_hi);
-
SYSCTL_NODE(_hw, OID_AUTO, mrsas, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
"MRSAS Driver Parameters");
@@ -314,7 +312,6 @@ mrsas_read_reg(struct mrsas_softc *sc, int offset)
return ((u_int32_t)bus_space_read_4(bus_tag, bus_handle, offset));
}
-
/*
* Interrupt Disable/Enable/Clear Functions
*
@@ -650,7 +647,6 @@ dcmd_timeout:
return retcode;
}
-
/*
* mrsas_register_aen:Register for asynchronous event
notification
* @sc: Adapter soft state
@@ -685,7 +681,6 @@ mrsas_register_aen(struct mrsas_softc *sc, u_int32_t s
curr_aen.word = class_locale_word;
if (sc->aen_cmd) {
-
prev_aen.word = sc->aen_cmd->frame->dcmd.mbox.w[1];
/*
@@ -779,7 +774,6 @@ mrsas_start_aen(struct mrsas_softc *sc)
struct mrsas_evt_log_info eli;
union mrsas_evt_class_locale class_locale;
-
/* Get the latest sequence number from FW */
memset(, 0, sizeof(eli));
@@ -905,7 +899,6 @@ mrsas_attach(device_t dev)
case MRSAS_AERO_10E7:
device_printf(dev, "Adapter is in non-secure mode\n");
return SUCCESS;
-
}
mrsas_get_tunables(sc);
@@ -1263,7 +1256,6 @@ mrsas_free_mem(struct mrsas_softc *sc)
if (sc->verbuf_tag != NULL)
bus_dma_tag_destroy(sc->verbuf_tag);
-
/*
* Free sense buffer memory
*/
@@ -2487,7 +2479,6 @@ mrsas_init_fw(struct mrsas_softc *sc)
}
megasas_setup_jbod_map(sc);
-
memset(sc->target_list, 0,
MRSAS_MAX_TM_TARGETS * sizeof(struct mrsas_target));
for (i = 0; i < MRSAS_MAX_TM_TARGETS; i++)
@@ -3132,7 +3123,6 @@ mrsas_ocr_thread(void *arg)
fw_state = fw_status & MFI_STATE_MASK;
if (fw_state == MFI_STATE_FAULT || sc->do_timedout_reset ||
mrsas_atomic_read(>target_reset_outstanding)) {
-
/* First, freeze further IOs to come to the SIM */
mrsas_xpt_freeze(sc);
@@ -3526,7 +3516,6 @@ mrsas_wait_for_outstanding(struct mrsas_softc *sc, u_i
int i, outstanding, retval = 0;
u_int32_t fw_state, count, MSIxIndex;
-
for (i = 0; i < MRSAS_RESET_WAIT_TIME; i++) {
if (sc->remove_in_progress) {
mrsas_dprint(sc, MRSAS_OCR,
@@ -3592,7 +3581,6 @@ mrsas_release_mfi_cmd(struct mrsas_mfi_cmd *cmd_mfi)
struct mrsas_softc *sc = cmd_mfi->sc;
struct mrsas_mpt_cmd *cmd_mpt;
-
mtx_lock(>mfi_cmd_pool_lock);
/*
* Release the mpt command (if at all it is allocated
@@ -4094,7 +4082,6 @@ mrsas_complete_mptmfi_passthru(struct mrsas_softc *sc,
if ((cmd->frame->dcmd.opcode ==
MR_DCMD_SYSTEM_PD_MAP_GET_INFO) &&
(cmd->frame->dcmd.mbox.b[0] == 1)) {
-
mtx_lock(>raidmap_lock);
sc->jbod_seq_cmd = NULL;
mrsas_release_mfi_cmd(cmd);
@@ -5021,7 +5008,6 @@ skip_register_aen:
return;
}
-
/*
* mrsas_complete_aen: Completes AEN command
Modified: head/sys/dev/mrsas/mrsas.h
==
--- head/sys/dev/mrsas/mrsas.h Tue Sep 1 22:06:07 2020(r365200)
+++ head/sys/dev/mrsas/mrsas.h Tue Sep 1 22:06:23 2020(r365201)
@@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$");
#include /* For pci_get macros! */
#include
-
#defineIOCTL_SEMA_DESCRIPTION "mrsas semaphore for MFI pool"
/*
@@ -101,7 +100,6 @@ __FBSDID("$FreeBSD$");
#defineMRSAS_AERO_10E6 0x10E6
#defineMRSAS_AERO_10E7 0x10E7
-
/*
* Firmware State Defines
*/
@@ -167,7 +165,6 @@ do {\
device_printf(sc->mrsas_dev, msg, ##args); \
} while (0)
-
/
* Raid Context structure which describes MegaRAID specific IO Paramenters
* This resides at offset 0x60 where the SGL
svn commit: r365199 - head/sys/dev/mvs
Author: mjg
Date: Tue Sep 1 22:05:53 2020
New Revision: 365199
URL: https://svnweb.freebsd.org/changeset/base/365199
Log:
mvs: clean up empty lines in .c and .h files
Modified:
head/sys/dev/mvs/mvs.c
head/sys/dev/mvs/mvs_pci.c
Modified: head/sys/dev/mvs/mvs.c
==
--- head/sys/dev/mvs/mvs.c Tue Sep 1 22:05:39 2020(r365198)
+++ head/sys/dev/mvs/mvs.c Tue Sep 1 22:05:53 2020(r365199)
@@ -929,7 +929,6 @@ mvs_legacy_intr(device_t dev, int poll)
ireason = ATA_INB(ch->r_mem,ATA_IREASON);
switch ((ireason & (ATA_I_CMD | ATA_I_IN)) |
(status & ATA_S_DRQ)) {
-
case ATAPI_P_CMDOUT:
device_printf(dev, "ATAPI CMDOUT\n");
/* Return wait for interrupt */
@@ -1181,7 +1180,6 @@ mvs_tfd_write(device_t dev, union ccb *ccb)
ATA_OUTB(ch->r_mem, ATA_COMMAND, cmd->command);
}
-
/* Must be called with channel locked. */
static void
mvs_begin_transaction(device_t dev, union ccb *ccb)
@@ -2456,4 +2454,3 @@ mvspoll(struct cam_sim *sim)
mvs_reset_to(ch->dev);
}
}
-
Modified: head/sys/dev/mvs/mvs_pci.c
==
--- head/sys/dev/mvs/mvs_pci.c Tue Sep 1 22:05:39 2020(r365198)
+++ head/sys/dev/mvs/mvs_pci.c Tue Sep 1 22:05:53 2020(r365199)
@@ -525,4 +525,3 @@ MODULE_PNP_INFO("W32:vendor/device", pci, mvs, mvs_ids
nitems(mvs_ids) - 1);
MODULE_VERSION(mvs, 1);
MODULE_DEPEND(mvs, cam, 1, 1, 1);
-
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365196 - head/sys/dev/mxge
Author: mjg
Date: Tue Sep 1 22:05:00 2020
New Revision: 365196
URL: https://svnweb.freebsd.org/changeset/base/365196
Log:
mxge: clean up empty lines in .c and .h files
Modified:
head/sys/dev/mxge/if_mxge.c
head/sys/dev/mxge/if_mxge_var.h
head/sys/dev/mxge/mcp_gen_header.h
head/sys/dev/mxge/mxge_eth_z8e.c
head/sys/dev/mxge/mxge_ethp_z8e.c
head/sys/dev/mxge/mxge_mcp.h
head/sys/dev/mxge/mxge_rss_eth_z8e.c
head/sys/dev/mxge/mxge_rss_ethp_z8e.c
Modified: head/sys/dev/mxge/if_mxge.c
==
--- head/sys/dev/mxge/if_mxge.c Tue Sep 1 22:04:37 2020(r365195)
+++ head/sys/dev/mxge/if_mxge.c Tue Sep 1 22:05:00 2020(r365196)
@@ -159,7 +159,6 @@ mxge_probe(device_t dev)
{
int rev;
-
if ((pci_get_vendor(dev) == MXGE_PCI_VENDOR_MYRICOM) &&
((pci_get_device(dev) == MXGE_PCI_DEVICE_Z8E) ||
(pci_get_device(dev) == MXGE_PCI_DEVICE_Z8E_9))) {
@@ -201,7 +200,6 @@ mxge_enable_wc(mxge_softc_t *sc)
#endif
}
-
/* callback to get our DMA address */
static void
mxge_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nsegs,
@@ -272,7 +270,6 @@ abort_with_dmat:
return err;
}
-
static void
mxge_dma_free(mxge_dma_t *dma)
{
@@ -351,7 +348,6 @@ mxge_enable_nvidia_ecrc(mxge_softc_t *sc)
uintptr_t bus, slot, func, ivend, idev;
uint32_t *ptr32;
-
if (!mxge_nvidia_ecrc_enable)
return;
@@ -427,7 +423,6 @@ mxge_enable_nvidia_ecrc(mxge_softc_t *sc)
/* map it into the kernel */
va = pmap_mapdev(trunc_page((vm_paddr_t)off), PAGE_SIZE);
-
if (va == NULL) {
device_printf(sc->dev, "pmap_kenter_temporary didn't\n");
@@ -473,7 +468,6 @@ mxge_enable_nvidia_ecrc(mxge_softc_t *sc)
}
#endif
-
static int
mxge_dma_test(mxge_softc_t *sc, int test_type)
{
@@ -483,7 +477,6 @@ mxge_dma_test(mxge_softc_t *sc, int test_type)
uint32_t len;
char *test = " ";
-
/* Run a small DMA test.
* The magic multipliers to the length tell the firmware
* to do DMA read, write, or read+write tests. The
@@ -657,7 +650,6 @@ static int
mxge_validate_firmware(mxge_softc_t *sc, const mcp_gen_header_t *hdr)
{
-
if (be32toh(hdr->mcp_type) != MCP_TYPE_ETH) {
device_printf(sc->dev, "Bad firmware type: 0x%x\n",
be32toh(hdr->mcp_type));
@@ -704,8 +696,6 @@ mxge_load_firmware_helper(mxge_softc_t *sc, uint32_t *
return ENOENT;
}
-
-
/* setup zlib and decompress f/w */
bzero(, sizeof (zs));
zs.zalloc = zcalloc_nowait;
@@ -805,7 +795,6 @@ mxge_dummy_rdma(mxge_softc_t *sc, int enable)
buf[4] = htobe32(dma_low); /* dummy addr LSW */
buf[5] = htobe32(enable); /* enable? */
-
submit = (volatile char *)(sc->sram + MXGEFW_BOOT_DUMMY_RDMA);
mxge_pio_copy(submit, buf, 64);
@@ -946,7 +935,6 @@ mxge_adopt_running_firmware(mxge_softc_t *sc)
return status;
}
-
static int
mxge_load_firmware(mxge_softc_t *sc, int adopt)
{
@@ -1039,7 +1027,6 @@ mxge_update_mac_address(mxge_softc_t *sc)
uint8_t *addr = sc->mac_addr;
int status;
-
cmd.data0 = ((addr[0] << 24) | (addr[1] << 16)
| (addr[2] << 8) | addr[3]);
@@ -1133,10 +1120,10 @@ mxge_set_multicast_list(mxge_softc_t *sc)
" error status: %d\n", err);
return;
}
-
+
if (sc->adopted_rx_filter_bug)
return;
-
+
if (ifp->if_flags & IFF_ALLMULTI)
/* request to disable multicast filtering, so quit here */
return;
@@ -1211,7 +1198,6 @@ mxge_reset(mxge_softc_t *sc, int interrupts_setup)
mxge_dummy_rdma(sc, 1);
-
/* set the intrq size */
cmd.data0 = sc->rx_ring_size;
status = mxge_send_cmd(sc, MXGEFW_CMD_SET_INTRQ_SIZE, );
@@ -1226,7 +1212,7 @@ mxge_reset(mxge_softc_t *sc, int interrupts_setup)
* MXGEFW_CMD_SET_INTRQ_SIZE, since the intrq size is used by
* the firmware to compute offsets.
*/
-
+
if (sc->num_slices > 1) {
/* ask the maximum number of slices it supports */
status = mxge_send_cmd(sc, MXGEFW_CMD_GET_MAX_RSS_QUEUES,
@@ -1254,7 +1240,6 @@ mxge_reset(mxge_softc_t *sc, int interrupts_setup)
}
}
-
if (interrupts_setup) {
/* Now exchange information about interrupts */
for (slice = 0; slice < sc->num_slices; slice++) {
@@ -1271,14 +1256,12 @@ mxge_reset(mxge_softc_t *sc, int interrupts_setup)
status |= mxge_send_cmd(sc,
MXGEFW_CMD_GET_INTR_COAL_DELAY_OFFSET, );
-
sc->intr_coal_delay_ptr = (volatile uint32_t *)(sc->sram + cmd.data0);
svn commit: r365198 - head/sys/dev/mwl
Author: mjg
Date: Tue Sep 1 22:05:39 2020
New Revision: 365198
URL: https://svnweb.freebsd.org/changeset/base/365198
Log:
mwl: clean up empty lines in .c and .h files
Modified:
head/sys/dev/mwl/if_mwl.c
head/sys/dev/mwl/if_mwl_pci.c
head/sys/dev/mwl/mwlreg.h
Modified: head/sys/dev/mwl/if_mwl.c
==
--- head/sys/dev/mwl/if_mwl.c Tue Sep 1 22:05:21 2020(r365197)
+++ head/sys/dev/mwl/if_mwl.c Tue Sep 1 22:05:39 2020(r365198)
@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
#include
#include
-
+
#include
#include
#include
Modified: head/sys/dev/mwl/if_mwl_pci.c
==
--- head/sys/dev/mwl/if_mwl_pci.c Tue Sep 1 22:05:21 2020
(r365197)
+++ head/sys/dev/mwl/if_mwl_pci.c Tue Sep 1 22:05:39 2020
(r365198)
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
#include
#include
-
+
#include
#include
#include
@@ -98,7 +98,6 @@ static const struct mwl_pci_ident mwl_pci_ids[] = {
{ 0x11ab, 0x2a0c, "Marvell 88W8363" },
{ 0x11ab, 0x2a21, "Marvell 88W8363" },
{ 0x11ab, 0x2a24, "Marvell 88W8363" },
-
{ 0, 0, NULL }
};
@@ -280,7 +279,6 @@ static device_method_t mwl_pci_methods[] = {
DEVMETHOD(device_shutdown, mwl_pci_shutdown),
DEVMETHOD(device_suspend, mwl_pci_suspend),
DEVMETHOD(device_resume,mwl_pci_resume),
-
{ 0,0 }
};
static driver_t mwl_pci_driver = {
Modified: head/sys/dev/mwl/mwlreg.h
==
--- head/sys/dev/mwl/mwlreg.h Tue Sep 1 22:05:21 2020(r365197)
+++ head/sys/dev/mwl/mwlreg.h Tue Sep 1 22:05:39 2020(r365198)
@@ -57,7 +57,6 @@
#define MACREG_REG_A2H_INTERRUPT_CLEAR_SEL 0x0C38 // (From ARM to
host)
#define MACREG_REG_A2H_INTERRUPT_STATUS_MASK0x0C3C // (From ARM to
host)
-
// Map to 0x8000 on BAR1
#define MACREG_REG_GEN_PTR 0x0C10
#define MACREG_REG_INT_CODE 0x0C14
@@ -101,7 +100,6 @@
#define MACREG_A2HRIC_BIT_MASK ISR_SRC_BITS
-
// Bit definitio for MACREG_REG_H2A_INTERRUPT_CAUSE (H2ARIC)
#define MACREG_H2ARIC_BIT_PPA_READY0x0001 // bit 0
#define MACREG_H2ARIC_BIT_DOOR_BELL0x0002 // bit 1
@@ -341,7 +339,6 @@ struct mwl_rxdesc {
#define HostCmd_RESULT_BUSY 0x0004 // System is busy
(command ignored)
#define HostCmd_RESULT_PARTIAL_DATA 0x0005 // Data buffer is not
big enough
-
/*
// Definition of action or option for each command
//
@@ -377,7 +374,6 @@ struct mwl_rxdesc {
#define HostCmd_WEP_KEY_INDEX_MASK 0x3fff
-
// Define action or option for HostCmd_CMD_802_11_RESET
#define HostCmd_ACT_HALT0x0001
#define HostCmd_ACT_RESTART 0x0002
@@ -485,7 +481,6 @@ typedef struct {
u_int32_t Enable; /* FALSE: Disable or TRUE: Enable */
} __packed HostCmd_DS_BSS_START;
-
typedef struct {
u_int8_tElemId;
u_int8_tLen;
@@ -704,7 +699,7 @@ typedef struct {
uint32_t FixedRate; // legacy rate(not index) or an MCS code.
uint32_t RetryCount;
} __packed FIXED_RATE_ENTRY;
-
+
typedef struct {
FWCmdHdr CmdHdr;
uint32_tAction;//HostCmd_ACT_GEN_GET 0x
@@ -723,7 +718,7 @@ typedef struct {
uint32_t EntryCount;
FIXED_RATE_ENTRY FixedRateTable[4];
} __packed USE_FIXED_RATE_INFO;
-
+
typedef struct {
FWCmdHdrCmdHdr;
uint32_tAction;
@@ -745,7 +740,6 @@ typedef struct {
uint8_t Slot; // Slot=0 if regular, Slot=1 if short.
} __packed HostCmd_FW_SET_SLOT;
-
// Define data structure for HostCmd_CMD_802_11_GET_STAT
typedef struct {
FWCmdHdrCmdHdr;
@@ -778,7 +772,6 @@ typedef struct {
uint32_t RxExcludedFrames;
} __packed HostCmd_DS_802_11_GET_STAT;
-
// Define data structure for HostCmd_CMD_MAC_REG_ACCESS
typedef struct {
FWCmdHdrCmdHdr;
@@ -806,7 +799,6 @@ typedef struct {
uint8_t Reserverd[3];
} __packed HostCmd_DS_RF_REG_ACCESS;
-
// Define data structure for HostCmd_CMD_802_11_RADIO_CONTROL
typedef struct {
FWCmdHdrCmdHdr;
@@ -815,7 +807,6 @@ typedef struct {
uint16_t RadioOn;
} __packed HostCmd_DS_802_11_RADIO_CONTROL;
-
#define TX_POWER_LEVEL_TOTAL 8
// Define data structure for HostCmd_CMD_802_11_RF_TX_POWER
typedef struct {
@@ -1141,7 +1132,6 @@ typedef struct {
uint8_tActionData[1];
} __packed HostCmd_FW_UPDATE_ENCRYPTION;
-
typedef struct {
FWCmdHdrCmdHdr;
uint32_t ActionType; // ENCR_ACTION_TYPE
@@ -1271,8 +1261,6 @@ typedef struct {
FWCmdHdrCmdHdr;
uint8_t Watchdogbitmap; // for
svn commit: r365197 - head/sys/dev/my
Author: mjg
Date: Tue Sep 1 22:05:21 2020
New Revision: 365197
URL: https://svnweb.freebsd.org/changeset/base/365197
Log:
my: clean up empty lines in .c and .h files
Modified:
head/sys/dev/my/if_my.c
head/sys/dev/my/if_myreg.h
Modified: head/sys/dev/my/if_my.c
==
--- head/sys/dev/my/if_my.c Tue Sep 1 22:05:00 2020(r365196)
+++ head/sys/dev/my/if_my.c Tue Sep 1 22:05:21 2020(r365197)
@@ -80,7 +80,6 @@ static int MY_USEIOSPACE = 1;
#define MY_RID MY_PCI_LOMEM
#endif
-
#include
/*
@@ -220,7 +219,6 @@ my_send_cmd_to_phy(struct my_softc * sc, int opcode, i
return miir;
}
-
static u_int16_t
my_phy_readreg(struct my_softc * sc, int reg)
{
@@ -264,7 +262,6 @@ my_phy_readreg(struct my_softc * sc, int reg)
return (u_int16_t) data;
}
-
static void
my_phy_writereg(struct my_softc * sc, int reg, int data)
{
@@ -1006,7 +1003,6 @@ my_detach(device_t dev)
return (0);
}
-
/*
* Initialize the transmit descriptors.
*/
@@ -1179,7 +1175,6 @@ my_rxeof(struct my_softc * sc)
return;
}
-
/*
* A frame was downloaded to the chip. It's safe for us to clean up the list
* buffers.
@@ -1311,7 +1306,6 @@ my_intr(void *arg)
my_init_locked(sc);
}
#endif
-
}
/* Re-enable interrupts. */
@@ -1708,7 +1702,6 @@ my_watchdog(void *arg)
if (!IFQ_DRV_IS_EMPTY(>if_snd))
my_start_locked(ifp);
}
-
/*
* Stop the adapter and free any mbufs allocated to the RX and TX lists.
Modified: head/sys/dev/my/if_myreg.h
==
--- head/sys/dev/my/if_myreg.h Tue Sep 1 22:05:00 2020(r365196)
+++ head/sys/dev/my/if_myreg.h Tue Sep 1 22:05:21 2020(r365197)
@@ -585,5 +585,3 @@ struct my_softc {
#define PHY_BMSR_LINKSTAT 0x0004
#define PHY_BMSR_JABBER 0x0002
#define PHY_BMSR_EXTENDED 0x0001
-
-
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365192 - in head/sys/dev/ntb: . ntb_hw
Author: mjg
Date: Tue Sep 1 22:03:55 2020
New Revision: 365192
URL: https://svnweb.freebsd.org/changeset/base/365192
Log:
ntb: clean up empty lines in .c and .h files
Modified:
head/sys/dev/ntb/ntb_hw/ntb_hw_amd.c
head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
head/sys/dev/ntb/ntb_transport.c
Modified: head/sys/dev/ntb/ntb_hw/ntb_hw_amd.c
==
--- head/sys/dev/ntb/ntb_hw/ntb_hw_amd.cTue Sep 1 22:03:46 2020
(r365191)
+++ head/sys/dev/ntb/ntb_hw/ntb_hw_amd.cTue Sep 1 22:03:55 2020
(r365192)
@@ -81,7 +81,6 @@ __FBSDID("$FreeBSD$");
MALLOC_DEFINE(M_AMD_NTB, "amd_ntb_hw", "amd_ntb_hw driver memory allocations");
static const struct amd_ntb_hw_info amd_ntb_hw_info_list[] = {
-
{ .vendor_id = NTB_HW_AMD_VENDOR_ID,
.device_id = NTB_HW_AMD_DEVICE_ID1,
.mw_count = 3,
@@ -686,7 +685,6 @@ amd_ntb_peer_spad_write(device_t dev, unsigned int idx
return (0);
}
-
/*
* AMD NTB INIT
*/
@@ -871,7 +869,6 @@ amd_ntb_setup_isr(struct amd_ntb_softc *ntb, uint16_t
flags |= RF_SHAREABLE;
for (i = 0; i < num_vectors; i++) {
-
/* RID should be 0 for intx */
if (intx)
ntb->int_info[i].rid = i;
@@ -911,7 +908,7 @@ static int
amd_ntb_create_msix_vec(struct amd_ntb_softc *ntb, uint32_t max_vectors)
{
uint8_t i;
-
+
ntb->msix_vec = malloc(max_vectors * sizeof(*ntb->msix_vec), M_AMD_NTB,
M_ZERO | M_WAITOK);
Modified: head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
==
--- head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c Tue Sep 1 22:03:46 2020
(r365191)
+++ head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c Tue Sep 1 22:03:55 2020
(r365192)
@@ -1682,7 +1682,6 @@ configure_atom_secondary_side_bars(struct ntb_softc *n
}
}
-
/*
* When working around Xeon SDOORBELL errata by remapping remote registers in a
* MW, limit the B2B MW to half a MW. By sharing a MW, half the shared MW
Modified: head/sys/dev/ntb/ntb_transport.c
==
--- head/sys/dev/ntb/ntb_transport.cTue Sep 1 22:03:46 2020
(r365191)
+++ head/sys/dev/ntb/ntb_transport.cTue Sep 1 22:03:55 2020
(r365192)
@@ -757,8 +757,6 @@ ntb_transport_link_up(struct ntb_transport_qp *qp)
callout_reset(>link_work, 0, ntb_qp_link_work, qp);
}
-
-
/* Transport Tx */
/**
@@ -1204,7 +1202,6 @@ ntb_transport_link_work(void *arg)
mw->rx_size = val64;
val64 = roundup(val64, mw->xlat_align_size);
if (mw->buff_size != val64) {
-
rc = ntb_set_mw(nt, i, val64);
if (rc != 0) {
ntb_printf(0, "link up set mw%d fails, rc %d\n",
@@ -1592,7 +1589,6 @@ ntb_send_link_down(struct ntb_transport_qp *qp)
ntb_qp_link_down_reset(qp);
}
-
/* List Management */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365195 - head/sys/dev/nfe
Author: mjg
Date: Tue Sep 1 22:04:37 2020
New Revision: 365195
URL: https://svnweb.freebsd.org/changeset/base/365195
Log:
nfe: clean up empty lines in .c and .h files
Modified:
head/sys/dev/nfe/if_nfe.c
Modified: head/sys/dev/nfe/if_nfe.c
==
--- head/sys/dev/nfe/if_nfe.c Tue Sep 1 22:04:24 2020(r365194)
+++ head/sys/dev/nfe/if_nfe.c Tue Sep 1 22:04:37 2020(r365195)
@@ -270,7 +270,6 @@ static struct nfe_type nfe_devs[] = {
{0, 0, NULL}
};
-
/* Probe for supported hardware ID's */
static int
nfe_probe(device_t dev)
@@ -337,7 +336,6 @@ nfe_alloc_msix(struct nfe_softc *sc, int count)
}
}
-
static int
nfe_detect_msik9(struct nfe_softc *sc)
{
@@ -361,7 +359,6 @@ nfe_detect_msik9(struct nfe_softc *sc)
return (found);
}
-
static int
nfe_attach(device_t dev)
{
@@ -604,7 +601,6 @@ nfe_attach(device_t dev)
if_setsendqlen(ifp, NFE_TX_RING_COUNT - 1);
if_setsendqready(ifp);
-
if (sc->nfe_flags & NFE_HW_CSUM) {
if_setcapabilitiesbit(ifp, IFCAP_HWCSUM | IFCAP_TSO4, 0);
if_sethwassistbits(ifp, NFE_CSUM_FEATURES | CSUM_TSO, 0);
@@ -688,7 +684,6 @@ fail:
return (error);
}
-
static int
nfe_detach(device_t dev)
{
@@ -786,7 +781,6 @@ nfe_detach(device_t dev)
return (0);
}
-
static int
nfe_suspend(device_t dev)
{
@@ -803,7 +797,6 @@ nfe_suspend(device_t dev)
return (0);
}
-
static int
nfe_resume(device_t dev)
{
@@ -823,7 +816,6 @@ nfe_resume(device_t dev)
return (0);
}
-
static int
nfe_can_use_msix(struct nfe_softc *sc)
{
@@ -865,7 +857,6 @@ nfe_can_use_msix(struct nfe_softc *sc)
return (use_msix);
}
-
/* Take PHY/NIC out of powerdown, from Linux */
static void
nfe_power(struct nfe_softc *sc)
@@ -889,7 +880,6 @@ nfe_power(struct nfe_softc *sc)
NFE_WRITE(sc, NFE_PWR2_CTL, pwr);
}
-
static void
nfe_miibus_statchg(device_t dev)
{
@@ -931,7 +921,6 @@ nfe_miibus_statchg(device_t dev)
NFE_WRITE(sc, NFE_RX_CTL, rxctl);
}
-
static void
nfe_mac_config(struct nfe_softc *sc, struct mii_data *mii)
{
@@ -1024,7 +1013,6 @@ nfe_mac_config(struct nfe_softc *sc, struct mii_data *
}
}
-
static int
nfe_miibus_readreg(device_t dev, int phy, int reg)
{
@@ -1065,7 +1053,6 @@ nfe_miibus_readreg(device_t dev, int phy, int reg)
return (val);
}
-
static int
nfe_miibus_writereg(device_t dev, int phy, int reg, int val)
{
@@ -1197,7 +1184,6 @@ fail:
return (error);
}
-
static void
nfe_alloc_jrx_ring(struct nfe_softc *sc, struct nfe_jrx_ring *ring)
{
@@ -1317,7 +1303,6 @@ fail:
sc->nfe_jumbo_disable = 1;
}
-
static int
nfe_init_rx_ring(struct nfe_softc *sc, struct nfe_rx_ring *ring)
{
@@ -1345,7 +1330,6 @@ nfe_init_rx_ring(struct nfe_softc *sc, struct nfe_rx_r
return (0);
}
-
static int
nfe_init_jrx_ring(struct nfe_softc *sc, struct nfe_jrx_ring *ring)
{
@@ -1373,7 +1357,6 @@ nfe_init_jrx_ring(struct nfe_softc *sc, struct nfe_jrx
return (0);
}
-
static void
nfe_free_rx_ring(struct nfe_softc *sc, struct nfe_rx_ring *ring)
{
@@ -1420,7 +1403,6 @@ nfe_free_rx_ring(struct nfe_softc *sc, struct nfe_rx_r
}
}
-
static void
nfe_free_jrx_ring(struct nfe_softc *sc, struct nfe_jrx_ring *ring)
{
@@ -1474,7 +1456,6 @@ nfe_free_jrx_ring(struct nfe_softc *sc, struct nfe_jrx
}
}
-
static int
nfe_alloc_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring)
{
@@ -1559,7 +1540,6 @@ fail:
return (error);
}
-
static void
nfe_init_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring)
{
@@ -1582,7 +1562,6 @@ nfe_init_tx_ring(struct nfe_softc *sc, struct nfe_tx_r
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
}
-
static void
nfe_free_tx_ring(struct nfe_softc *sc, struct nfe_tx_ring *ring)
{
@@ -1635,7 +1614,6 @@ nfe_free_tx_ring(struct nfe_softc *sc, struct nfe_tx_r
#ifdef DEVICE_POLLING
static poll_handler_t nfe_poll;
-
static int
nfe_poll(if_t ifp, enum poll_cmd cmd, int count)
{
@@ -1684,7 +1662,6 @@ nfe_set_intr(struct nfe_softc *sc)
NFE_WRITE(sc, NFE_IRQ_MASK, NFE_IRQ_WANTED);
}
-
/* In MSIX, a write to mask reegisters behaves as XOR. */
static __inline void
nfe_enable_intr(struct nfe_softc *sc)
@@ -1698,7 +1675,6 @@ nfe_enable_intr(struct nfe_softc *sc)
NFE_WRITE(sc, sc->nfe_irq_mask, sc->nfe_intrs);
}
-
static __inline void
nfe_disable_intr(struct nfe_softc *sc)
{
@@ -1711,7 +1687,6 @@ nfe_disable_intr(struct nfe_softc *sc)
NFE_WRITE(sc, sc->nfe_irq_mask, sc->nfe_nointrs);
}
-
static int
nfe_ioctl(if_t ifp, u_long cmd, caddr_t data)
{
@@ -1863,7 +1838,6 @@ nfe_ioctl(if_t ifp, u_long cmd, caddr_t data)
return (error);
}
-
static int
nfe_intr(void *arg)
{
@@ -1881,7 +1855,6 @@ nfe_intr(void *arg)
return (FILTER_HANDLED);
}
-
static void
svn commit: r365193 - head/sys/dev/nge
Author: mjg Date: Tue Sep 1 22:04:10 2020 New Revision: 365193 URL: https://svnweb.freebsd.org/changeset/base/365193 Log: nge: clean up empty lines in .c and .h files Modified: head/sys/dev/nge/if_ngereg.h Modified: head/sys/dev/nge/if_ngereg.h == --- head/sys/dev/nge/if_ngereg.hTue Sep 1 22:03:55 2020 (r365192) +++ head/sys/dev/nge/if_ngereg.hTue Sep 1 22:04:10 2020 (r365193) @@ -385,7 +385,6 @@ #define NGE_RXFILTCTL_BROAD0x4000 #define NGE_RXFILTCTL_ENABLE 0x8000 - #define NGE_FILTADDR_PAR0 0x #define NGE_FILTADDR_PAR1 0x0002 #define NGE_FILTADDR_PAR2 0x0004 @@ -434,7 +433,6 @@ #define NGE_CLKRUN_PMESTS 0x8000 #define NGE_CLKRUN_PMEENB 0x0100 #define NGE_CLNRUN_CLKRUN_ENB 0x0001 - /* TBI BMCR */ #define NGE_TBIBMCR_RESTART_ANEG 0x0200 ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365194 - head/sys/dev/nfsmb
Author: mjg
Date: Tue Sep 1 22:04:24 2020
New Revision: 365194
URL: https://svnweb.freebsd.org/changeset/base/365194
Log:
nfsmb: clean up empty lines in .c and .h files
Modified:
head/sys/dev/nfsmb/nfsmb.c
Modified: head/sys/dev/nfsmb/nfsmb.c
==
--- head/sys/dev/nfsmb/nfsmb.c Tue Sep 1 22:04:10 2020(r365193)
+++ head/sys/dev/nfsmb/nfsmb.c Tue Sep 1 22:04:24 2020(r365194)
@@ -609,7 +609,6 @@ static device_method_t nfsmb_methods[] = {
DEVMETHOD(smbus_readw, nfsmb_readw),
DEVMETHOD(smbus_bwrite, nfsmb_bwrite),
DEVMETHOD(smbus_bread, nfsmb_bread),
-
{ 0, 0 }
};
@@ -630,7 +629,6 @@ static device_method_t nfsmbsub_methods[] = {
DEVMETHOD(smbus_readw, nfsmb_readw),
DEVMETHOD(smbus_bwrite, nfsmb_bwrite),
DEVMETHOD(smbus_bread, nfsmb_bread),
-
{ 0, 0 }
};
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365190 - head/sys/dev/nvd
Author: mjg Date: Tue Sep 1 22:03:32 2020 New Revision: 365190 URL: https://svnweb.freebsd.org/changeset/base/365190 Log: nvd: clean up empty lines in .c and .h files Modified: head/sys/dev/nvd/nvd.c Modified: head/sys/dev/nvd/nvd.c == --- head/sys/dev/nvd/nvd.c Tue Sep 1 22:03:10 2020(r365189) +++ head/sys/dev/nvd/nvd.c Tue Sep 1 22:03:32 2020(r365190) @@ -518,4 +518,3 @@ nvd_controller_fail(void *ctrlr_arg) mtx_unlock(_lock); free(ctrlr, M_NVD); } - ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365188 - head/sys/dev/nvram2env
Author: mjg
Date: Tue Sep 1 22:02:55 2020
New Revision: 365188
URL: https://svnweb.freebsd.org/changeset/base/365188
Log:
nvram2env: clean up empty lines in .c and .h files
Modified:
head/sys/dev/nvram2env/nvram2env.c
head/sys/dev/nvram2env/nvram2env.h
Modified: head/sys/dev/nvram2env/nvram2env.c
==
--- head/sys/dev/nvram2env/nvram2env.c Tue Sep 1 22:02:32 2020
(r365187)
+++ head/sys/dev/nvram2env/nvram2env.c Tue Sep 1 22:02:55 2020
(r365188)
@@ -87,7 +87,6 @@ nvram2env_probe(device_t dev)
>flags) != 0 || sc->flags == 0)
sc->flags = NVRAM_FLAGS_GENERIC;
-
for (i = 0; i < 2; i ++)
{
switch (i) {
@@ -160,7 +159,6 @@ static uint32_t read_4(struct nvram2env_softc * sc, in
return (bus_space_read_4(sc->bst, sc->bsh, offset));
}
-
int
nvram2env_attach(device_t dev)
{
@@ -187,10 +185,8 @@ nvram2env_attach(device_t dev)
size = (size > sc->maxsize)?sc->maxsize:size;
-
if (sig == sc->sig || (sc->flags & NVRAM_FLAGS_UBOOT))
{
-
/* align size to 32bit size*/
size += 3;
size &= ~3;
@@ -229,7 +225,6 @@ nvram2env_attach(device_t dev)
/* iterate over buffer till end. tmp points to end of NVRAM */
for ( ; pair < (char*)tmp;
pair += strlen(pair) + strlen(value) + 2 ) {
-
if (!pair || (strlen(pair) == 0))
break;
@@ -266,7 +261,6 @@ nvram2env_attach(device_t dev)
bootverbose = strtoul(value, 0, 0);
if (strcmp(pair, "boothowto" ) == 0)
boothowto = strtoul(value, 0, 0);
-
}
free(nv, M_DEVBUF);
}
Modified: head/sys/dev/nvram2env/nvram2env.h
==
--- head/sys/dev/nvram2env/nvram2env.h Tue Sep 1 22:02:32 2020
(r365187)
+++ head/sys/dev/nvram2env/nvram2env.h Tue Sep 1 22:02:55 2020
(r365188)
@@ -27,7 +27,6 @@
* $FreeBSD$
*/
-
#ifndef NVRAM2ENV_NVRAM2ENV_H_
#defineNVRAM2ENV_NVRAM2ENV_H_
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365189 - head/sys/dev/nvme
Author: mjg
Date: Tue Sep 1 22:03:10 2020
New Revision: 365189
URL: https://svnweb.freebsd.org/changeset/base/365189
Log:
nvme: clean up empty lines in .c and .h files
Modified:
head/sys/dev/nvme/nvme.c
head/sys/dev/nvme/nvme.h
head/sys/dev/nvme/nvme_ctrlr.c
head/sys/dev/nvme/nvme_pci.c
head/sys/dev/nvme/nvme_private.h
head/sys/dev/nvme/nvme_qpair.c
head/sys/dev/nvme/nvme_sysctl.c
head/sys/dev/nvme/nvme_test.c
head/sys/dev/nvme/nvme_util.c
Modified: head/sys/dev/nvme/nvme.c
==
--- head/sys/dev/nvme/nvme.cTue Sep 1 22:02:55 2020(r365188)
+++ head/sys/dev/nvme/nvme.cTue Sep 1 22:03:10 2020(r365189)
@@ -52,7 +52,6 @@ struct nvme_consumer nvme_consumer[NVME_MAX_CONSUMERS]
uma_zone_t nvme_request_zone;
int32_tnvme_retry_count;
-
MALLOC_DEFINE(M_NVME, "nvme", "nvme(4) memory allocations");
devclass_t nvme_devclass;
Modified: head/sys/dev/nvme/nvme.h
==
--- head/sys/dev/nvme/nvme.hTue Sep 1 22:02:55 2020(r365188)
+++ head/sys/dev/nvme/nvme.hTue Sep 1 22:03:10 2020(r365189)
@@ -576,7 +576,6 @@ struct nvme_command
_Static_assert(sizeof(struct nvme_command) == 16 * 4, "bad size for
nvme_command");
struct nvme_completion {
-
/* dword 0 */
uint32_tcdw0; /* command-specific */
@@ -871,7 +870,6 @@ _Static_assert(sizeof(struct nvme_power_state) == 32,
#define NVME_FIRMWARE_REVISION_LENGTH 8
struct nvme_controller_data {
-
/* bytes 0-255: controller capabilities and features */
/** pci vendor id */
@@ -1117,7 +1115,6 @@ struct nvme_controller_data {
_Static_assert(sizeof(struct nvme_controller_data) == 4096, "bad size for
nvme_controller_data");
struct nvme_namespace_data {
-
/** namespace size */
uint64_tnsze;
@@ -1231,7 +1228,6 @@ struct nvme_namespace_data {
_Static_assert(sizeof(struct nvme_namespace_data) == 4096, "bad size for
nvme_namepsace_data");
enum nvme_log_page {
-
/* 0x00 - reserved */
NVME_LOG_ERROR = 0x01,
NVME_LOG_HEALTH_INFORMATION = 0x02,
@@ -1272,7 +1268,6 @@ enum nvme_log_page {
};
struct nvme_error_information_entry {
-
uint64_terror_count;
uint16_tsqid;
uint16_tcid;
@@ -1291,7 +1286,6 @@ struct nvme_error_information_entry {
_Static_assert(sizeof(struct nvme_error_information_entry) == 64, "bad size
for nvme_error_information_entry");
struct nvme_health_information_page {
-
uint8_t critical_warning;
uint16_ttemperature;
uint8_t available_spare;
@@ -1336,7 +1330,6 @@ struct nvme_health_information_page {
_Static_assert(sizeof(struct nvme_health_information_page) == 512, "bad size
for nvme_health_information_page");
struct nvme_firmware_page {
-
uint8_t afi;
uint8_t reserved[7];
uint64_trevision[7]; /* revisions for 7 slots */
@@ -1456,7 +1449,6 @@ _Static_assert(sizeof(struct nvme_resv_status_ext) ==
#define NVME_TEST_MAX_THREADS 128
struct nvme_io_test {
-
enum nvme_nvm_opcodeopc;
uint32_tsize;
uint32_ttime; /* in seconds */
@@ -1466,7 +1458,6 @@ struct nvme_io_test {
};
enum nvme_io_test_flags {
-
/*
* Specifies whether dev_refthread/dev_relthread should be
* called during NVME_BIO_TEST. Ignored for other test
@@ -1476,7 +1467,6 @@ enum nvme_io_test_flags {
};
struct nvme_pt_command {
-
/*
* cmd is used to specify a passthrough command to a controller or
* namespace.
@@ -1854,7 +1844,6 @@ void nvme_health_information_page_swapbytes(struct
nvm
s->ttftmt1 = le32toh(s->ttftmt1);
s->ttftmt2 = le32toh(s->ttftmt2);
}
-
static inline
void nvme_firmware_page_swapbytes(struct nvme_firmware_page *s)
Modified: head/sys/dev/nvme/nvme_ctrlr.c
==
--- head/sys/dev/nvme/nvme_ctrlr.c Tue Sep 1 22:02:55 2020
(r365188)
+++ head/sys/dev/nvme/nvme_ctrlr.c Tue Sep 1 22:03:10 2020
(r365189)
@@ -745,7 +745,6 @@ nvme_ctrlr_async_event_log_page_cb(void *arg, const st
}
}
-
/*
* Pass the cpl data from the original async event completion,
* not the log page fetch.
Modified: head/sys/dev/nvme/nvme_pci.c
==
--- head/sys/dev/nvme/nvme_pci.cTue Sep 1 22:02:55 2020
(r365188)
+++ head/sys/dev/nvme/nvme_pci.cTue Sep 1 22:03:10 2020
(r365189)
svn commit: r365191 - head/sys/dev/null
Author: mjg
Date: Tue Sep 1 22:03:46 2020
New Revision: 365191
URL: https://svnweb.freebsd.org/changeset/base/365191
Log:
null: clean up empty lines in .c and .h files
Modified:
head/sys/dev/null/null.c
Modified: head/sys/dev/null/null.c
==
--- head/sys/dev/null/null.cTue Sep 1 22:03:32 2020(r365190)
+++ head/sys/dev/null/null.cTue Sep 1 22:03:46 2020(r365191)
@@ -82,8 +82,6 @@ static struct cdevsw zero_cdevsw = {
.d_flags = D_MMAP_ANON,
};
-
-
/* ARGSUSED */
static int
full_write(struct cdev *dev __unused, struct uio *uio __unused, int flags
__unused)
@@ -159,7 +157,6 @@ zero_ioctl(struct cdev *dev __unused, u_long cmd, cadd
}
return (error);
}
-
/* ARGSUSED */
static int
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365185 - head/sys/dev/ofw
Author: mjg
Date: Tue Sep 1 22:01:53 2020
New Revision: 365185
URL: https://svnweb.freebsd.org/changeset/base/365185
Log:
ofw: clean up empty lines in .c and .h files
Modified:
head/sys/dev/ofw/ofw_bus_subr.c
head/sys/dev/ofw/ofw_cpu.c
head/sys/dev/ofw/ofw_graph.h
head/sys/dev/ofw/ofw_standard.c
head/sys/dev/ofw/ofwpci.c
head/sys/dev/ofw/openfirmio.c
Modified: head/sys/dev/ofw/ofw_bus_subr.c
==
--- head/sys/dev/ofw/ofw_bus_subr.c Tue Sep 1 22:01:41 2020
(r365184)
+++ head/sys/dev/ofw/ofw_bus_subr.c Tue Sep 1 22:01:53 2020
(r365185)
@@ -183,7 +183,7 @@ ofw_bus_status_okay(device_t dev)
if (status == NULL || strcmp(status, "okay") == 0 ||
strcmp(status, "ok") == 0)
return (1);
-
+
return (0);
}
Modified: head/sys/dev/ofw/ofw_cpu.c
==
--- head/sys/dev/ofw/ofw_cpu.c Tue Sep 1 22:01:41 2020(r365184)
+++ head/sys/dev/ofw/ofw_cpu.c Tue Sep 1 22:01:53 2020(r365185)
@@ -361,7 +361,6 @@ ofw_cpu_early_foreach(ofw_cpu_foreach_cb callback, boo
for (child = OF_child(node); child != 0; child = OF_peer(child),
id = next_id) {
-
/* Check if child is a CPU */
memset(device_type, 0, sizeof(device_type));
rv = OF_getprop(child, "device_type", device_type,
Modified: head/sys/dev/ofw/ofw_graph.h
==
--- head/sys/dev/ofw/ofw_graph.hTue Sep 1 22:01:41 2020
(r365184)
+++ head/sys/dev/ofw/ofw_graph.hTue Sep 1 22:01:53 2020
(r365185)
@@ -41,4 +41,3 @@ phandle_t ofw_graph_get_remote_parent(phandle_t remote
device_t ofw_graph_get_device_by_port_ep(phandle_t node, uint32_t port_id,
uint32_t ep_id);
#endif /* _OFW_GRAPH_H_ */
-
Modified: head/sys/dev/ofw/ofw_standard.c
==
--- head/sys/dev/ofw/ofw_standard.c Tue Sep 1 22:01:41 2020
(r365184)
+++ head/sys/dev/ofw/ofw_standard.c Tue Sep 1 22:01:53 2020
(r365185)
@@ -136,7 +136,6 @@ static ofw_method_t ofw_std_methods[] = {
OFWMETHOD(ofw_release, ofw_std_release),
OFWMETHOD(ofw_enter,ofw_std_enter),
OFWMETHOD(ofw_exit, ofw_std_exit),
-
{ 0, 0 }
};
Modified: head/sys/dev/ofw/ofwpci.c
==
--- head/sys/dev/ofw/ofwpci.c Tue Sep 1 22:01:41 2020(r365184)
+++ head/sys/dev/ofw/ofwpci.c Tue Sep 1 22:01:53 2020(r365185)
@@ -103,7 +103,6 @@ static struct rman *ofw_pci_get_rman(struct ofw_pci_so
* Driver methods.
*/
static device_method_t ofw_pci_methods[] = {
-
/* Device interface */
DEVMETHOD(device_attach,ofw_pci_attach),
@@ -408,7 +407,6 @@ ofw_pci_alloc_resource(device_t bus, device_t child, i
struct resource *rv;
struct rman *rm;
int needactivate;
-
needactivate = flags & RF_ACTIVE;
flags &= ~RF_ACTIVE;
Modified: head/sys/dev/ofw/openfirmio.c
==
--- head/sys/dev/ofw/openfirmio.c Tue Sep 1 22:01:41 2020
(r365184)
+++ head/sys/dev/ofw/openfirmio.c Tue Sep 1 22:01:53 2020
(r365185)
@@ -151,7 +151,6 @@ openfirm_ioctl(struct cdev *dev, u_long cmd, caddr_t d
name = value = NULL;
error = 0;
switch (cmd) {
-
case OFIOCGET:
case OFIOCGETPROPLEN:
if (node == 0)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365187 - head/sys/dev/oce
Author: mjg
Date: Tue Sep 1 22:02:32 2020
New Revision: 365187
URL: https://svnweb.freebsd.org/changeset/base/365187
Log:
oce: clean up empty lines in .c and .h files
Modified:
head/sys/dev/oce/oce_hw.c
head/sys/dev/oce/oce_hw.h
head/sys/dev/oce/oce_if.c
head/sys/dev/oce/oce_if.h
head/sys/dev/oce/oce_mbox.c
head/sys/dev/oce/oce_queue.c
head/sys/dev/oce/oce_sysctl.c
head/sys/dev/oce/oce_user.h
head/sys/dev/oce/oce_util.c
Modified: head/sys/dev/oce/oce_hw.c
==
--- head/sys/dev/oce/oce_hw.c Tue Sep 1 22:02:12 2020(r365186)
+++ head/sys/dev/oce/oce_hw.c Tue Sep 1 22:02:32 2020(r365187)
@@ -40,7 +40,6 @@
/* $FreeBSD$ */
-
#include "oce_if.h"
static int oce_POST(POCE_SOFTC sc);
@@ -98,7 +97,7 @@ oce_hw_init(POCE_SOFTC sc)
rc = oce_POST(sc);
if (rc)
return rc;
-
+
/* create the bootstrap mailbox */
rc = oce_dma_alloc(sc, sizeof(struct oce_bmbx), >bsmbx, 0);
if (rc) {
@@ -115,30 +114,27 @@ oce_hw_init(POCE_SOFTC sc)
if (rc)
goto error;
-
rc = oce_get_fw_version(sc);
if (rc)
goto error;
-
rc = oce_get_fw_config(sc);
if (rc)
goto error;
-
sc->macaddr.size_of_struct = 6;
rc = oce_read_mac_addr(sc, 0, 1, MAC_ADDRESS_TYPE_NETWORK,
>macaddr);
if (rc)
goto error;
-
+
if ((IS_BE(sc) && (sc->flags & OCE_FLAGS_BE3)) || IS_SH(sc)) {
rc = oce_mbox_check_native_mode(sc);
if (rc)
goto error;
} else
sc->be3_native = 0;
-
+
return rc;
error:
@@ -147,8 +143,6 @@ error:
return rc;
}
-
-
/**
* @brief Releases the obtained pci resources
* @param sc software handle to the device
@@ -194,9 +188,6 @@ oce_hw_pci_free(POCE_SOFTC sc)
}
}
-
-
-
/**
* @brief Function to get the PCI capabilities
* @param sc software handle to the device
@@ -284,7 +275,7 @@ oce_hw_pci_alloc(POCE_SOFTC sc)
if (intf.bits.sli_valid != OCE_INTF_VALID_SIG)
goto error;
-
+
if (intf.bits.sli_rev != OCE_INTF_SLI_REV4) {
device_printf(sc->dev, "Adapter doesnt support SLI4\n");
goto error;
@@ -329,7 +320,6 @@ error:
return ENXIO;
}
-
/**
* @brief Function for device shutdown
* @param sc software handle to the device
@@ -363,7 +353,6 @@ oce_hw_shutdown(POCE_SOFTC sc)
oce_dma_free(sc, >bsmbx);
}
-
/**
* @brief Function for creating nw interface.
* @param sc software handle to the device
@@ -480,7 +469,7 @@ oce_hw_start(POCE_SOFTC sc)
rc = oce_get_link_status(sc, );
if (rc)
return 1;
-
+
if (link.logical_link_status == NTWK_LOGICAL_LINK_UP) {
sc->link_status = NTWK_LOGICAL_LINK_UP;
if_link_state_change(sc->ifp, LINK_STATE_UP);
@@ -493,7 +482,7 @@ oce_hw_start(POCE_SOFTC sc)
sc->qos_link_speed = (uint32_t )link.qos_link_speed * 10;
rc = oce_start_mq(sc->mq);
-
+
/* we need to get MCC aync events. So enable intrs and arm
first EQ, Other EQs will be armed after interface is UP
*/
@@ -508,7 +497,6 @@ oce_hw_start(POCE_SOFTC sc)
return rc;
}
-
/**
* @brief Function for hardware enable interupts.
* @param sc software handle to the device
@@ -524,7 +512,6 @@ oce_hw_intr_enable(POCE_SOFTC sc)
}
-
/**
* @brief Function for hardware disable interupts
* @param sc software handle to the device
@@ -533,13 +520,12 @@ void
oce_hw_intr_disable(POCE_SOFTC sc)
{
uint32_t reg;
-
+
reg = OCE_READ_REG32(sc, devcfg, PCICFG_INTR_CTRL);
reg &= ~HOSTINTR_MASK;
OCE_WRITE_REG32(sc, devcfg, PCICFG_INTR_CTRL, reg);
}
-
static u_int
oce_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt)
{
@@ -554,7 +540,6 @@ oce_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_i
return (1);
}
-
/**
* @brief Function for hardware update multicast filter
* @param sc software handle to the device
@@ -589,4 +574,3 @@ oce_hw_update_multicast(POCE_SOFTC sc)
oce_dma_free(sc, );
return rc;
}
-
Modified: head/sys/dev/oce/oce_hw.h
==
--- head/sys/dev/oce/oce_hw.h Tue Sep 1 22:02:12 2020(r365186)
+++ head/sys/dev/oce/oce_hw.h Tue Sep 1 22:02:32 2020(r365187)
@@ -61,7 +61,6 @@
#defineINTR_EN 0x2000
#defineIMAGE_TRANSFER_SIZE (32 * 1024) /* 32K at a
time */
-
Re: svn commit: r365091 - in head/sys/dev/virtio: . balloon block console network scsi
On 9/1/20 2:31 PM, Mateusz Guzik wrote:
> Author: mjg
> Date: Tue Sep 1 21:31:26 2020
> New Revision: 365091
> URL: https://svnweb.freebsd.org/changeset/base/365091
>
> Log:
> virtio: clean up empty lines in .c and .h files
>
> Modified:
> head/sys/dev/virtio/balloon/virtio_balloon.c
> head/sys/dev/virtio/block/virtio_blk.c
> head/sys/dev/virtio/console/virtio_console.c
> head/sys/dev/virtio/network/if_vtnet.c
> head/sys/dev/virtio/scsi/virtio_scsi.c
> head/sys/dev/virtio/virtio.c
>
> Modified: head/sys/dev/virtio/balloon/virtio_balloon.c
> ==
> --- head/sys/dev/virtio/balloon/virtio_balloon.c Tue Sep 1 21:30:22
> 2020(r365090)
> +++ head/sys/dev/virtio/balloon/virtio_balloon.c Tue Sep 1 21:31:26
> 2020(r365091)
> @@ -80,7 +80,6 @@ struct vtballoon_softc {
> static struct virtio_feature_desc vtballoon_feature_desc[] = {
> { VIRTIO_BALLOON_F_MUST_TELL_HOST, "MustTellHost" },
> { VIRTIO_BALLOON_F_STATS_VQ,"StatsVq" },
> -
> { 0, NULL }
> };
While many of the fixes are correct, I feel that this one (along with similar
changes to remove a blank line before table terminators in devmethod tables,
or in tables in the acpi drivers I saw in acpi_support) are a regression.
Also, in general some kind of heads up to ask before generating umpteen
billion merge conflicts would be nice.
--
John Baldwin
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365186 - head/sys/dev/ocs_fc
Author: mjg
Date: Tue Sep 1 22:02:12 2020
New Revision: 365186
URL: https://svnweb.freebsd.org/changeset/base/365186
Log:
ocs_fc: clean up empty lines in .c and .h files
Modified:
head/sys/dev/ocs_fc/ocs.h
head/sys/dev/ocs_fc/ocs_cam.c
head/sys/dev/ocs_fc/ocs_cam.h
head/sys/dev/ocs_fc/ocs_common.h
head/sys/dev/ocs_fc/ocs_ddump.c
head/sys/dev/ocs_fc/ocs_device.c
head/sys/dev/ocs_fc/ocs_device.h
head/sys/dev/ocs_fc/ocs_domain.c
head/sys/dev/ocs_fc/ocs_drv_fc.h
head/sys/dev/ocs_fc/ocs_els.c
head/sys/dev/ocs_fc/ocs_fabric.c
head/sys/dev/ocs_fc/ocs_fabric.h
head/sys/dev/ocs_fc/ocs_fcp.h
head/sys/dev/ocs_fc/ocs_hw.c
head/sys/dev/ocs_fc/ocs_hw.h
head/sys/dev/ocs_fc/ocs_hw_queues.c
head/sys/dev/ocs_fc/ocs_hw_queues.h
head/sys/dev/ocs_fc/ocs_io.c
head/sys/dev/ocs_fc/ocs_io.h
head/sys/dev/ocs_fc/ocs_ioctl.c
head/sys/dev/ocs_fc/ocs_ioctl.h
head/sys/dev/ocs_fc/ocs_list.h
head/sys/dev/ocs_fc/ocs_mgmt.c
head/sys/dev/ocs_fc/ocs_mgmt.h
head/sys/dev/ocs_fc/ocs_node.c
head/sys/dev/ocs_fc/ocs_node.h
head/sys/dev/ocs_fc/ocs_os.c
head/sys/dev/ocs_fc/ocs_os.h
head/sys/dev/ocs_fc/ocs_pci.c
head/sys/dev/ocs_fc/ocs_scsi.c
head/sys/dev/ocs_fc/ocs_scsi.h
head/sys/dev/ocs_fc/ocs_sport.c
head/sys/dev/ocs_fc/ocs_sport.h
head/sys/dev/ocs_fc/ocs_stats.h
head/sys/dev/ocs_fc/ocs_unsol.c
head/sys/dev/ocs_fc/ocs_utils.c
head/sys/dev/ocs_fc/ocs_utils.h
head/sys/dev/ocs_fc/ocs_vpd.h
head/sys/dev/ocs_fc/ocs_xport.c
head/sys/dev/ocs_fc/ocs_xport.h
head/sys/dev/ocs_fc/sli4.c
head/sys/dev/ocs_fc/sli4.h
Modified: head/sys/dev/ocs_fc/ocs.h
==
--- head/sys/dev/ocs_fc/ocs.h Tue Sep 1 22:01:53 2020(r365185)
+++ head/sys/dev/ocs_fc/ocs.h Tue Sep 1 22:02:12 2020(r365186)
@@ -36,7 +36,6 @@
* OCS bsd driver common include file
*/
-
#if !defined(__OCS_H__)
#define __OCS_H__
@@ -103,7 +102,6 @@ typedef struct ocs_fcport_s {
*/
struct ocs_softc {
-
device_tdev;
struct cdev *cdev;
@@ -197,7 +195,6 @@ struct ocs_softc {
uint32_tconfig_tgt:1, /**< Configured to support
target mode */
config_ini:1; /**< Configured to support
initiator mode */
-
uint32_t nodedb_mask; /**< Node debugging mask */
charmodeldesc[64];
@@ -218,7 +215,7 @@ struct ocs_softc {
boolattached;
struct mtx dbg_lock;
-
+
struct cam_devq *devq;
ocs_fcport *fcports;
Modified: head/sys/dev/ocs_fc/ocs_cam.c
==
--- head/sys/dev/ocs_fc/ocs_cam.c Tue Sep 1 22:01:53 2020
(r365185)
+++ head/sys/dev/ocs_fc/ocs_cam.c Tue Sep 1 22:02:12 2020
(r365186)
@@ -132,7 +132,7 @@ ocs_attach_port(ocs_t *ocs, int chan)
cam_sim_free(sim, FALSE);
return 1;
}
-
+
fcp->ocs = ocs;
fcp->sim = sim;
fcp->path = path;
@@ -171,7 +171,7 @@ ocs_detach_port(ocs_t *ocs, int32_t chan)
fcp->sim = NULL;
mtx_unlock(>sim_lock);
}
-
+
return 0;
}
@@ -199,7 +199,7 @@ ocs_cam_attach(ocs_t *ocs)
goto detach_port;
}
}
-
+
ocs->io_high_watermark = max_io;
ocs->io_in_use = 0;
return 0;
@@ -323,7 +323,6 @@ ocs_scsi_tgt_del_domain(ocs_domain_t *domain)
{
}
-
/**
* @ingroup scsi_api_target
* @brief accept new sli port (sport) notification
@@ -493,7 +492,6 @@ ocs_scsi_del_initiator(ocs_node_t *node, ocs_scsi_del_
adc->arrived = 0;
xpt_async(AC_CONTRACT, fcp->path, );
-
if (reason == OCS_SCSI_INITIATOR_MISSING) {
return OCS_SCSI_CALL_COMPLETE;
}
@@ -566,7 +564,6 @@ int32_t ocs_scsi_recv_cmd(ocs_io_t *io, uint64_t lun,
}
if (atio) {
-
STAILQ_REMOVE_HEAD(>atio, sim_links.stqe);
atio->ccb_h.status = CAM_CDB_RECVD;
@@ -699,7 +696,6 @@ int32_t ocs_scsi_recv_tmf(ocs_io_t *tmfio, uint64_t lu
goto ocs_scsi_recv_tmf_out;
}
-
tmfio->tgt_io.app = abortio;
STAILQ_REMOVE_HEAD(>inot, sim_links.stqe);
@@ -773,7 +769,7 @@ int32_t ocs_scsi_recv_tmf(ocs_io_t *tmfio, uint64_t lu
abortio->tgt_io.flags |= OCS_CAM_IO_F_ABORT_DEV;
rc = ocs_scsi_tgt_abort_io(abortio, ocs_io_abort_cb, tmfio);
}
-
+
ocs_scsi_recv_tmf_out:
return rc;
}
@@ -813,7 +809,6 @@ ocs_scsi_ini_del_device(ocs_t *ocs)
return 0;
}
-
/**
* @ingroup scsi_api_initiator
* @brief accept new domain notification
@@ -959,7 +954,7 @@ ocs_tgt_find(ocs_fcport *fcp, ocs_node_t *node)
{
ocs_fc_target_t *tgt
svn commit: r365184 - head/sys/dev/otus
Author: mjg
Date: Tue Sep 1 22:01:41 2020
New Revision: 365184
URL: https://svnweb.freebsd.org/changeset/base/365184
Log:
otus: clean up empty lines in .c and .h files
Modified:
head/sys/dev/otus/if_otus.c
Modified: head/sys/dev/otus/if_otus.c
==
--- head/sys/dev/otus/if_otus.c Tue Sep 1 22:01:32 2020(r365183)
+++ head/sys/dev/otus/if_otus.c Tue Sep 1 22:01:41 2020(r365184)
@@ -99,7 +99,6 @@ SYSCTL_INT(_hw_usb_otus, OID_AUTO, debug, CTLFLAG_RWTU
if ((dm == OTUS_DEBUG_ANY) || (dm & otus_debug)) \
device_printf(sc->sc_dev, __VA_ARGS__); \
} while (0)
-
#defineOTUS_DEV(v, p) { USB_VPI(v, p, 0) }
static const STRUCT_USB_HOST_ID otus_devs[] = {
OTUS_DEV(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_WN7512),
@@ -1571,7 +1570,6 @@ otus_sub_rxeof(struct otus_softc *sc, uint8_t *buf, in
struct mbuf *m;
// int s;
-
if (otus_debug & OTUS_DEBUG_RX_BUFFER) {
device_printf(sc->sc_dev, "%s: %*D\n",
__func__, len, buf, "-");
@@ -2226,7 +2224,6 @@ otus_hw_rate_is_ofdm(struct otus_softc *sc, uint8_t hw
}
}
-
static void
otus_tx_update_ratectl(struct otus_softc *sc, struct ieee80211_node *ni)
{
@@ -2417,7 +2414,6 @@ otus_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_
return (1);
}
-
int
otus_set_multi(struct otus_softc *sc)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365183 - head/sys/dev/ow
Author: mjg
Date: Tue Sep 1 22:01:32 2020
New Revision: 365183
URL: https://svnweb.freebsd.org/changeset/base/365183
Log:
ow: clean up empty lines in .c and .h files
Modified:
head/sys/dev/ow/ow.h
head/sys/dev/ow/ow_temp.c
head/sys/dev/ow/own.h
Modified: head/sys/dev/ow/ow.h
==
--- head/sys/dev/ow/ow.hTue Sep 1 22:01:17 2020(r365182)
+++ head/sys/dev/ow/ow.hTue Sep 1 22:01:32 2020(r365183)
@@ -35,7 +35,7 @@ enum ow_device_ivars {
#define OW_ACCESSOR(var, ivar, type) \
__BUS_ACCESSOR(ow, var, OW, ivar, type);
-
+
OW_ACCESSOR(family,FAMILY, uint8_t)
OW_ACCESSOR(romid, ROMID, uint8_t *)
Modified: head/sys/dev/ow/ow_temp.c
==
--- head/sys/dev/ow/ow_temp.c Tue Sep 1 22:01:17 2020(r365182)
+++ head/sys/dev/ow/ow_temp.c Tue Sep 1 22:01:32 2020(r365183)
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
#defineRECALL_EE 0xb8
#defineREAD_SCRATCHPAD 0xbe
-
#defineOW_TEMP_DONE0x01
#defineOW_TEMP_RUNNING 0x02
@@ -95,7 +94,7 @@ static int
ow_temp_read_scratchpad(device_t dev, uint8_t *scratch, int len)
{
struct ow_cmd cmd;
-
+
own_self_command(dev, , READ_SCRATCHPAD);
cmd.xpt_read_len = len;
own_command_wait(dev, );
@@ -115,7 +114,6 @@ ow_temp_convert_t(device_t dev)
return 0;
}
-
static int
ow_temp_read_power_supply(device_t dev, int *parasite)
{
@@ -262,7 +260,7 @@ ow_temp_detach(device_t dev)
msleep(sc->event_thread, >temp_lock, PWAIT, "owtun", 0);
}
mtx_destroy(>temp_lock);
-
+
return 0;
}
@@ -273,7 +271,6 @@ static device_method_t ow_temp_methods[] = {
DEVMETHOD(device_probe, ow_temp_probe),
DEVMETHOD(device_attach,ow_temp_attach),
DEVMETHOD(device_detach,ow_temp_detach),
-
{ 0, 0 }
};
Modified: head/sys/dev/ow/own.h
==
--- head/sys/dev/ow/own.h Tue Sep 1 22:01:17 2020(r365182)
+++ head/sys/dev/ow/own.h Tue Sep 1 22:01:32 2020(r365183)
@@ -30,7 +30,6 @@
#include "own_if.h"
-
#defineREAD_ROM0x33
#defineMATCH_ROM 0x55
#defineSKIP_ROM0xcc
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365181 - head/sys/dev/pccard
Author: mjg
Date: Tue Sep 1 22:01:04 2020
New Revision: 365181
URL: https://svnweb.freebsd.org/changeset/base/365181
Log:
pccard: clean up empty lines in .c and .h files
Modified:
head/sys/dev/pccard/pccard.c
head/sys/dev/pccard/pccard_cis_quirks.c
Modified: head/sys/dev/pccard/pccard.c
==
--- head/sys/dev/pccard/pccard.cTue Sep 1 22:00:48 2020
(r365180)
+++ head/sys/dev/pccard/pccard.cTue Sep 1 22:01:04 2020
(r365181)
@@ -136,7 +136,6 @@ pccard_do_product_lookup(device_t bus, device_t dev,
const struct pccard_product *tab, size_t ent_size,
pccard_product_match_fn matchfn);
-
static int
pccard_ccr_read(struct pccard_function *pf, int ccr)
{
@@ -455,7 +454,7 @@ pccard_select_cfe(device_t dev, int entry)
{
struct pccard_ivar *devi = PCCARD_IVAR(dev);
struct pccard_function *pf = devi->pf;
-
+
pccard_function_init(pf, entry);
return (pf->cfe ? 0 : ENOMEM);
}
@@ -1259,7 +1258,7 @@ static void
pccard_intr(void *arg)
{
struct pccard_function *pf = (struct pccard_function*) arg;
-
+
pf->intr_handler(pf->intr_handler_arg);
}
@@ -1432,7 +1431,6 @@ pccard_ccr_write_impl(device_t brdev, device_t child,
return 0;
}
-
static device_method_t pccard_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, pccard_probe),
@@ -1471,7 +1469,6 @@ static device_method_t pccard_methods[] = {
DEVMETHOD(card_attr_write, pccard_attr_write_impl),
DEVMETHOD(card_ccr_read,pccard_ccr_read_impl),
DEVMETHOD(card_ccr_write, pccard_ccr_write_impl),
-
{ 0, 0 }
};
Modified: head/sys/dev/pccard/pccard_cis_quirks.c
==
--- head/sys/dev/pccard/pccard_cis_quirks.c Tue Sep 1 22:00:48 2020
(r365180)
+++ head/sys/dev/pccard/pccard_cis_quirks.c Tue Sep 1 22:01:04 2020
(r365181)
@@ -258,7 +258,7 @@ static struct pccard_cis_quirk pccard_cis_quirks[] = {
{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
PCMCIA_CIS_NDC_ND5100_E,
_ndc_nd5100_func0, _ndc_nd5100_func0_cfe0 },
};
-
+
static int
pccard_cis_quirk_match(struct pccard_softc *sc, struct pccard_cis_quirk *q)
{
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365182 - head/sys/dev/pbio
Author: mjg
Date: Tue Sep 1 22:01:17 2020
New Revision: 365182
URL: https://svnweb.freebsd.org/changeset/base/365182
Log:
pbio: clean up empty lines in .c and .h files
Modified:
head/sys/dev/pbio/pbio.c
Modified: head/sys/dev/pbio/pbio.c
==
--- head/sys/dev/pbio/pbio.cTue Sep 1 22:01:04 2020(r365181)
+++ head/sys/dev/pbio/pbio.cTue Sep 1 22:01:17 2020(r365182)
@@ -159,7 +159,6 @@ pboutb(struct pbio_softc *scp, int off, uint8_t val)
bus_space_write_1(scp->bst, scp->bsh, off, val);
}
-
static int
pbioprobe(device_t dev)
{
@@ -251,7 +250,7 @@ pbioioctl (struct cdev *dev, u_long cmd, caddr_t data,
{
struct pbio_softc *scp;
int port, unit;
-
+
unit = UNIT(dev);
port = PORT(dev);
scp = pbio_addr(unit);
@@ -288,13 +287,13 @@ pbioopen(struct cdev *dev, int oflags, int devtype, st
struct pbio_softc *scp;
int ocfg, port, unit;
int portbit;/* Port configuration bit */
-
+
unit = UNIT(dev);
port = PORT(dev);
scp = pbio_addr(unit);
if (scp == NULL)
return (ENODEV);
-
+
switch (port) {
case 0: portbit = 0x10; break; /* Port A */
case 1: portbit = 0x02; break; /* Port B */
@@ -321,12 +320,12 @@ pbioclose(struct cdev *dev, int fflag, int devtype, st
{
struct pbio_softc *scp;
int unit;
-
+
unit = UNIT(dev);
scp = pbio_addr(unit);
if (scp == NULL)
return (ENODEV);
-
+
return (0);
}
@@ -377,7 +376,7 @@ pbioread(struct cdev *dev, struct uio *uio, int ioflag
struct pbio_softc *scp;
int err, i, port, ret, toread, unit;
char val;
-
+
unit = UNIT(dev);
port = PORT(dev);
scp = pbio_addr(unit);
@@ -406,7 +405,7 @@ pbiowrite(struct cdev *dev, struct uio *uio, int iofla
struct pbio_softc *scp;
int i, port, ret, towrite, unit;
char val, oval;
-
+
unit = UNIT(dev);
port = PORT(dev);
scp = pbio_addr(unit);
@@ -453,12 +452,12 @@ pbiopoll(struct cdev *dev, int which, struct thread *t
{
struct pbio_softc *scp;
int unit;
-
+
unit = UNIT(dev);
scp = pbio_addr(unit);
if (scp == NULL)
return (ENODEV);
-
+
/*
* Do processing
*/
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365179 - head/sys/dev/pcf
Author: mjg
Date: Tue Sep 1 22:00:30 2020
New Revision: 365179
URL: https://svnweb.freebsd.org/changeset/base/365179
Log:
pcf: clean up empty lines in .c and .h files
Modified:
head/sys/dev/pcf/pcf.c
Modified: head/sys/dev/pcf/pcf.c
==
--- head/sys/dev/pcf/pcf.c Tue Sep 1 22:00:07 2020(r365178)
+++ head/sys/dev/pcf/pcf.c Tue Sep 1 22:00:30 2020(r365179)
@@ -66,7 +66,6 @@ pcf_wait_byte(struct pcf_softc *sc)
PCF_ASSERT_LOCKED(sc);
while (counter--) {
-
if ((pcf_get_S1(sc) & PIN) == 0)
return (0);
}
@@ -252,7 +251,6 @@ pcf_intr(void *arg)
status = pcf_get_S1(sc);
switch(sc->pcf_slave_mode) {
-
case SLAVE_TRANSMITTER:
if (status & LRB) {
/* ack interrupt line */
@@ -393,7 +391,6 @@ pcf_write(device_t dev, const char *buf, int len, int
bytes = 0;
PCF_LOCK(sc);
while (len) {
-
pcf_set_S0(sc, *buf++);
/* wait for the byte to be send */
@@ -445,7 +442,6 @@ pcf_read(device_t dev, char *buf, int len, int *read,
bytes = 0;
while (len) {
-
/* XXX delay needed here */
/* wait for trigged byte */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365180 - head/sys/dev/pccbb
Author: mjg
Date: Tue Sep 1 22:00:48 2020
New Revision: 365180
URL: https://svnweb.freebsd.org/changeset/base/365180
Log:
pccbb: clean up empty lines in .c and .h files
Modified:
head/sys/dev/pccbb/pccbb.c
head/sys/dev/pccbb/pccbbreg.h
Modified: head/sys/dev/pccbb/pccbb.c
==
--- head/sys/dev/pccbb/pccbb.c Tue Sep 1 22:00:30 2020(r365179)
+++ head/sys/dev/pccbb/pccbb.c Tue Sep 1 22:00:48 2020(r365180)
@@ -193,7 +193,7 @@ static struct resource *
cbb_find_res(struct cbb_softc *sc, int type, int rid)
{
struct cbb_reslist *rle;
-
+
SLIST_FOREACH(rle, >rl, link)
if (SYS_RES_MEMORY == rle->type && rid == rle->rid)
return (rle->res);
@@ -405,7 +405,6 @@ cbb_teardown_intr(device_t dev, device_t child, struct
return (0);
}
-
void
cbb_driver_added(device_t brdev, driver_t *driver)
{
@@ -884,7 +883,7 @@ cbb_current_voltage(device_t brdev)
{
struct cbb_softc *sc = device_get_softc(brdev);
uint32_t ctrl;
-
+
ctrl = cbb_get(sc, CBB_SOCKET_CONTROL);
switch (ctrl & CBB_SOCKET_CTRL_VCCMASK) {
case CBB_SOCKET_CTRL_VCC_5V:
@@ -1496,7 +1495,6 @@ cbb_pcic_set_memory_offset(device_t brdev, device_t ch
//
/* BUS Methods */
//
-
int
cbb_activate_resource(device_t brdev, device_t child, int type, int rid,
Modified: head/sys/dev/pccbb/pccbbreg.h
==
--- head/sys/dev/pccbb/pccbbreg.h Tue Sep 1 22:00:30 2020
(r365179)
+++ head/sys/dev/pccbb/pccbbreg.h Tue Sep 1 22:00:48 2020
(r365180)
@@ -62,7 +62,6 @@
* Register definitions for PCI to Cardbus Bridge chips
*/
-
/* PCI header registers */
#defineCBBR_SOCKBASE 0x10/* len=4 */
@@ -187,7 +186,6 @@
# define TOPIC97_REG_CTRL_RI_DISABLE 0x0004
# define TOPIC97_REG_CTRL_CAUDIO_OFF 0x0002
# define TOPIC_REG_CTRL_CAUDIO_INVERT 0x0001
-
/* Socket definitions */
#defineCBB_SOCKET_EVENT_CSTS 0x01/* Card Status Change */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365178 - head/sys/dev/pci
Author: mjg
Date: Tue Sep 1 22:00:07 2020
New Revision: 365178
URL: https://svnweb.freebsd.org/changeset/base/365178
Log:
pci: clean up empty lines in .c and .h files
Modified:
head/sys/dev/pci/hostb_pci.c
head/sys/dev/pci/isa_pci.c
head/sys/dev/pci/pci.c
head/sys/dev/pci/pci_dw.c
head/sys/dev/pci/pci_dw.h
head/sys/dev/pci/pci_dw_mv.c
head/sys/dev/pci/pci_host_generic.c
head/sys/dev/pci/pci_host_generic_fdt.c
head/sys/dev/pci/pci_iov.c
head/sys/dev/pci/pci_iov_private.h
head/sys/dev/pci/pci_pci.c
head/sys/dev/pci/pci_user.c
head/sys/dev/pci/pcib_support.c
head/sys/dev/pci/vga_pci.c
Modified: head/sys/dev/pci/hostb_pci.c
==
--- head/sys/dev/pci/hostb_pci.cTue Sep 1 21:59:31 2020
(r365177)
+++ head/sys/dev/pci/hostb_pci.cTue Sep 1 22:00:07 2020
(r365178)
@@ -51,7 +51,6 @@ pci_hostb_probe(device_t dev)
id = pci_get_devid(dev);
switch (id) {
-
/* VIA VT82C596 Power Management Function */
case 0x30501106:
return (ENXIO);
@@ -280,7 +279,6 @@ static device_method_t pci_hostb_methods[] = {
DEVMETHOD(pci_find_next_extcap, pci_hostb_find_next_extcap),
DEVMETHOD(pci_find_htcap, pci_hostb_find_htcap),
DEVMETHOD(pci_find_next_htcap, pci_hostb_find_next_htcap),
-
{ 0, 0 }
};
Modified: head/sys/dev/pci/isa_pci.c
==
--- head/sys/dev/pci/isa_pci.c Tue Sep 1 21:59:31 2020(r365177)
+++ head/sys/dev/pci/isa_pci.c Tue Sep 1 22:00:07 2020(r365178)
@@ -145,7 +145,7 @@ isab_pci_probe(device_t dev)
pci_get_subclass(dev));
matched = 1;
break;
-
+
default:
break;
}
Modified: head/sys/dev/pci/pci.c
==
--- head/sys/dev/pci/pci.c Tue Sep 1 21:59:31 2020(r365177)
+++ head/sys/dev/pci/pci.c Tue Sep 1 22:00:07 2020(r365178)
@@ -317,7 +317,6 @@ static const struct pci_quirk pci_quirks[] = {
* expected place.
*/
{ 0x98741002, PCI_QUIRK_REALLOC_BAR,0, 0 },
-
{ 0 }
};
@@ -768,7 +767,6 @@ pci_ea_fill_info(device_t pcib, pcicfgregs *cfg)
ptr += 4;
for (a = 0; a < num_ent; a++) {
-
eae = malloc(sizeof(*eae), M_DEVBUF, M_WAITOK | M_ZERO);
eae->eae_cfg_offset = cfg->ea.ea_location + ptr;
@@ -2363,7 +2361,6 @@ pci_remap_intr_method(device_t bus, device_t dev, u_in
* data registers and apply the results.
*/
if (cfg->msi.msi_alloc > 0) {
-
/* If we don't have any active handlers, nothing to do. */
if (cfg->msi.msi_handlers == 0)
return (0);
@@ -2593,7 +2590,6 @@ pci_alloc_msi_method(device_t dev, device_t child, int
device_printf(child, "using IRQs %d", irqs[0]);
run = 0;
for (i = 1; i < actual; i++) {
-
/* Still in a run? */
if (irqs[i] == irqs[i - 1] + 1) {
run = 1;
@@ -3862,7 +3858,6 @@ pci_add_resources_ea(device_t bus, device_t dev, int a
return;
STAILQ_FOREACH(ea, >cfg.ea.ea_entries, eae_link) {
-
/*
* TODO: Ignore EA-BAR if is not enabled.
* Currently the EA implementation supports
@@ -5261,7 +5256,6 @@ DB_SHOW_COMMAND(pciregs, db_pci_dump)
dinfo = STAILQ_FIRST(devlist_head);
(dinfo != NULL) && (error == 0) && (i < pci_numdevs) &&
!db_pager_quit;
dinfo = STAILQ_NEXT(dinfo, pci_links), i++) {
-
/* Populate pd_name and pd_unit */
name = NULL;
if (dinfo->cfg.dev)
Modified: head/sys/dev/pci/pci_dw.c
==
--- head/sys/dev/pci/pci_dw.c Tue Sep 1 21:59:31 2020(r365177)
+++ head/sys/dev/pci/pci_dw.c Tue Sep 1 22:00:07 2020(r365178)
@@ -31,7 +31,6 @@
#include
__FBSDID("$FreeBSD$");
-
#include
#include
#include
@@ -82,13 +81,10 @@ __FBSDID("$FreeBSD$");
#definePCI_FUNC_MASK 0x07
#definePCI_REG_MASK0xFFF
-
#defineIATU_CFG_BUS(bus) ((uint64_t)((bus) & 0xff) << 24)
#defineIATU_CFG_SLOT(slot) ((uint64_t)((slot) & 0x1f) << 19)
#defineIATU_CFG_FUNC(func) ((uint64_t)((func) & 0x07) << 16)
-
-
static uint32_t
pci_dw_dbi_read(device_t dev, u_int reg, int width)
{
@@ -134,7 +130,6 @@ pci_dw_dbi_write(device_t dev, u_int reg, uint32_t val
}
}
-
static void
pci_dw_dbi_protect(struct pci_dw_softc *sc, bool protect)
{
@@ -243,7
svn commit: r365176 - head/sys/dev/ppbus
Author: mjg
Date: Tue Sep 1 21:59:11 2020
New Revision: 365176
URL: https://svnweb.freebsd.org/changeset/base/365176
Log:
ppbus: clean up empty lines in .c and .h files
Modified:
head/sys/dev/ppbus/if_plip.c
head/sys/dev/ppbus/lpbb.c
head/sys/dev/ppbus/lpt.c
head/sys/dev/ppbus/pcfclock.c
head/sys/dev/ppbus/ppb_1284.c
head/sys/dev/ppbus/ppb_msq.c
head/sys/dev/ppbus/ppb_msq.h
head/sys/dev/ppbus/ppbconf.c
head/sys/dev/ppbus/ppbconf.h
head/sys/dev/ppbus/ppi.c
head/sys/dev/ppbus/pps.c
Modified: head/sys/dev/ppbus/if_plip.c
==
--- head/sys/dev/ppbus/if_plip.cTue Sep 1 21:58:56 2020
(r365175)
+++ head/sys/dev/ppbus/if_plip.cTue Sep 1 21:59:11 2020
(r365176)
@@ -539,7 +539,6 @@ lp_intr(void *arg)
ppb_assert_locked(ppbus);
if (sc->sc_ifp->if_flags & IFF_LINK0) {
-
/* Ack. the request */
ppb_wdtr(ppbus, 0x01);
@@ -599,7 +598,6 @@ lp_intr(void *arg)
len = sc->sc_ifp->if_mtu + LPIPHDRLEN;
bp = sc->sc_ifbuf;
while (len--) {
-
cl = ppb_rstr(ppbus);
ppb_wdtr(ppbus, 8);
@@ -842,7 +840,6 @@ static device_method_t lp_methods[] = {
DEVMETHOD(device_probe, lp_probe),
DEVMETHOD(device_attach,lp_attach),
DEVMETHOD(device_detach,lp_detach),
-
{ 0, 0 }
};
Modified: head/sys/dev/ppbus/lpbb.c
==
--- head/sys/dev/ppbus/lpbb.c Tue Sep 1 21:58:56 2020(r365175)
+++ head/sys/dev/ppbus/lpbb.c Tue Sep 1 21:59:11 2020(r365176)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-
#include
#include "ppbus_if.h"
#include
Modified: head/sys/dev/ppbus/lpt.c
==
--- head/sys/dev/ppbus/lpt.cTue Sep 1 21:58:56 2020(r365175)
+++ head/sys/dev/ppbus/lpt.cTue Sep 1 21:59:11 2020(r365176)
@@ -151,7 +151,6 @@ static void lptintr(void *arg);
static devclass_t lpt_devclass;
-
/* bits for state */
#defineOPEN(1<<0) /* device is open */
#defineASLP(1<<1) /* awaiting draining of printer */
@@ -176,7 +175,6 @@ static devclass_t lpt_devclass;
#defineMAX_SLEEP (hz*5) /* Timeout while waiting for device
ready */
#defineMAX_SPIN20 /* Max delay for device ready in usecs
*/
-
static d_open_tlptopen;
static d_close_t lptclose;
static d_write_t lptwrite;
@@ -708,7 +706,6 @@ lpt_pushbytes(struct lpt_data *sc)
/* strobe */
ppb_wctr(ppbus, sc->sc_control|LPC_STB);
ppb_wctr(ppbus, sc->sc_control);
-
}
return(0);
}
@@ -990,7 +987,6 @@ static device_method_t lpt_methods[] = {
DEVMETHOD(device_probe, lpt_probe),
DEVMETHOD(device_attach,lpt_attach),
DEVMETHOD(device_detach,lpt_detach),
-
{ 0, 0 }
};
Modified: head/sys/dev/ppbus/pcfclock.c
==
--- head/sys/dev/ppbus/pcfclock.c Tue Sep 1 21:58:56 2020
(r365175)
+++ head/sys/dev/ppbus/pcfclock.c Tue Sep 1 21:59:11 2020
(r365176)
@@ -325,7 +325,6 @@ static device_method_t pcfclock_methods[] = {
DEVMETHOD(device_identify, pcfclock_identify),
DEVMETHOD(device_probe, pcfclock_probe),
DEVMETHOD(device_attach,pcfclock_attach),
-
{ 0, 0 }
};
Modified: head/sys/dev/ppbus/ppb_1284.c
==
--- head/sys/dev/ppbus/ppb_1284.c Tue Sep 1 21:58:56 2020
(r365175)
+++ head/sys/dev/ppbus/ppb_1284.c Tue Sep 1 21:59:11 2020
(r365176)
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-
#include
#include
@@ -224,7 +223,6 @@ ppb_peripheral_negociate(device_t bus, int mode, int o
/* nibble mode is not supported */
if ((r == (char)request_mode) ||
(r == NIBBLE_1284_NORMAL)) {
-
/* Event 5 - restore direction bit, no data avail */
ppb_wctr(bus, (STROBE | nINIT) & ~(SELECTIN));
DELAY(1);
@@ -489,7 +487,6 @@ nibble_1284_inbyte(device_t bus, char *buffer)
int i, error;
for (i = 0; i < 2; i++) {
-
/* Event 7 - ready to take data (nAUTO low) */
ppb_wctr(bus, (nINIT | AUTOFEED) & ~(STROBE | SELECTIN));
@@ -555,7 +552,6 @@ spp_1284_read(device_t bus, int mode, char *buffer, in
}
while ((len < max) && !(ppb_rstr(bus) & (nFAULT))) {
-
ppb_1284_set_state(bus, PPB_REVERSE_TRANSFER);
#ifdef DEBUG_1284
@@ -744,11 +740,9
svn commit: r365175 - head/sys/dev/ppc
Author: mjg
Date: Tue Sep 1 21:58:56 2020
New Revision: 365175
URL: https://svnweb.freebsd.org/changeset/base/365175
Log:
ppc: clean up empty lines in .c and .h files
Modified:
head/sys/dev/ppc/ppc.c
head/sys/dev/ppc/ppc_acpi.c
head/sys/dev/ppc/ppc_isa.c
head/sys/dev/ppc/ppc_pci.c
head/sys/dev/ppc/ppc_puc.c
Modified: head/sys/dev/ppc/ppc.c
==
--- head/sys/dev/ppc/ppc.c Tue Sep 1 21:58:40 2020(r365174)
+++ head/sys/dev/ppc/ppc.c Tue Sep 1 21:58:56 2020(r365175)
@@ -426,7 +426,6 @@ ppc_pc873xx_detect(struct ppc_data *ppc, int chipset_m
intptr, pcr, val, i;
while ((idport = pc873xx_basetab[index++])) {
-
/* XXX should check first to see if this location is already claimed */
/*
@@ -488,7 +487,6 @@ ppc_pc873xx_detect(struct ppc_data *ppc, int chipset_m
val = inb(idport + 1);
/* XXX we should create a driver instance for every port found */
if (pc873xx_porttab[val & 0x3] != ppc->ppc_base) {
-
/* First try to change the port address to that requested... */
switch (ppc->ppc_base) {
@@ -710,7 +708,6 @@ ppc_smc37c66xgt_detect(struct ppc_data *ppc, int chips
int port_address[] = { -1 /* disabled */ , 0x3bc, 0x378, 0x278 };
-
#define cio csr+1 /* config IO port is either 0x3F1 or 0x371 */
/*
@@ -1256,7 +1253,6 @@ ppc_generic_detect(struct ppc_data *ppc, int chipset_m
*/
static int
ppc_detect(struct ppc_data *ppc, int chipset_mode) {
-
#ifdef PPC_PROBE_CHIPSET
int i, mode;
@@ -1570,7 +1566,6 @@ ppcintr(void *arg)
/* check if ppc driver has programmed the
* nFault interrupt */
if (ppc->ppc_irqstat & PPC_IRQ_nFAULT) {
-
w_ecr(ppc, ecr | PPC_nFAULT_INTR);
ppc->ppc_irqstat &= ~PPC_IRQ_nFAULT;
} else {
@@ -1607,7 +1602,6 @@ ppcintr(void *arg)
}
}
} else if (ppc->ppc_irqstat & PPC_IRQ_FIFO) {
-
/* classic interrupt I/O */
ppc->ppc_irqstat &= ~PPC_IRQ_FIFO;
}
Modified: head/sys/dev/ppc/ppc_acpi.c
==
--- head/sys/dev/ppc/ppc_acpi.c Tue Sep 1 21:58:40 2020(r365174)
+++ head/sys/dev/ppc/ppc_acpi.c Tue Sep 1 21:58:56 2020(r365175)
@@ -81,7 +81,6 @@ static device_method_t ppc_acpi_methods[] = {
#else
DEVMETHOD(ppbus_write, ppc_write),
#endif
-
{ 0, 0 }
};
Modified: head/sys/dev/ppc/ppc_isa.c
==
--- head/sys/dev/ppc/ppc_isa.c Tue Sep 1 21:58:40 2020(r365174)
+++ head/sys/dev/ppc/ppc_isa.c Tue Sep 1 21:58:56 2020(r365175)
@@ -76,7 +76,6 @@ static device_method_t ppc_isa_methods[] = {
DEVMETHOD(ppbus_ecp_sync, ppc_ecp_sync),
DEVMETHOD(ppbus_read, ppc_read),
DEVMETHOD(ppbus_write, ppc_isa_write),
-
{ 0, 0 }
};
@@ -234,7 +233,6 @@ ppc_isa_write(device_t dev, char *buf, int len, int ho
/* wait for an empty fifo */
while (!(r_ecr(ppc) & PPC_FIFO_EMPTY)) {
-
for (spin=100; spin; spin--)
if (r_ecr(ppc) & PPC_FIFO_EMPTY)
goto fifo_empty;
Modified: head/sys/dev/ppc/ppc_pci.c
==
--- head/sys/dev/ppc/ppc_pci.c Tue Sep 1 21:58:40 2020(r365174)
+++ head/sys/dev/ppc/ppc_pci.c Tue Sep 1 21:58:56 2020(r365175)
@@ -67,7 +67,6 @@ static device_method_t ppc_pci_methods[] = {
DEVMETHOD(ppbus_ecp_sync, ppc_ecp_sync),
DEVMETHOD(ppbus_read, ppc_read),
DEVMETHOD(ppbus_write, ppc_write),
-
{ 0, 0 }
};
Modified: head/sys/dev/ppc/ppc_puc.c
==
--- head/sys/dev/ppc/ppc_puc.c Tue Sep 1 21:58:40 2020(r365174)
+++ head/sys/dev/ppc/ppc_puc.c Tue Sep 1 21:58:56 2020(r365175)
@@ -69,7 +69,6 @@ static device_method_t ppc_puc_methods[] = {
DEVMETHOD(ppbus_ecp_sync, ppc_ecp_sync),
DEVMETHOD(ppbus_read, ppc_read),
DEVMETHOD(ppbus_write, ppc_write),
-
{ 0, 0 }
};
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365177 - head/sys/dev/powermac_nvram
Author: mjg
Date: Tue Sep 1 21:59:31 2020
New Revision: 365177
URL: https://svnweb.freebsd.org/changeset/base/365177
Log:
powermac_nvram: clean up empty lines in .c and .h files
Modified:
head/sys/dev/powermac_nvram/powermac_nvram.c
Modified: head/sys/dev/powermac_nvram/powermac_nvram.c
==
--- head/sys/dev/powermac_nvram/powermac_nvram.cTue Sep 1 21:59:11
2020(r365176)
+++ head/sys/dev/powermac_nvram/powermac_nvram.cTue Sep 1 21:59:31
2020(r365177)
@@ -76,7 +76,6 @@ static device_method_tpowermac_nvram_methods[] = {
DEVMETHOD(device_probe, powermac_nvram_probe),
DEVMETHOD(device_attach,powermac_nvram_attach),
DEVMETHOD(device_detach,powermac_nvram_detach),
-
{ 0, 0 }
};
@@ -200,7 +199,7 @@ powermac_nvram_detach(device_t dev)
destroy_dev(sc->sc_cdev);
sx_destroy(>sc_lock);
-
+
return 0;
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365172 - head/sys/dev/pst
Author: mjg
Date: Tue Sep 1 21:58:12 2020
New Revision: 365172
URL: https://svnweb.freebsd.org/changeset/base/365172
Log:
pst: clean up empty lines in .c and .h files
Modified:
head/sys/dev/pst/pst-pci.c
head/sys/dev/pst/pst-raid.c
Modified: head/sys/dev/pst/pst-pci.c
==
--- head/sys/dev/pst/pst-pci.c Tue Sep 1 21:58:04 2020(r365171)
+++ head/sys/dev/pst/pst-pci.c Tue Sep 1 21:58:12 2020(r365172)
@@ -116,7 +116,6 @@ iop_pci_detach(device_t dev)
return (0);
}
-
static device_method_t pst_pci_methods[] = {
DEVMETHOD(device_probe,iop_pci_probe),
DEVMETHOD(device_attach, iop_pci_attach),
Modified: head/sys/dev/pst/pst-raid.c
==
--- head/sys/dev/pst/pst-raid.c Tue Sep 1 21:58:04 2020(r365171)
+++ head/sys/dev/pst/pst-raid.c Tue Sep 1 21:58:12 2020(r365172)
@@ -365,7 +365,7 @@ static device_method_t pst_methods[] = {
DEVMETHOD(device_attach, pst_attach),
{ 0, 0 }
};
-
+
static driver_t pst_driver = {
"pst",
pst_methods,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365171 - head/sys/dev/puc
Author: mjg
Date: Tue Sep 1 21:58:04 2020
New Revision: 365171
URL: https://svnweb.freebsd.org/changeset/base/365171
Log:
puc: clean up empty lines in .c and .h files
Modified:
head/sys/dev/puc/puc_pci.c
head/sys/dev/puc/pucdata.c
Modified: head/sys/dev/puc/puc_pci.c
==
--- head/sys/dev/puc/puc_pci.c Tue Sep 1 21:57:50 2020(r365170)
+++ head/sys/dev/puc/puc_pci.c Tue Sep 1 21:58:04 2020(r365171)
@@ -160,7 +160,7 @@ puc_pci_detach(device_t dev)
int error;
sc = device_get_softc(dev);
-
+
error = puc_bfe_detach(dev);
if (error != 0)
@@ -171,7 +171,6 @@ puc_pci_detach(device_t dev)
return (error);
}
-
static device_method_t puc_pci_methods[] = {
/* Device interface */
Modified: head/sys/dev/puc/pucdata.c
==
--- head/sys/dev/puc/pucdata.c Tue Sep 1 21:57:50 2020(r365170)
+++ head/sys/dev/puc/pucdata.c Tue Sep 1 21:58:04 2020(r365171)
@@ -905,7 +905,6 @@ const struct puc_cfg puc_pci_devices[] = {
PUC_PORT_8S, 0x10, 0, 8,
},
-
/*
* Oxford Semiconductor PCI Express Expresso family
*
@@ -1279,7 +1278,6 @@ const struct puc_cfg puc_pci_devices[] = {
PUC_PORT_4S, 0x10, 0, 8,
.config_function = puc_config_icbook
},
-
{ 0x, 0, 0x, 0, NULL, 0 }
};
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365170 - head/sys/dev/pwm
Author: mjg
Date: Tue Sep 1 21:57:50 2020
New Revision: 365170
URL: https://svnweb.freebsd.org/changeset/base/365170
Log:
pwm: clean up empty lines in .c and .h files
Modified:
head/sys/dev/pwm/pwmc.c
head/sys/dev/pwm/pwmc.h
Modified: head/sys/dev/pwm/pwmc.c
==
--- head/sys/dev/pwm/pwmc.c Tue Sep 1 21:57:33 2020(r365169)
+++ head/sys/dev/pwm/pwmc.c Tue Sep 1 21:57:50 2020(r365170)
@@ -182,7 +182,7 @@ static int
pwmc_detach(device_t dev)
{
struct pwmc_softc *sc;
-
+
sc = device_get_softc(dev);
destroy_dev(sc->cdev);
Modified: head/sys/dev/pwm/pwmc.h
==
--- head/sys/dev/pwm/pwmc.h Tue Sep 1 21:57:33 2020(r365169)
+++ head/sys/dev/pwm/pwmc.h Tue Sep 1 21:57:50 2020(r365170)
@@ -46,5 +46,4 @@ struct pwm_state {
#definePWMGETSTATE _IOWR('G', 0, struct pwm_state)
#definePWMSETSTATE _IOWR('G', 1, struct pwm_state)
-
#endif /* _PWM_H_ */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365174 - head/sys/dev/proto
Author: mjg
Date: Tue Sep 1 21:58:40 2020
New Revision: 365174
URL: https://svnweb.freebsd.org/changeset/base/365174
Log:
proto: clean up empty lines in .c and .h files
Modified:
head/sys/dev/proto/proto_busdma.c
Modified: head/sys/dev/proto/proto_busdma.c
==
--- head/sys/dev/proto/proto_busdma.c Tue Sep 1 21:58:29 2020
(r365173)
+++ head/sys/dev/proto/proto_busdma.c Tue Sep 1 21:58:40 2020
(r365174)
@@ -270,7 +270,7 @@ proto_busdma_md_load_callback(void *arg, bus_dma_segme
bus_size_t sz, int error)
{
struct proto_callback_bundle *pcb = arg;
-
+
pcb->ioc->u.md.bus_nsegs = nseg;
pcb->ioc->u.md.bus_addr = segs[0].ds_addr;
}
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365173 - head/sys/dev/psci
Author: mjg Date: Tue Sep 1 21:58:29 2020 New Revision: 365173 URL: https://svnweb.freebsd.org/changeset/base/365173 Log: psci: clean up empty lines in .c and .h files Modified: head/sys/dev/psci/psci.c Modified: head/sys/dev/psci/psci.c == --- head/sys/dev/psci/psci.cTue Sep 1 21:58:12 2020(r365172) +++ head/sys/dev/psci/psci.cTue Sep 1 21:58:29 2020(r365173) @@ -498,7 +498,6 @@ psci_v0_1_init(device_t dev, int default_version __unu phandle_t node; int len; - /* Zero out the function ID table - Is this needed ? */ for (psci_fn = PSCI_FN_VERSION, psci_fnid = PSCI_FNID_VERSION; psci_fn < PSCI_FN_MAX; psci_fn++, psci_fnid++) ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365168 - head/sys/dev/qlxgb
Author: mjg
Date: Tue Sep 1 21:57:15 2020
New Revision: 365168
URL: https://svnweb.freebsd.org/changeset/base/365168
Log:
qlxgb: clean up empty lines in .c and .h files
Modified:
head/sys/dev/qlxgb/qla_dbg.c
head/sys/dev/qlxgb/qla_dbg.h
head/sys/dev/qlxgb/qla_def.h
head/sys/dev/qlxgb/qla_hw.c
head/sys/dev/qlxgb/qla_hw.h
head/sys/dev/qlxgb/qla_inline.h
head/sys/dev/qlxgb/qla_ioctl.c
head/sys/dev/qlxgb/qla_isr.c
head/sys/dev/qlxgb/qla_misc.c
head/sys/dev/qlxgb/qla_os.c
head/sys/dev/qlxgb/qla_os.h
head/sys/dev/qlxgb/qla_reg.h
Modified: head/sys/dev/qlxgb/qla_dbg.c
==
--- head/sys/dev/qlxgb/qla_dbg.cTue Sep 1 21:56:55 2020
(r365167)
+++ head/sys/dev/qlxgb/qla_dbg.cTue Sep 1 21:57:15 2020
(r365168)
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include "qla_glbl.h"
#include "qla_dbg.h"
-
uint32_t dbg_level = 0 ;
/*
* Name: qla_dump_buf32
@@ -157,7 +156,7 @@ void qla_dump_buf8(qla_host_t *ha, char *msg, void *db
buf = dbuf;
device_printf(dev, "%s: %s 0x%x dump start\n", __func__, msg, len);
-
+
while (len >= 16) {
device_printf(dev,"0x%08x:"
" %02x %02x %02x %02x %02x %02x %02x %02x"
@@ -260,6 +259,6 @@ void qla_dump_buf8(qla_host_t *ha, char *msg, void *db
default:
break;
}
-
+
device_printf(dev, "%s: %s dump end\n", __func__, msg);
}
Modified: head/sys/dev/qlxgb/qla_dbg.h
==
--- head/sys/dev/qlxgb/qla_dbg.hTue Sep 1 21:56:55 2020
(r365167)
+++ head/sys/dev/qlxgb/qla_dbg.hTue Sep 1 21:57:15 2020
(r365168)
@@ -46,7 +46,6 @@ extern void qla_dump_buf16(qla_host_t *ha, char *str,
extern void qla_dump_buf32(qla_host_t *ha, char *str, void *dbuf,
uint32_t len32);
-
#define DBG 1
#if DBG
Modified: head/sys/dev/qlxgb/qla_def.h
==
--- head/sys/dev/qlxgb/qla_def.hTue Sep 1 21:56:55 2020
(r365167)
+++ head/sys/dev/qlxgb/qla_def.hTue Sep 1 21:57:15 2020
(r365168)
@@ -141,7 +141,7 @@ struct qla_host {
int msix_count;
void*intr_handle;
qla_ivec_t irq_vec[Q8_MSI_COUNT];
-
+
/* parent dma tag */
bus_dma_tag_t parent_tag;
Modified: head/sys/dev/qlxgb/qla_hw.c
==
--- head/sys/dev/qlxgb/qla_hw.c Tue Sep 1 21:56:55 2020(r365167)
+++ head/sys/dev/qlxgb/qla_hw.c Tue Sep 1 21:57:15 2020(r365168)
@@ -155,7 +155,7 @@ qla_alloc_dma(qla_host_t *ha)
ha->hw.dma_buf.tx_ring.alignment = 8;
ha->hw.dma_buf.tx_ring.size =
(sizeof(q80_tx_cmd_t)) * NUM_TX_DESCRIPTORS;
-
+
if (qla_alloc_dmabuf(ha, >hw.dma_buf.tx_ring)) {
device_printf(dev, "%s: tx ring alloc failed\n", __func__);
goto qla_alloc_dma_exit;
@@ -181,7 +181,7 @@ qla_alloc_dma(qla_host_t *ha)
NUM_RX_JUMBO_DESCRIPTORS;
} else
break;
-
+
if (qla_alloc_dmabuf(ha, >hw.dma_buf.rds_ring[i])) {
QL_DPRINT4((dev, "%s: rds ring alloc failed\n",
__func__));
@@ -239,10 +239,10 @@ qla_alloc_dma(qla_host_t *ha)
size += sizeof (uint32_t); /* for tx consumer index */
size = QL_ALIGN(size, PAGE_SIZE);
-
+
ha->hw.dma_buf.context.alignment = 8;
ha->hw.dma_buf.context.size = size;
-
+
if (qla_alloc_dmabuf(ha, >hw.dma_buf.context)) {
device_printf(dev, "%s: context alloc failed\n", __func__);
goto qla_alloc_dma_exit;
@@ -281,12 +281,11 @@ qla_init_cntxt_regions(qla_host_t *ha)
hw = >hw;
hw->tx_ring_base = hw->dma_buf.tx_ring.dma_b;
-
+
for (i = 0; i < ha->hw.num_sds_rings; i++)
hw->sds[i].sds_ring_base =
(q80_stat_desc_t *)hw->dma_buf.sds_ring[i].dma_b;
-
phys_addr = hw->dma_buf.context.dma_addr;
memset((void *)hw->dma_buf.context.dma_b, 0,
@@ -331,7 +330,7 @@ qla_init_cntxt_regions(qla_host_t *ha)
tx_cntxt_req->caps[0] = qla_host_to_le32((CNTXT_CAP0_BASEFW |
CNTXT_CAP0_LEGACY_MN | CNTXT_CAP0_LSO));
-
+
tx_cntxt_req->intr_mode = qla_host_to_le32(CNTXT_INTR_MODE_SHARED);
tx_cntxt_req->phys_addr =
@@ -423,7 +422,7 @@ qla_issue_cmd(qla_host_t *ha, qla_cdrp_t *cdrp)
signature = 0xcafe | 0x0100 | ha->pci_func;
ret = qla_sem_lock(ha, Q8_SEM5_LOCK, 0, (uint32_t)ha->pci_func);
-
+
if
svn commit: r365167 - head/sys/dev/qlxgbe
Author: mjg
Date: Tue Sep 1 21:56:55 2020
New Revision: 365167
URL: https://svnweb.freebsd.org/changeset/base/365167
Log:
qlxgbe: clean up empty lines in .c and .h files
Modified:
head/sys/dev/qlxgbe/ql_boot.c
head/sys/dev/qlxgbe/ql_dbg.c
head/sys/dev/qlxgbe/ql_dbg.h
head/sys/dev/qlxgbe/ql_def.h
head/sys/dev/qlxgbe/ql_fw.c
head/sys/dev/qlxgbe/ql_glbl.h
head/sys/dev/qlxgbe/ql_hw.c
head/sys/dev/qlxgbe/ql_hw.h
head/sys/dev/qlxgbe/ql_inline.h
head/sys/dev/qlxgbe/ql_ioctl.c
head/sys/dev/qlxgbe/ql_ioctl.h
head/sys/dev/qlxgbe/ql_isr.c
head/sys/dev/qlxgbe/ql_minidump.c
head/sys/dev/qlxgbe/ql_minidump.h
head/sys/dev/qlxgbe/ql_misc.c
head/sys/dev/qlxgbe/ql_os.c
head/sys/dev/qlxgbe/ql_os.h
head/sys/dev/qlxgbe/ql_reset.c
head/sys/dev/qlxgbe/ql_tmplt.h
Modified: head/sys/dev/qlxgbe/ql_boot.c
==
--- head/sys/dev/qlxgbe/ql_boot.c Tue Sep 1 21:56:30 2020
(r365166)
+++ head/sys/dev/qlxgbe/ql_boot.c Tue Sep 1 21:56:55 2020
(r365167)
@@ -10962,4 +10962,3 @@ unsigned char ql83xx_bootloader[] = {
0x00, 0x00, 0x00, 0x00, 0x9b, 0x64, 0x92, 0x0e
};
unsigned int ql83xx_bootloader_len = 131072;
-
Modified: head/sys/dev/qlxgbe/ql_dbg.c
==
--- head/sys/dev/qlxgbe/ql_dbg.cTue Sep 1 21:56:30 2020
(r365166)
+++ head/sys/dev/qlxgbe/ql_dbg.cTue Sep 1 21:56:55 2020
(r365167)
@@ -153,7 +153,7 @@ void ql_dump_buf8(qla_host_t *ha, const char *msg, voi
buf = dbuf;
device_printf(dev, "%s: %s 0x%x dump start\n", __func__, msg, len);
-
+
while (len >= 16) {
device_printf(dev,"0x%08x:"
" %02x %02x %02x %02x %02x %02x %02x %02x"
@@ -256,7 +256,6 @@ void ql_dump_buf8(qla_host_t *ha, const char *msg, voi
default:
break;
}
-
+
device_printf(dev, "%s: %s dump end\n", __func__, msg);
}
-
Modified: head/sys/dev/qlxgbe/ql_dbg.h
==
--- head/sys/dev/qlxgbe/ql_dbg.hTue Sep 1 21:56:30 2020
(r365166)
+++ head/sys/dev/qlxgbe/ql_dbg.hTue Sep 1 21:56:55 2020
(r365167)
@@ -102,5 +102,4 @@ extern void ql_dump_buf32(qla_host_t *ha, const char *
#endif
-
#endif /* #ifndef _QL_DBG_H_ */
Modified: head/sys/dev/qlxgbe/ql_def.h
==
--- head/sys/dev/qlxgbe/ql_def.hTue Sep 1 21:56:30 2020
(r365166)
+++ head/sys/dev/qlxgbe/ql_def.hTue Sep 1 21:56:55 2020
(r365167)
@@ -170,7 +170,7 @@ struct qla_host {
int msix_count;
qla_ivec_t irq_vec[MAX_SDS_RINGS];
-
+
/* parent dma tag */
bus_dma_tag_t parent_tag;
@@ -228,7 +228,7 @@ struct qla_host {
struct task stats_task;
struct taskqueue*stats_tq;
-
+
uint32_tfw_ver_major;
uint32_tfw_ver_minor;
uint32_tfw_ver_sub;
Modified: head/sys/dev/qlxgbe/ql_fw.c
==
--- head/sys/dev/qlxgbe/ql_fw.c Tue Sep 1 21:56:30 2020(r365166)
+++ head/sys/dev/qlxgbe/ql_fw.c Tue Sep 1 21:56:55 2020(r365167)
@@ -149068,4 +149068,3 @@ unsigned char ql83xx_firmware[] = {
0x36, 0x37, 0x20, 0x0a
};
unsigned int ql83xx_firmware_len = 1788328;
-
Modified: head/sys/dev/qlxgbe/ql_glbl.h
==
--- head/sys/dev/qlxgbe/ql_glbl.h Tue Sep 1 21:56:30 2020
(r365166)
+++ head/sys/dev/qlxgbe/ql_glbl.h Tue Sep 1 21:56:55 2020
(r365167)
@@ -124,5 +124,4 @@ extern void ql_sp_log(qla_host_t *ha, uint16_t fmtstr_
extern void ql_alloc_sp_log_buffer(qla_host_t *ha);
extern void ql_free_sp_log_buffer(qla_host_t *ha);
-
#endif /* #ifndef_QL_GLBL_H_ */
Modified: head/sys/dev/qlxgbe/ql_hw.c
==
--- head/sys/dev/qlxgbe/ql_hw.c Tue Sep 1 21:56:30 2020(r365166)
+++ head/sys/dev/qlxgbe/ql_hw.c Tue Sep 1 21:56:55 2020(r365167)
@@ -98,10 +98,9 @@ qla_sysctl_stop_pegs(SYSCTL_HANDLER_ARGS)
{
int err, ret = 0;
qla_host_t *ha;
-
+
err = sysctl_handle_int(oidp, , 0, req);
-
if (err || !req->newptr)
return (err);
@@ -147,7 +146,6 @@ qla_sysctl_port_cfg(SYSCTL_HANDLER_ARGS)
ha = (qla_host_t *)arg1;
if ((qla_validate_set_port_cfg_bit((uint32_t)ret) == 0)) {
-
err = qla_get_port_config(ha, _bits);
if (err)
@@ -215,7 +213,6 @@ qla_sysctl_set_cam_search_mode(SYSCTL_HANDLER_ARGS)
svn commit: r365169 - in head/sys/dev/qlnx: qlnxe qlnxr
Author: mjg
Date: Tue Sep 1 21:57:33 2020
New Revision: 365169
URL: https://svnweb.freebsd.org/changeset/base/365169
Log:
qlnx: clean up empty lines in .c and .h files
Modified:
head/sys/dev/qlnx/qlnxe/bcm_osal.h
head/sys/dev/qlnx/qlnxe/common_hsi.h
head/sys/dev/qlnx/qlnxe/ecore_cxt.c
head/sys/dev/qlnx/qlnxe/ecore_dbg_fw_funcs.c
head/sys/dev/qlnx/qlnxe/ecore_dbg_fw_funcs.h
head/sys/dev/qlnx/qlnxe/ecore_dbg_values.h
head/sys/dev/qlnx/qlnxe/ecore_dev.c
head/sys/dev/qlnx/qlnxe/ecore_fcoe.h
head/sys/dev/qlnx/qlnxe/ecore_hsi_common.h
head/sys/dev/qlnx/qlnxe/ecore_hsi_debug_tools.h
head/sys/dev/qlnx/qlnxe/ecore_hsi_eth.h
head/sys/dev/qlnx/qlnxe/ecore_hsi_fcoe.h
head/sys/dev/qlnx/qlnxe/ecore_hsi_init_func.h
head/sys/dev/qlnx/qlnxe/ecore_hsi_init_tool.h
head/sys/dev/qlnx/qlnxe/ecore_hsi_iscsi.h
head/sys/dev/qlnx/qlnxe/ecore_hsi_iwarp.h
head/sys/dev/qlnx/qlnxe/ecore_hsi_rdma.h
head/sys/dev/qlnx/qlnxe/ecore_hsi_roce.h
head/sys/dev/qlnx/qlnxe/ecore_init_fw_funcs.c
head/sys/dev/qlnx/qlnxe/ecore_init_ops.c
head/sys/dev/qlnx/qlnxe/ecore_init_ops.h
head/sys/dev/qlnx/qlnxe/ecore_int.c
head/sys/dev/qlnx/qlnxe/ecore_int.h
head/sys/dev/qlnx/qlnxe/ecore_iov_api.h
head/sys/dev/qlnx/qlnxe/ecore_iscsi.h
head/sys/dev/qlnx/qlnxe/ecore_iscsi_api.h
head/sys/dev/qlnx/qlnxe/ecore_iwarp.c
head/sys/dev/qlnx/qlnxe/ecore_l2.c
head/sys/dev/qlnx/qlnxe/ecore_l2.h
head/sys/dev/qlnx/qlnxe/ecore_ll2.c
head/sys/dev/qlnx/qlnxe/ecore_mcp.c
head/sys/dev/qlnx/qlnxe/ecore_mcp.h
head/sys/dev/qlnx/qlnxe/ecore_mng_tlv.c
head/sys/dev/qlnx/qlnxe/ecore_ooo.h
head/sys/dev/qlnx/qlnxe/ecore_proto_if.h
head/sys/dev/qlnx/qlnxe/ecore_rdma.c
head/sys/dev/qlnx/qlnxe/ecore_rdma.h
head/sys/dev/qlnx/qlnxe/ecore_roce.c
head/sys/dev/qlnx/qlnxe/ecore_roce_api.h
head/sys/dev/qlnx/qlnxe/ecore_rt_defs.h
head/sys/dev/qlnx/qlnxe/ecore_sp_api.h
head/sys/dev/qlnx/qlnxe/ecore_sp_commands.c
head/sys/dev/qlnx/qlnxe/ecore_sp_commands.h
head/sys/dev/qlnx/qlnxe/ecore_spq.c
head/sys/dev/qlnx/qlnxe/ecore_sriov.c
head/sys/dev/qlnx/qlnxe/ecore_status.h
head/sys/dev/qlnx/qlnxe/ecore_tcp_ip.h
head/sys/dev/qlnx/qlnxe/ecore_vf.c
head/sys/dev/qlnx/qlnxe/ecore_vf.h
head/sys/dev/qlnx/qlnxe/ecore_vf_api.h
head/sys/dev/qlnx/qlnxe/ecore_vfpf_if.h
head/sys/dev/qlnx/qlnxe/eth_common.h
head/sys/dev/qlnx/qlnxe/fcoe_common.h
head/sys/dev/qlnx/qlnxe/iscsi_common.h
head/sys/dev/qlnx/qlnxe/mcp_private.h
head/sys/dev/qlnx/qlnxe/mcp_public.h
head/sys/dev/qlnx/qlnxe/mfw_hsi.h
head/sys/dev/qlnx/qlnxe/nvm_cfg.h
head/sys/dev/qlnx/qlnxe/nvm_map.h
head/sys/dev/qlnx/qlnxe/pcics_reg_driver.h
head/sys/dev/qlnx/qlnxe/qlnx_def.h
head/sys/dev/qlnx/qlnxe/qlnx_ioctl.c
head/sys/dev/qlnx/qlnxe/qlnx_ioctl.h
head/sys/dev/qlnx/qlnxe/qlnx_os.c
head/sys/dev/qlnx/qlnxe/qlnx_os.h
head/sys/dev/qlnx/qlnxe/qlnx_rdma.c
head/sys/dev/qlnx/qlnxe/qlnx_rdma.h
head/sys/dev/qlnx/qlnxe/qlnx_ver.h
head/sys/dev/qlnx/qlnxe/rdma_common.h
head/sys/dev/qlnx/qlnxe/roce_common.h
head/sys/dev/qlnx/qlnxe/spad_layout.h
head/sys/dev/qlnx/qlnxe/storage_common.h
head/sys/dev/qlnx/qlnxe/tcp_common.h
head/sys/dev/qlnx/qlnxr/qlnxr_cm.c
head/sys/dev/qlnx/qlnxr/qlnxr_cm.h
head/sys/dev/qlnx/qlnxr/qlnxr_def.h
head/sys/dev/qlnx/qlnxr/qlnxr_os.c
head/sys/dev/qlnx/qlnxr/qlnxr_roce.h
head/sys/dev/qlnx/qlnxr/qlnxr_user.h
head/sys/dev/qlnx/qlnxr/qlnxr_verbs.c
head/sys/dev/qlnx/qlnxr/qlnxr_verbs.h
Modified: head/sys/dev/qlnx/qlnxe/bcm_osal.h
==
--- head/sys/dev/qlnx/qlnxe/bcm_osal.h Tue Sep 1 21:57:15 2020
(r365168)
+++ head/sys/dev/qlnx/qlnxe/bcm_osal.h Tue Sep 1 21:57:33 2020
(r365169)
@@ -92,7 +92,6 @@ extern void qlnx_get_protocol_stats(void *cdev, int pr
extern void qlnx_sp_isr(void *arg);
-
extern void qlnx_osal_vf_fill_acquire_resc_req(void *p_hwfn, void *p_resc_req,
void *p_sw_info);
extern void qlnx_osal_iov_vf_cleanup(void *p_hwfn, uint8_t relative_vf_id);
@@ -126,7 +125,7 @@ is_power_of_2(unsigned long n)
{
return (n == roundup_pow_of_two(n));
}
-
+
static __inline unsigned long
rounddown_pow_of_two(unsigned long x)
{
@@ -345,7 +344,6 @@ do {
\
} \
} while (0)
-
#define OSAL_LIST_IS_EMPTY(list) \
((list)->cnt == 0)
@@ -364,7 +362,6 @@ do {
\
entry = (type *)tmp_entry, \
tmp_entry = (entry) ? OSAL_LIST_NEXT(entry, field, type) : NULL)
-
#define OSAL_BAR_SIZE(dev, bar_id) qlnx_pci_bus_get_bar_size(dev, bar_id)
#define OSAL_PCI_READ_CONFIG_BYTE(dev, reg, value) \
@@ -440,7 +437,6 @@ qlnx_log2(uint32_t x)
#define OSAL_UNLIKELY
#define OSAL_NULL NULL
-
#define OSAL_MAX_T(type, __max1, __max2)
svn commit: r365165 - head/sys/dev/ral
Author: mjg
Date: Tue Sep 1 21:56:10 2020
New Revision: 365165
URL: https://svnweb.freebsd.org/changeset/base/365165
Log:
ral: clean up empty lines in .c and .h files
Modified:
head/sys/dev/ral/if_ral_pci.c
head/sys/dev/ral/rt2560.c
head/sys/dev/ral/rt2560reg.h
head/sys/dev/ral/rt2661.c
head/sys/dev/ral/rt2661reg.h
head/sys/dev/ral/rt2661var.h
head/sys/dev/ral/rt2860.c
head/sys/dev/ral/rt2860reg.h
Modified: head/sys/dev/ral/if_ral_pci.c
==
--- head/sys/dev/ral/if_ral_pci.c Tue Sep 1 21:56:03 2020
(r365164)
+++ head/sys/dev/ral/if_ral_pci.c Tue Sep 1 21:56:10 2020
(r365165)
@@ -231,7 +231,7 @@ ral_pci_attach(device_t dev)
sc->sc_st = rman_get_bustag(psc->mem);
sc->sc_sh = rman_get_bushandle(psc->mem);
sc->sc_invalid = 1;
-
+
rid = 0;
if (ral_msi_disable == 0) {
count = 1;
@@ -265,7 +265,7 @@ ral_pci_attach(device_t dev)
return error;
}
sc->sc_invalid = 0;
-
+
return 0;
}
@@ -274,7 +274,7 @@ ral_pci_detach(device_t dev)
{
struct ral_pci_softc *psc = device_get_softc(dev);
struct rt2560_softc *sc = >u.sc_rt2560;
-
+
/* check if device was removed */
sc->sc_invalid = !bus_child_present(dev);
Modified: head/sys/dev/ral/rt2560.c
==
--- head/sys/dev/ral/rt2560.c Tue Sep 1 21:56:03 2020(r365164)
+++ head/sys/dev/ral/rt2560.c Tue Sep 1 21:56:10 2020(r365165)
@@ -342,7 +342,7 @@ rt2560_detach(void *xsc)
{
struct rt2560_softc *sc = xsc;
struct ieee80211com *ic = >sc_ic;
-
+
rt2560_stop(sc);
ieee80211_ifdetach(ic);
@@ -2453,7 +2453,6 @@ rt2560_read_config(struct rt2560_softc *sc)
DPRINTF(sc, "rssi correction %d, calibrate 0x%02x\n",
sc->rssi_corr, val);
}
-
static void
rt2560_scan_start(struct ieee80211com *ic)
Modified: head/sys/dev/ral/rt2560reg.h
==
--- head/sys/dev/ral/rt2560reg.hTue Sep 1 21:56:03 2020
(r365164)
+++ head/sys/dev/ral/rt2560reg.hTue Sep 1 21:56:10 2020
(r365165)
@@ -115,7 +115,6 @@
#define RT2560_SECCSR1 0x0158 /* WEP control */
#define RT2560_BBPCSR1 0x015c /* BBP TX Configuration */
-
/* possible flags for register RXCSR0 */
#define RT2560_DISABLE_RX (1 << 0)
#define RT2560_DROP_CRC_ERROR (1 << 1)
Modified: head/sys/dev/ral/rt2661.c
==
--- head/sys/dev/ral/rt2661.c Tue Sep 1 21:56:03 2020(r365164)
+++ head/sys/dev/ral/rt2661.c Tue Sep 1 21:56:10 2020(r365165)
@@ -332,7 +332,7 @@ rt2661_detach(void *xsc)
{
struct rt2661_softc *sc = xsc;
struct ieee80211com *ic = >sc_ic;
-
+
RAL_LOCK(sc);
rt2661_stop_locked(sc);
RAL_UNLOCK(sc);
Modified: head/sys/dev/ral/rt2661reg.h
==
--- head/sys/dev/ral/rt2661reg.hTue Sep 1 21:56:03 2020
(r365164)
+++ head/sys/dev/ral/rt2661reg.hTue Sep 1 21:56:10 2020
(r365165)
@@ -119,7 +119,6 @@
#define RT2661_IO_CNTL_CSR 0x3498
#define RT2661_MCU_CODE_BASE 0x4000
-
/* possible flags for register HOST_CMD_CSR */
#define RT2661_KICK_CMD(1 << 7)
/* Host to MCU (8051) command identifiers */
Modified: head/sys/dev/ral/rt2661var.h
==
--- head/sys/dev/ral/rt2661var.hTue Sep 1 21:56:03 2020
(r365164)
+++ head/sys/dev/ral/rt2661var.hTue Sep 1 21:56:10 2020
(r365165)
@@ -114,7 +114,7 @@ struct rt2661_softc {
* The same in both up to here
*
*/
-
+
int sc_flags;
#defineRAL_FW_LOADED 0x1
#defineRAL_INPUT_RUNNING 0x2
Modified: head/sys/dev/ral/rt2860.c
==
--- head/sys/dev/ral/rt2860.c Tue Sep 1 21:56:03 2020(r365164)
+++ head/sys/dev/ral/rt2860.c Tue Sep 1 21:56:10 2020(r365165)
@@ -504,7 +504,6 @@ rt2860_dma_map_addr(void *arg, bus_dma_segment_t *segs
*(bus_addr_t *)arg = segs[0].ds_addr;
}
-
static int
rt2860_alloc_tx_ring(struct rt2860_softc *sc, struct rt2860_tx_ring *ring)
{
@@ -2591,7 +2590,7 @@ rt5390_set_chan(struct rt2860_softc *sc, u_int chan)
rf = MIN(rf, 0x5f);
if (tmp != rf)
rt2860_mcu_cmd(sc, 0x74, (tmp << 8 ) | rf, 0);
-
+
if (sc->mac_ver == 0x5390) {
if (chan <=
svn commit: r365163 - head/sys/dev/rndtest
Author: mjg Date: Tue Sep 1 21:55:52 2020 New Revision: 365163 URL: https://svnweb.freebsd.org/changeset/base/365163 Log: rndtest: clean up empty lines in .c and .h files Modified: head/sys/dev/rndtest/rndtest.h Modified: head/sys/dev/rndtest/rndtest.h == --- head/sys/dev/rndtest/rndtest.h Tue Sep 1 21:55:37 2020 (r365162) +++ head/sys/dev/rndtest/rndtest.h Tue Sep 1 21:55:52 2020 (r365163) @@ -34,7 +34,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ - /* Some of the tests depend on these values */ #defineRNDTEST_NBYTES 2500 #defineRNDTEST_NBITS (8 * RNDTEST_NBYTES) ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365164 - head/sys/dev/rl
Author: mjg
Date: Tue Sep 1 21:56:03 2020
New Revision: 365164
URL: https://svnweb.freebsd.org/changeset/base/365164
Log:
rl: clean up empty lines in .c and .h files
Modified:
head/sys/dev/rl/if_rl.c
Modified: head/sys/dev/rl/if_rl.c
==
--- head/sys/dev/rl/if_rl.c Tue Sep 1 21:55:52 2020(r365163)
+++ head/sys/dev/rl/if_rl.c Tue Sep 1 21:56:03 2020(r365164)
@@ -590,7 +590,7 @@ rl_probe(device_t dev)
const struct rl_type*t;
uint16_tdevid, revid, vendor;
int i;
-
+
vendor = pci_get_vendor(dev);
devid = pci_get_device(dev);
revid = pci_get_revid(dev);
@@ -667,7 +667,6 @@ rl_attach(device_t dev)
pci_enable_busmaster(dev);
-
/*
* Map control/status registers.
* Default to using PIO access for this driver. On SMP systems,
@@ -1393,7 +1392,7 @@ rl_twister_update(struct rl_softc *sc)
case DONE:
break;
}
-
+
}
static void
@@ -1636,7 +1635,6 @@ rl_start_locked(struct ifnet *ifp)
return;
while (RL_CUR_TXMBUF(sc) == NULL) {
-
IFQ_DRV_DEQUEUE(>if_snd, m_head);
if (m_head == NULL)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365166 - head/sys/dev/qlxge
Author: mjg
Date: Tue Sep 1 21:56:30 2020
New Revision: 365166
URL: https://svnweb.freebsd.org/changeset/base/365166
Log:
qlxge: clean up empty lines in .c and .h files
Modified:
head/sys/dev/qlxge/qls_dbg.c
head/sys/dev/qlxge/qls_dbg.h
head/sys/dev/qlxge/qls_def.h
head/sys/dev/qlxge/qls_dump.c
head/sys/dev/qlxge/qls_dump.h
head/sys/dev/qlxge/qls_hw.c
head/sys/dev/qlxge/qls_hw.h
head/sys/dev/qlxge/qls_ioctl.c
head/sys/dev/qlxge/qls_ioctl.h
head/sys/dev/qlxge/qls_isr.c
head/sys/dev/qlxge/qls_os.c
head/sys/dev/qlxge/qls_os.h
Modified: head/sys/dev/qlxge/qls_dbg.c
==
--- head/sys/dev/qlxge/qls_dbg.cTue Sep 1 21:56:10 2020
(r365165)
+++ head/sys/dev/qlxge/qls_dbg.cTue Sep 1 21:56:30 2020
(r365166)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include "qls_glbl.h"
#include "qls_dbg.h"
-
uint32_t qls_dbg_level = 0 ;
/*
* Name: qls_dump_buf32
@@ -162,7 +161,7 @@ qls_dump_buf8(qla_host_t *ha, const char *msg, void *d
buf = dbuf;
device_printf(dev, "%s: %s 0x%x dump start\n", __func__, msg, len);
-
+
while (len >= 16) {
device_printf(dev,"0x%08x:"
" %02x %02x %02x %02x %02x %02x %02x %02x"
@@ -265,7 +264,7 @@ qls_dump_buf8(qla_host_t *ha, const char *msg, void *d
default:
break;
}
-
+
device_printf(dev, "%s: %s dump end\n", __func__, msg);
return;
@@ -306,4 +305,3 @@ qls_dump_cq(qla_host_t *ha)
return;
}
-
Modified: head/sys/dev/qlxge/qls_dbg.h
==
--- head/sys/dev/qlxge/qls_dbg.hTue Sep 1 21:56:10 2020
(r365165)
+++ head/sys/dev/qlxge/qls_dbg.hTue Sep 1 21:56:30 2020
(r365166)
@@ -48,7 +48,6 @@ extern void qls_dump_buf32(qla_host_t *ha, const char
extern void qls_dump_cq(qla_host_t *ha);
-
#ifdef QL_DBG
#define QL_DPRINT1(x) if (qls_dbg_level & 0x0001) device_printf x
@@ -91,6 +90,5 @@ extern void qls_dump_cq(qla_host_t *ha);
#define QL_DUMP_CQ(ha)
#endif
-
#endif /* #ifndef _QL_DBG_H_ */
Modified: head/sys/dev/qlxge/qls_def.h
==
--- head/sys/dev/qlxge/qls_def.hTue Sep 1 21:56:10 2020
(r365165)
+++ head/sys/dev/qlxge/qls_def.hTue Sep 1 21:56:30 2020
(r365166)
@@ -96,7 +96,6 @@ struct qla_tx_buf {
typedef struct qla_tx_buf qla_tx_buf_t;
struct qla_tx_ring {
-
volatile struct {
uint32_twq_dma:1,
privb_dma:1;
@@ -119,7 +118,7 @@ struct qla_tx_ring {
uint32_t*txr_cons_vaddr;
bus_addr_t txr_cons_paddr;
-
+
volatile uint32_t txr_free; /* # of free entries in tx ring */
volatile uint32_t txr_next; /* # next available tx ring entry */
volatile uint32_t txr_done;
@@ -147,7 +146,6 @@ typedef struct qla_tx_ring qla_tx_ring_t;
#define QLA_LGBQ_AND_TABLE_SIZE\
((QLA_LBQ_SIZE + PAGE_SIZE + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1))
-
/* Please note that Small Buffer size is determined by max mtu size */
#define QLA_NUM_SMB_ENTRIESNUM_RX_DESCRIPTORS
@@ -222,7 +220,6 @@ struct qla_rx_ring {
};
typedef struct qla_rx_ring qla_rx_ring_t;
-
#define QLA_WATCHDOG_CALLOUT_TICKS 1
/*
@@ -326,7 +323,7 @@ struct qla_host {
uint8_t mac_addr[ETHER_ADDR_LEN];
uint32_tnmcast;
qla_mcast_t mcast[Q8_MAX_NUM_MULTICAST_ADDRS];
-
+
/* Link Related */
uint8_tlink_up;
uint32_tlink_status;
@@ -358,7 +355,7 @@ struct qla_host {
/* mpi dump related */
qla_dma_t mpi_dma;
qla_dma_t rss_dma;
-
+
};
typedef struct qla_host qla_host_t;
Modified: head/sys/dev/qlxge/qls_dump.c
==
--- head/sys/dev/qlxge/qls_dump.c Tue Sep 1 21:56:10 2020
(r365165)
+++ head/sys/dev/qlxge/qls_dump.c Tue Sep 1 21:56:30 2020
(r365166)
@@ -33,7 +33,6 @@
#include
__FBSDID("$FreeBSD$");
-
#include "qls_os.h"
#include "qls_hw.h"
#include "qls_def.h"
@@ -380,7 +379,6 @@ qls_wait_reg_rdy(qla_host_t *ha , uint32_t reg, uint32
int count = 10;
while (count) {
-
data = READ_REG32(ha, reg);
if (data & err_bit)
@@ -439,7 +437,6 @@ exit_qls_wr_mpi_reg:
return (ret);
}
-
#define Q81_TEST_LOGIC_FUNC_PORT_CONFIG 0x1002
#define Q81_INVALID_NUM0x
@@ -528,7 +525,6 @@ qls_wait_ofunc_reg_rdy(qla_host_t *ha , uint32_t reg,
int count = 10;
while (count) {
-
svn commit: r365161 - head/sys/dev/safe
Author: mjg Date: Tue Sep 1 21:55:23 2020 New Revision: 365161 URL: https://svnweb.freebsd.org/changeset/base/365161 Log: safe: clean up empty lines in .c and .h files Modified: head/sys/dev/safe/safe.c Modified: head/sys/dev/safe/safe.c == --- head/sys/dev/safe/safe.cTue Sep 1 21:54:58 2020(r365160) +++ head/sys/dev/safe/safe.cTue Sep 1 21:55:23 2020(r365161) @@ -1736,9 +1736,9 @@ safe_free_entry(struct safe_softc *sc, struct safe_rin m_freem(re->re_dst_m); crp = (struct cryptop *)re->re_crp; - + re->re_desc.d_csr = 0; - + crp->crp_etype = EFAULT; crypto_done(crp); return(0); ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365162 - head/sys/dev/rt
Author: mjg
Date: Tue Sep 1 21:55:37 2020
New Revision: 365162
URL: https://svnweb.freebsd.org/changeset/base/365162
Log:
rt: clean up empty lines in .c and .h files
Modified:
head/sys/dev/rt/if_rt.c
Modified: head/sys/dev/rt/if_rt.c
==
--- head/sys/dev/rt/if_rt.c Tue Sep 1 21:55:23 2020(r365161)
+++ head/sys/dev/rt/if_rt.c Tue Sep 1 21:55:37 2020(r365162)
@@ -295,7 +295,6 @@ ether_request_mac(device_t dev, uint8_t *mac)
#if defined(RT305X_UBOOT) || defined(__REDBOOT__) || defined(__ROUTERBOOT__)
if ((var = kern_getenv("ethaddr")) != NULL ||
(var = kern_getenv("kmac")) != NULL ) {
-
if(!macaddr_atoi(var, mac)) {
printf("%s: use %s macaddr from KENV\n",
device_get_nameunit(dev), var);
@@ -312,7 +311,6 @@ ether_request_mac(device_t dev, uint8_t *mac)
*/
if (!resource_string_value(device_get_name(dev),
device_get_unit(dev), "macaddr", (const char **))) {
-
if(!macaddr_atoi(var, mac)) {
printf("%s: use %s macaddr from hints\n",
device_get_nameunit(dev), var);
@@ -404,7 +402,6 @@ rt_attach(device_t dev)
/* Reset hardware */
reset_freng(sc);
-
if (sc->rt_chipid == RT_CHIPID_MT7620) {
sc->csum_fail_ip = MT7620_RXD_SRC_IP_CSUM_FAIL;
sc->csum_fail_l4 = MT7620_RXD_SRC_L4_CSUM_FAIL;
@@ -1000,7 +997,7 @@ rt_stop_locked(void *priv)
/* disable interrupts */
RT_WRITE(sc, sc->fe_int_enable, 0);
-
+
if(sc->rt_chipid != RT_CHIPID_RT5350 &&
sc->rt_chipid != RT_CHIPID_MT7620 &&
sc->rt_chipid != RT_CHIPID_MT7621) {
@@ -1110,7 +1107,6 @@ rt_tx_data(struct rt_softc *sc, struct mbuf *m, int qi
/* set up Tx descs */
for (i = 0; i < ndmasegs; i += 2) {
-
/* TODO: this needs to be refined as MT7620 for example has
* a different word3 layout than RT305x and RT5350 (the last
* one doesn't use word3 at all). And so does MT7621...
@@ -1545,25 +1541,25 @@ rt_rt5350_intr(void *arg)
struct rt_softc *sc;
struct ifnet *ifp;
uint32_t status;
-
+
sc = arg;
ifp = sc->ifp;
-
+
/* acknowledge interrupts */
status = RT_READ(sc, sc->fe_int_status);
RT_WRITE(sc, sc->fe_int_status, status);
-
+
RT_DPRINTF(sc, RT_DEBUG_INTR, "interrupt: status=0x%08x\n", status);
-
+
if (status == 0x || /* device likely went away */
status == 0)/* not for us */
return;
-
+
sc->interrupts++;
-
+
if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
return;
-
+
if (status & RT5350_INT_TX_COHERENT)
rt_tx_coherent_intr(sc);
if (status & RT5350_INT_RX_COHERENT)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365160 - head/sys/dev/safexcel
Author: mjg Date: Tue Sep 1 21:54:58 2020 New Revision: 365160 URL: https://svnweb.freebsd.org/changeset/base/365160 Log: safexcel: clean up empty lines in .c and .h files Modified: head/sys/dev/safexcel/safexcel_reg.h Modified: head/sys/dev/safexcel/safexcel_reg.h == --- head/sys/dev/safexcel/safexcel_reg.hTue Sep 1 21:54:35 2020 (r365159) +++ head/sys/dev/safexcel/safexcel_reg.hTue Sep 1 21:54:58 2020 (r365160) @@ -35,7 +35,6 @@ #defineSAFEXCEL_REG_LO16(_reg) ((_reg) & 0x) #defineSAFEXCEL_REG_HI16(_reg) (((_reg) >> 16) & 0x) - /* HIA, Command Descriptor Ring Manager */ #defineCDR_BASE_ADDR_LO(x) (0x0 + ((x) << 12)) #defineCDR_BASE_ADDR_HI(x) (0x4 + ((x) << 12)) ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365157 - head/sys/dev/sdio
Author: mjg
Date: Tue Sep 1 21:53:58 2020
New Revision: 365157
URL: https://svnweb.freebsd.org/changeset/base/365157
Log:
sdio: clean up empty lines in .c and .h files
Modified:
head/sys/dev/sdio/sdiob.c
Modified: head/sys/dev/sdio/sdiob.c
==
--- head/sys/dev/sdio/sdiob.c Tue Sep 1 21:53:44 2020(r365156)
+++ head/sys/dev/sdio/sdiob.c Tue Sep 1 21:53:58 2020(r365157)
@@ -388,7 +388,6 @@ sdiob_rw_extended_sc(struct sdiob_softc *sc, uint8_t f
*/
while (sc->cardinfo.support_multiblk &&
size > 4 && size >= sc->cardinfo.f[fn].cur_blksize) {
-
b_count = size / sc->cardinfo.f[fn].cur_blksize;
KASSERT(b_count >= 1, ("%s: block count too small %u size %u "
"cur_blksize %u\n", __func__, b_count, size,
@@ -531,7 +530,6 @@ sdiob_write_ivar(device_t dev, device_t child, int whi
return (0);
}
-
/* --
*/
/*
* Newbus functions for ourselves to probe/attach/detach and become a proper
@@ -565,7 +563,6 @@ sdiob_attach(device_t dev)
* Do this before any child gets a chance to attach.
*/
for (i = 0; i < sc->cardinfo.num_funcs; i++) {
-
sc->child[i] = device_add_child(dev, NULL, -1);
if (sc->child[i] == NULL) {
device_printf(dev, "%s: failed to add child\n",
__func__);
@@ -612,7 +609,6 @@ sdiob_detach(device_t dev)
return (EOPNOTSUPP);
}
-
/* --
*/
/*
* driver(9) and device(9) "control plane".
@@ -622,7 +618,6 @@ sdiob_detach(device_t dev)
*/
static device_method_t sdiob_methods[] = {
-
/* Device interface. */
DEVMETHOD(device_probe, sdiob_probe),
DEVMETHOD(device_attach,sdiob_attach),
@@ -650,7 +645,6 @@ static driver_t sdiob_driver = {
0
};
-
/* --
*/
/*
* CIS related.
@@ -859,7 +853,6 @@ sdiob_get_card_info(struct sdiob_softc *sc)
mmcp = >ccb->ccb_h.path->device->mmc_ident_data;
fn_max = MIN(mmcp->sdio_func_count + 1, nitems(sc->cardinfo.f));
for (fn = 1; fn < fn_max; fn++) {
-
fbr_addr = SD_IO_FBR_START * fn + SD_IO_FBR_CIS_OFFSET;
error = sdio_read_direct_sc(sc, 0, fbr_addr++, );
@@ -910,7 +903,6 @@ sdiob_get_card_info(struct sdiob_softc *sc)
}
return (error);
}
-
/* --
*/
/*
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365159 - head/sys/dev/sbni
Author: mjg
Date: Tue Sep 1 21:54:35 2020
New Revision: 365159
URL: https://svnweb.freebsd.org/changeset/base/365159
Log:
sbni: clean up empty lines in .c and .h files
Modified:
head/sys/dev/sbni/if_sbni.c
head/sys/dev/sbni/if_sbni_isa.c
head/sys/dev/sbni/if_sbni_pci.c
head/sys/dev/sbni/if_sbnireg.h
head/sys/dev/sbni/if_sbnivar.h
Modified: head/sys/dev/sbni/if_sbni.c
==
--- head/sys/dev/sbni/if_sbni.c Tue Sep 1 21:54:16 2020(r365158)
+++ head/sys/dev/sbni/if_sbni.c Tue Sep 1 21:54:35 2020(r365159)
@@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$");
*
* Written with reference to NE2000 driver developed by David Greenman.
*/
-
#include
#include
@@ -169,7 +168,6 @@ sbni_outsb(struct sbni_softc *sc, u_char *from, u_int
sc->io_off + DAT, from, len);
}
-
/*
Valid combinations in CSR0 (for probing):
@@ -195,7 +193,6 @@ sbni_outsb(struct sbni_softc *sc, u_char *from, u_int
#define VALID_DECODER (2 + 8 + 0x10 + 0x20 + 0x80 + 0x100 + 0x200)
-
int
sbni_probe(struct sbni_softc *sc)
{
@@ -214,7 +211,6 @@ sbni_probe(struct sbni_softc *sc)
return (ENXIO);
}
-
/*
* Install interface into kernel networking data structures
*/
@@ -341,7 +337,6 @@ sbni_start_locked(struct ifnet *ifp)
prepare_to_send(sc);
}
-
static void
sbni_stop(struct sbni_softc *sc)
{
@@ -402,7 +397,6 @@ sbni_intr(void *arg)
} while (repeat);
}
-
static void
handle_channel(struct sbni_softc *sc)
{
@@ -442,7 +436,6 @@ handle_channel(struct sbni_softc *sc)
sbni_outb(sc, CSR0, sbni_inb(sc, CSR0) | EN_INT);
}
-
/*
* Routine returns 1 if it need to acknoweledge received frame.
* Empty frame received without errors won't be acknoweledged.
@@ -482,7 +475,6 @@ recv_frame(struct sbni_softc *sc)
return (!frame_ok || framelen > 4);
}
-
static void
send_frame(struct sbni_softc *sc)
{
@@ -491,7 +483,6 @@ send_frame(struct sbni_softc *sc)
crc = CRC32_INITIAL;
if (sc->state & FL_NEED_RESEND) {
-
/* if frame was sended but not ACK'ed - resend it */
if (sc->trans_errors) {
sc->trans_errors--;
@@ -512,7 +503,6 @@ send_frame(struct sbni_softc *sc)
* frame sended then in prepare_to_send next frame
*/
-
if (sc->framelen) {
download_data(sc, );
sc->in_stats.all_tx_number++;
@@ -531,7 +521,6 @@ do_send:
}
}
-
static void
download_data(struct sbni_softc *sc, u_int32_t *crc_p)
{
@@ -588,7 +577,6 @@ do_copy:
} while (pos < sc->framelen);
}
-
static int
upload_data(struct sbni_softc *sc, u_int framelen, u_int frameno,
u_int is_first, u_int32_t crc)
@@ -601,7 +589,6 @@ upload_data(struct sbni_softc *sc, u_int framelen, u_i
}
if (sc->wait_frameno == frameno) {
-
if (sc->inppos + framelen <= ETHER_MAX_LEN) {
frame_ok = append_frame_to_pkt(sc, framelen, crc);
@@ -630,7 +617,6 @@ upload_data(struct sbni_softc *sc, u_int framelen, u_i
return (frame_ok);
}
-
static __inline void send_complete(struct sbni_softc *);
static __inline void
@@ -641,7 +627,6 @@ send_complete(struct sbni_softc *sc)
if_inc_counter(sc->ifp, IFCOUNTER_OPACKETS, 1);
}
-
static void
interpret_ack(struct sbni_softc *sc, u_int ack)
{
@@ -664,7 +649,6 @@ interpret_ack(struct sbni_softc *sc, u_int ack)
sc->state &= ~FL_WAIT_ACK;
}
-
/*
* Glue received frame with previous fragments of packet.
* Indicate packet when last frame would be accepted.
@@ -695,7 +679,6 @@ append_frame_to_pkt(struct sbni_softc *sc, u_int frame
return (1);
}
-
/*
* Prepare to start output on adapter. Current priority must be set to splimp
* before this routine is called.
@@ -746,7 +729,6 @@ prepare_to_send(struct sbni_softc *sc)
BPF_MTAP(sc->ifp, sc->tx_buf_p);
}
-
static void
drop_xmit_queue(struct sbni_softc *sc)
{
@@ -773,7 +755,6 @@ drop_xmit_queue(struct sbni_softc *sc)
sc->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
}
-
static void
send_frame_header(struct sbni_softc *sc, u_int32_t *crc_p)
{
@@ -807,7 +788,6 @@ send_frame_header(struct sbni_softc *sc, u_int32_t *cr
*crc_p = crc;
}
-
/*
* if frame tail not needed (incorrect number or received twice),
* it won't store, but CRC will be calculated
@@ -822,7 +802,6 @@ skip_tail(struct sbni_softc *sc, u_int tail_len, u_int
return (crc == CRC32_REMAINDER);
}
-
static int
check_fhdr(struct sbni_softc *sc, u_int *framelen, u_int *frameno,
u_int *ack, u_int *is_first, u_int32_t *crc_p)
@@ -858,7 +837,6 @@ check_fhdr(struct sbni_softc *sc, u_int *framelen, u_i
return (1);
}
-
static int
get_rx_buf(struct sbni_softc *sc)
{
@@ -895,7 +873,6 @@ get_rx_buf(struct sbni_softc *sc)
return (1);
}
-
static
svn commit: r365158 - head/sys/dev/sdhci
Author: mjg
Date: Tue Sep 1 21:54:16 2020
New Revision: 365158
URL: https://svnweb.freebsd.org/changeset/base/365158
Log:
sdhci: clean up empty lines in .c and .h files
Modified:
head/sys/dev/sdhci/fsl_sdhci.c
head/sys/dev/sdhci/sdhci_fdt.c
Modified: head/sys/dev/sdhci/fsl_sdhci.c
==
--- head/sys/dev/sdhci/fsl_sdhci.c Tue Sep 1 21:53:58 2020
(r365157)
+++ head/sys/dev/sdhci/fsl_sdhci.c Tue Sep 1 21:54:16 2020
(r365158)
@@ -253,7 +253,6 @@ fsl_sdhci_read_1(device_t dev, struct sdhci_slot *slot
return (SDHCI_POWER_ON | SDHCI_POWER_300);
}
-
return ((RD4(sc, off & ~3) >> (off & 3) * 8) & 0xff);
}
@@ -279,7 +278,6 @@ fsl_sdhci_read_2(device_t dev, struct sdhci_slot *slot
return (RD4(sc, USDHC_MIX_CONTROL) & 0x37);
} else if (sc->hwtype == HWTYPE_ESDHC) {
-
/*
* The ESDHC hardware has the typical 32-bit combined "command
* and mode" register that we have to cache so that command
@@ -340,7 +338,7 @@ fsl_sdhci_read_4(device_t dev, struct sdhci_slot *slot
val32 |= SDHCI_CAN_DO_8BITBUS;
return (val32);
}
-
+
/*
* The hardware moves bits around in the present state register to make
* room for all 8 data line state bits. To translate, mask out all the
@@ -596,7 +594,6 @@ fsl_sdhc_set_clock(struct fsl_sdhci_softc *sc, uint16_
WR4(sc, SDHCI_CLOCK_CONTROL, val32 & ~SDHC_CLK_SDCLKEN);
#endif
return;
-
}
divisor = (val >> SDHCI_DIVIDER_SHIFT) & SDHCI_DIVIDER_MASK;
freq = sc->baseclk_hz >> ffs(divisor);
@@ -782,7 +779,6 @@ fsl_sdhci_get_platform_clock(device_t dev)
/* Get sdhci node properties */
if((OF_getprop(node, "clock-frequency", (void *),
sizeof(clock)) <= 0) || (clock == 0)) {
-
clock = mpc85xx_get_system_clock();
if (clock == 0) {
@@ -799,7 +795,6 @@ fsl_sdhci_get_platform_clock(device_t dev)
return (clock);
}
#endif
-
static int
fsl_sdhci_detach(device_t dev)
Modified: head/sys/dev/sdhci/sdhci_fdt.c
==
--- head/sys/dev/sdhci/sdhci_fdt.c Tue Sep 1 21:53:58 2020
(r365157)
+++ head/sys/dev/sdhci/sdhci_fdt.c Tue Sep 1 21:54:16 2020
(r365158)
@@ -317,7 +317,7 @@ sdhci_init_rk3399(device_t dev)
val = SHIFTIN((freq + (100 / 2)) / 100,
RK3399_CORECFG_BASECLKFREQ);
SYSCON_WRITE_4(grf, RK3399_GRF_EMMCCORE_CON0, (mask << 16) | val);
-
+
return (0);
}
#endif
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365153 - head/sys/dev/smbus
Author: mjg
Date: Tue Sep 1 21:53:00 2020
New Revision: 365153
URL: https://svnweb.freebsd.org/changeset/base/365153
Log:
smbus: clean up empty lines in .c and .h files
Modified:
head/sys/dev/smbus/smb.c
head/sys/dev/smbus/smbconf.c
head/sys/dev/smbus/smbus.c
Modified: head/sys/dev/smbus/smb.c
==
--- head/sys/dev/smbus/smb.cTue Sep 1 21:52:46 2020(r365152)
+++ head/sys/dev/smbus/smb.cTue Sep 1 21:53:00 2020(r365153)
@@ -68,7 +68,6 @@ static device_method_t smb_methods[] = {
/* smbus interface */
DEVMETHOD(smbus_intr, smbus_generic_intr),
-
{ 0, 0 }
};
@@ -104,7 +103,7 @@ smb_probe(device_t dev)
device_set_desc(dev, "SMBus generic I/O");
return (BUS_PROBE_NOWILDCARD);
}
-
+
static int
smb_attach(device_t dev)
{
Modified: head/sys/dev/smbus/smbconf.c
==
--- head/sys/dev/smbus/smbconf.cTue Sep 1 21:52:46 2020
(r365152)
+++ head/sys/dev/smbus/smbconf.cTue Sep 1 21:53:00 2020
(r365153)
@@ -68,7 +68,7 @@ smbus_error(int smb_error)
if (smb_error == SMB_ENOERR)
return (0);
-
+
if (smb_error & (SMB_ENOTSUPP))
error = ENODEV;
else if (smb_error & (SMB_ENOACK))
Modified: head/sys/dev/smbus/smbus.c
==
--- head/sys/dev/smbus/smbus.c Tue Sep 1 21:52:46 2020(r365152)
+++ head/sys/dev/smbus/smbus.c Tue Sep 1 21:53:00 2020(r365153)
@@ -134,7 +134,6 @@ smbus_hinted_child(device_t bus, const char *dname, in
devi->addr = addr;
}
-
static int
smbus_child_location_str(device_t parent, device_t child, char *buf,
size_t buflen)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365155 - head/sys/dev/sk
Author: mjg
Date: Tue Sep 1 21:53:37 2020
New Revision: 365155
URL: https://svnweb.freebsd.org/changeset/base/365155
Log:
sk: clean up empty lines in .c and .h files
Modified:
head/sys/dev/sk/if_sk.c
head/sys/dev/sk/if_skreg.h
Modified: head/sys/dev/sk/if_sk.c
==
--- head/sys/dev/sk/if_sk.c Tue Sep 1 21:53:21 2020(r365154)
+++ head/sys/dev/sk/if_sk.c Tue Sep 1 21:53:37 2020(r365155)
@@ -265,7 +265,7 @@ static int sysctl_hw_sk_int_mod(SYSCTL_HANDLER_ARGS);
/* Tunables. */
static int jumbo_disable = 0;
TUNABLE_INT("hw.skc.jumbo_disable", _disable);
-
+
/*
* It seems that SK-NET GENESIS supports very simple checksum offload
* capability for Tx and I believe it can generate 0 checksum value for
@@ -936,7 +936,6 @@ sk_discard_rxbuf(sc_if, idx)
struct sk_rxdesc*rxd;
struct mbuf *m;
-
r = _if->sk_rdata.sk_rx_ring[idx];
rxd = _if->sk_cdata.sk_rxdesc[idx];
m = rxd->rx_m;
@@ -2535,7 +2534,6 @@ sk_start_locked(ifp)
sc_if->sk_watchdog_timer = 5;
}
}
-
static void
sk_watchdog(arg)
Modified: head/sys/dev/sk/if_skreg.h
==
--- head/sys/dev/sk/if_skreg.h Tue Sep 1 21:53:21 2020(r365154)
+++ head/sys/dev/sk/if_skreg.h Tue Sep 1 21:53:37 2020(r365155)
@@ -133,7 +133,6 @@
* there are a few 16-bit and 8-bit ones as well.
*/
-
/* Start of remappable register window. */
#define SK_WIN_BASE0x0080
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365156 - head/sys/dev/sec
Author: mjg
Date: Tue Sep 1 21:53:44 2020
New Revision: 365156
URL: https://svnweb.freebsd.org/changeset/base/365156
Log:
sec: clean up empty lines in .c and .h files
Modified:
head/sys/dev/sec/sec.c
Modified: head/sys/dev/sec/sec.c
==
--- head/sys/dev/sec/sec.c Tue Sep 1 21:53:37 2020(r365155)
+++ head/sys/dev/sec/sec.c Tue Sep 1 21:53:44 2020(r365156)
@@ -266,7 +266,6 @@ sec_attach(device_t dev)
if (error)
goto fail2;
-
if (sc->sc_version == 3) {
sc->sc_sec_irid = 1;
error = sec_setup_intr(sc, >sc_sec_ires, >sc_sec_ihand,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365154 - head/sys/dev/smartpqi
Author: mjg
Date: Tue Sep 1 21:53:21 2020
New Revision: 365154
URL: https://svnweb.freebsd.org/changeset/base/365154
Log:
smartpqi: clean up empty lines in .c and .h files
Modified:
head/sys/dev/smartpqi/smartpqi_cam.c
head/sys/dev/smartpqi/smartpqi_cmd.c
head/sys/dev/smartpqi/smartpqi_defines.h
head/sys/dev/smartpqi/smartpqi_discovery.c
head/sys/dev/smartpqi/smartpqi_event.c
head/sys/dev/smartpqi/smartpqi_helper.c
head/sys/dev/smartpqi/smartpqi_includes.h
head/sys/dev/smartpqi/smartpqi_init.c
head/sys/dev/smartpqi/smartpqi_intr.c
head/sys/dev/smartpqi/smartpqi_ioctl.c
head/sys/dev/smartpqi/smartpqi_ioctl.h
head/sys/dev/smartpqi/smartpqi_main.c
head/sys/dev/smartpqi/smartpqi_mem.c
head/sys/dev/smartpqi/smartpqi_misc.c
head/sys/dev/smartpqi/smartpqi_prototypes.h
head/sys/dev/smartpqi/smartpqi_queue.c
head/sys/dev/smartpqi/smartpqi_request.c
head/sys/dev/smartpqi/smartpqi_response.c
head/sys/dev/smartpqi/smartpqi_sis.c
head/sys/dev/smartpqi/smartpqi_structures.h
head/sys/dev/smartpqi/smartpqi_tag.c
Modified: head/sys/dev/smartpqi/smartpqi_cam.c
==
--- head/sys/dev/smartpqi/smartpqi_cam.cTue Sep 1 21:53:00 2020
(r365153)
+++ head/sys/dev/smartpqi/smartpqi_cam.cTue Sep 1 21:53:21 2020
(r365154)
@@ -76,7 +76,7 @@ static void get_transport_settings(struct pqisrc_softs
struct ccb_trans_settings_spi *spi = >xport_specific.spi;
DBG_FUNC("IN\n");
-
+
cts->protocol = PROTO_SCSI;
cts->protocol_version = SCSI_REV_SPC4;
cts->transport = XPORT_SPI;
@@ -126,7 +126,7 @@ void os_remove_device(pqisrc_softstate_t *softs,
struct cam_path *tmppath;
DBG_FUNC("IN\n");
-
+
if(softs->os_specific.sim_registered) {
if (xpt_create_path(, NULL,
cam_sim_path(softs->os_specific.sim),
@@ -224,7 +224,6 @@ smartpqi_fix_ld_inquiry(pqisrc_softstate_t *softs, str
(cdb[1] & SI_EVPD) == 0 &&
(csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN &&
csio->dxfer_len >= SHORT_INQUIRY_LENGTH) {
-
inq = (struct scsi_inquiry_data *)csio->data_ptr;
device =
softs->device_list[csio->ccb_h.target_id][csio->ccb_h.target_lun];
@@ -263,7 +262,7 @@ os_io_response_success(rcb_t *rcb)
panic("rcb is null");
csio = (struct ccb_scsiio *)>cm_ccb->csio;
-
+
if (csio == NULL)
panic("csio is null");
@@ -332,7 +331,6 @@ void os_raid_response_error(rcb_t *rcb, raid_path_erro
csio->ccb_h.status = CAM_SCSI_STATUS_ERROR
| CAM_AUTOSNS_VALID
| CAM_REQ_CMP_ERR;
-
}
break;
@@ -364,7 +362,6 @@ void os_raid_response_error(rcb_t *rcb, raid_path_erro
DBG_IO("OUT\n");
}
-
/*
* Error response handling for aio.
*/
@@ -564,7 +561,6 @@ static int pqi_map_request( rcb_t *rcb )
rcb->status = REQUEST_PENDING;
error = pqisrc_build_send_io(softs, rcb);
-
}
DBG_FUNC("OUT error = %d\n", error);
@@ -605,7 +601,6 @@ static void smartpqi_lunrescan_cb(struct cam_periph *p
xpt_free_ccb(ccb);
}
-
/*
* Function to rescan the lun
*/
@@ -717,7 +712,7 @@ static int pqisrc_io_start(struct cam_sim *sim, union
pqi_scsi_dev_t *dvp;
DBG_FUNC("IN\n");
-
+
if( softs->device_list[ccb->ccb_h.target_id][ccb->ccb_h.target_lun] ==
NULL ) {
ccb->ccb_h.status = CAM_DEV_NOT_THERE;
DBG_INFO("Device = %d not there\n", ccb->ccb_h.target_id);
@@ -1172,13 +1167,12 @@ int register_sim(struct pqisrc_softstate *softs, int c
void deregister_sim(struct pqisrc_softstate *softs)
{
struct ccb_setasync csa;
-
+
DBG_FUNC("IN\n");
if (softs->os_specific.mtx_init) {
mtx_lock(>os_specific.cam_lock);
}
-
xpt_setup_ccb(_h, softs->os_specific.path, 5);
csa.ccb_h.func_code = XPT_SASYNC_CB;
Modified: head/sys/dev/smartpqi/smartpqi_cmd.c
==
--- head/sys/dev/smartpqi/smartpqi_cmd.cTue Sep 1 21:53:00 2020
(r365153)
+++ head/sys/dev/smartpqi/smartpqi_cmd.cTue Sep 1 21:53:21 2020
(r365154)
@@ -43,7 +43,7 @@ int pqisrc_submit_cmnd(pqisrc_softstate_t *softs,
DBG_FUNC("IN\n");
PQI_LOCK(_q->lock);
-
+
/* Check queue full */
if ((ib_q->pi_local + 1) % ib_q->num_elem == *(ib_q->ci_virt_addr)) {
DBG_WARN("OUT Q full\n");
Modified: head/sys/dev/smartpqi/smartpqi_defines.h
svn commit: r365152 - head/sys/dev/smc
Author: mjg
Date: Tue Sep 1 21:52:46 2020
New Revision: 365152
URL: https://svnweb.freebsd.org/changeset/base/365152
Log:
smc: clean up empty lines in .c and .h files
Modified:
head/sys/dev/smc/if_smc.c
head/sys/dev/smc/if_smcvar.h
Modified: head/sys/dev/smc/if_smc.c
==
--- head/sys/dev/smc/if_smc.c Tue Sep 1 21:52:35 2020(r365151)
+++ head/sys/dev/smc/if_smc.c Tue Sep 1 21:52:46 2020(r365152)
@@ -434,10 +434,10 @@ smc_detach(device_t dev)
if (sc->smc_ifp != NULL) {
ether_ifdetach(sc->smc_ifp);
}
-
+
callout_drain(>smc_watchdog);
callout_drain(>smc_mii_tick_ch);
-
+
#ifdef DEVICE_POLLING
if (sc->smc_ifp->if_capenable & IFCAP_POLLING)
ether_poll_deregister(sc->smc_ifp);
@@ -491,7 +491,6 @@ static device_method_t smc_methods[] = {
DEVMETHOD(miibus_readreg, smc_miibus_readreg),
DEVMETHOD(miibus_writereg, smc_miibus_writereg),
DEVMETHOD(miibus_statchg, smc_miibus_statchg),
-
{ 0, 0 }
};
@@ -603,7 +602,7 @@ smc_task_tx(void *context, int pending)
sc = ifp->if_softc;
SMC_LOCK(sc);
-
+
if (sc->smc_pending == NULL) {
SMC_UNLOCK(sc);
goto next_packet;
@@ -722,7 +721,7 @@ smc_task_rx(void *context, int pending)
m_freem(m);
break;
}
-
+
/*
* Point to the start of the packet.
*/
@@ -749,14 +748,14 @@ smc_task_rx(void *context, int pending)
m_freem(m);
break;
}
-
+
/*
* Set the mbuf up the way we want it.
*/
m->m_pkthdr.rcvif = ifp;
m->m_pkthdr.len = m->m_len = len + 2; /* XXX: Is this right? */
m_adj(m, ETHER_ALIGN);
-
+
/*
* Pull the packet out of the device. Make sure we're in the
* right bank first as things may have changed while we were
@@ -865,7 +864,7 @@ smc_task_intr(void *context, int pending)
sc = ifp->if_softc;
SMC_LOCK(sc);
-
+
smc_select_bank(sc, 2);
/*
@@ -1255,7 +1254,7 @@ static void
smc_watchdog(void *arg)
{
struct smc_softc*sc;
-
+
sc = (struct smc_softc *)arg;
device_printf(sc->smc_dev, "watchdog timeout\n");
taskqueue_enqueue(sc->smc_tq, >smc_intr);
Modified: head/sys/dev/smc/if_smcvar.h
==
--- head/sys/dev/smc/if_smcvar.hTue Sep 1 21:52:35 2020
(r365151)
+++ head/sys/dev/smc/if_smcvar.hTue Sep 1 21:52:46 2020
(r365152)
@@ -53,7 +53,7 @@ struct smc_softc {
struct task smc_tx;
struct mbuf *smc_pending;
struct callout smc_watchdog;
-
+
/* MII support */
device_tsmc_miibus;
struct callout smc_mii_tick_ch;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365151 - head/sys/dev/spibus
Author: mjg
Date: Tue Sep 1 21:52:35 2020
New Revision: 365151
URL: https://svnweb.freebsd.org/changeset/base/365151
Log:
spibus: clean up empty lines in .c and .h files
Modified:
head/sys/dev/spibus/spi.h
head/sys/dev/spibus/spigen.c
Modified: head/sys/dev/spibus/spi.h
==
--- head/sys/dev/spibus/spi.h Tue Sep 1 21:52:20 2020(r365150)
+++ head/sys/dev/spibus/spi.h Tue Sep 1 21:52:35 2020(r365151)
@@ -35,7 +35,6 @@ struct spi_command {
void*rx_data;
uint32_t rx_data_sz;
};
-
#defineSPI_COMMAND_INITIALIZER { 0 }
#defineSPI_CHIP_SELECT_HIGH0x1 /* Chip select high
(else low) */
Modified: head/sys/dev/spibus/spigen.c
==
--- head/sys/dev/spibus/spigen.cTue Sep 1 21:52:20 2020
(r365150)
+++ head/sys/dev/spibus/spigen.cTue Sep 1 21:52:35 2020
(r365151)
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-
+
#include
#include
#include
@@ -370,7 +370,7 @@ spigen_detach(device_t dev)
if (sc->sc_cdev)
destroy_dev(sc->sc_cdev);
-
+
mtx_destroy(>sc_mtx);
return (0);
@@ -383,7 +383,6 @@ static device_method_t spigen_methods[] = {
DEVMETHOD(device_probe, spigen_probe),
DEVMETHOD(device_attach,spigen_attach),
DEVMETHOD(device_detach,spigen_detach),
-
{ 0, 0 }
};
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365149 - head/sys/dev/superio
Author: mjg
Date: Tue Sep 1 21:52:05 2020
New Revision: 365149
URL: https://svnweb.freebsd.org/changeset/base/365149
Log:
superio: clean up empty lines in .c and .h files
Modified:
head/sys/dev/superio/superio.c
Modified: head/sys/dev/superio/superio.c
==
--- head/sys/dev/superio/superio.c Tue Sep 1 21:51:55 2020
(r365148)
+++ head/sys/dev/superio/superio.c Tue Sep 1 21:52:05 2020
(r365149)
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
#include "isa_if.h"
-
typedef void (*sio_conf_enter_f)(struct resource*, uint16_t);
typedef void (*sio_conf_exit_f)(struct resource*, uint16_t);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365148 - head/sys/dev/sym
Author: mjg
Date: Tue Sep 1 21:51:55 2020
New Revision: 365148
URL: https://svnweb.freebsd.org/changeset/base/365148
Log:
sym: clean up empty lines in .c and .h files
Modified:
head/sys/dev/sym/sym_defs.h
head/sys/dev/sym/sym_hipd.c
Modified: head/sys/dev/sym/sym_defs.h
==
--- head/sys/dev/sym/sym_defs.h Tue Sep 1 21:51:38 2020(r365147)
+++ head/sys/dev/sym/sym_defs.h Tue Sep 1 21:51:55 2020(r365148)
@@ -674,7 +674,6 @@ struct sym_tblsel {
#defineSCR_ACK 0x0040
#defineSCR_ATN 0x0008
-
/*---
*
* Memory to memory move
@@ -736,7 +735,6 @@ struct sym_tblsel {
#define SCR_REG_REG(reg,op,data) \
(0x7800 | (SCR_REG_OFS(REG(reg))) | (op) | (((data)&0xff)<<8ul))
-
#define SCR_LOAD 0x
#define SCR_SHL0x0100
#define SCR_OR 0x0200
@@ -814,7 +812,6 @@ struct sym_tblsel {
#define SCR_STORE_REL(reg, n) SCR_STORE_R(reg, SCR_NO_FLUSH2|SCR_DSA_REL2,n)
#define SCR_STORE_ABS_F(reg, n)SCR_STORE_R(reg, 0, n)
#define SCR_STORE_REL_F(reg, n)SCR_STORE_R(reg, SCR_DSA_REL2, n)
-
/*---
*
Modified: head/sys/dev/sym/sym_hipd.c
==
--- head/sys/dev/sym/sym_hipd.c Tue Sep 1 21:51:38 2020(r365147)
+++ head/sys/dev/sym/sym_hipd.c Tue Sep 1 21:51:55 2020(r365148)
@@ -2007,7 +2007,6 @@ static void sym_fw_bind_script (hcb_p np, u32 *start,
end = start + len/4;
while (cur < end) {
-
opcode = *cur;
/*
@@ -9214,7 +9213,6 @@ static void S24C16_set_bit(hcb_p np, u_char write_bit,
case CLR_CLK:
*gpreg &= 0xfd;
break;
-
}
OUTB (nc_gpreg, *gpreg);
UDELAY (5);
@@ -9526,7 +9524,6 @@ static int T93C46_Read_Data(hcb_p np, u_short *data,in
int x;
for (x = 0; x < len; x++) {
-
/* output read command and address */
T93C46_Send_Command(np, 0x180 | x, _bit, gpreg);
if (read_bit & 0x01)
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365150 - head/sys/dev/stge
Author: mjg
Date: Tue Sep 1 21:52:20 2020
New Revision: 365150
URL: https://svnweb.freebsd.org/changeset/base/365150
Log:
stge: clean up empty lines in .c and .h files
Modified:
head/sys/dev/stge/if_stge.c
Modified: head/sys/dev/stge/if_stge.c
==
--- head/sys/dev/stge/if_stge.c Tue Sep 1 21:52:05 2020(r365149)
+++ head/sys/dev/stge/if_stge.c Tue Sep 1 21:52:20 2020(r365150)
@@ -407,7 +407,6 @@ stge_read_eeprom(struct stge_softc *sc, int offset, ui
*data = CSR_READ_2(sc, STGE_EepromData);
}
-
static int
stge_probe(device_t dev)
{
@@ -1815,7 +1814,6 @@ stge_poll(struct ifnet *ifp, enum poll_cmd cmd, int co
}
}
}
-
}
if (!IFQ_DRV_IS_EMPTY(>if_snd))
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365147 - head/sys/dev/tcp_log
Author: mjg
Date: Tue Sep 1 21:51:38 2020
New Revision: 365147
URL: https://svnweb.freebsd.org/changeset/base/365147
Log:
tcp_log: clean up empty lines in .c and .h files
Modified:
head/sys/dev/tcp_log/tcp_log_dev.c
Modified: head/sys/dev/tcp_log/tcp_log_dev.c
==
--- head/sys/dev/tcp_log/tcp_log_dev.c Tue Sep 1 21:51:10 2020
(r365146)
+++ head/sys/dev/tcp_log/tcp_log_dev.c Tue Sep 1 21:51:38 2020
(r365147)
@@ -89,7 +89,6 @@ static inttcp_log_dev_ioctl(struct cdev *dev __unused
static int tcp_log_dev_poll(struct cdev *dev __unused, int events,
struct thread *td);
-
enum tcp_log_dev_queue_lock_state {
QUEUE_UNLOCKED = 0,
QUEUE_LOCKED,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365146 - head/sys/dev/tdfx
Author: mjg
Date: Tue Sep 1 21:51:10 2020
New Revision: 365146
URL: https://svnweb.freebsd.org/changeset/base/365146
Log:
tdfx: clean up empty lines in .c and .h files
Modified:
head/sys/dev/tdfx/tdfx_linux.h
head/sys/dev/tdfx/tdfx_pci.c
Modified: head/sys/dev/tdfx/tdfx_linux.h
==
--- head/sys/dev/tdfx/tdfx_linux.h Tue Sep 1 21:50:47 2020
(r365145)
+++ head/sys/dev/tdfx/tdfx_linux.h Tue Sep 1 21:51:10 2020
(r365146)
@@ -33,7 +33,6 @@
* $FreeBSD$
*/
-
#include
#include
#include
Modified: head/sys/dev/tdfx/tdfx_pci.c
==
--- head/sys/dev/tdfx/tdfx_pci.cTue Sep 1 21:50:47 2020
(r365145)
+++ head/sys/dev/tdfx/tdfx_pci.cTue Sep 1 21:51:10 2020
(r365146)
@@ -75,13 +75,10 @@ __FBSDID("$FreeBSD$");
#include
#include
-
static devclass_t tdfx_devclass;
-
static int tdfx_count = 0;
-
/* Set up the boot probe/attach routines */
static device_method_t tdfx_methods[] = {
DEVMETHOD(device_probe, tdfx_probe),
@@ -250,7 +247,7 @@ tdfx_attach(device_t dev) {
tdfx_info->devt = make_dev(_cdev, device_get_unit(dev),
UID_ROOT, GID_WHEEL, 0600, "3dfx%x", device_get_unit(dev));
tdfx_info->devt->si_drv1 = tdfx_info;
-
+
return 0;
}
@@ -259,7 +256,7 @@ tdfx_detach(device_t dev) {
struct tdfx_softc* tdfx_info;
int retval;
tdfx_info = device_get_softc(dev);
-
+
/* Delete allocated resource, of course */
bus_release_resource(dev, SYS_RES_MEMORY, tdfx_info->memrid,
tdfx_info->memrange);
@@ -303,12 +300,12 @@ tdfx_clrmtrr(device_t dev) {
*/
int retval, act;
struct tdfx_softc *tdfx_info = device_get_softc(dev);
-
+
act = MEMRANGE_SET_REMOVE;
retval = mem_range_attr_set(_info->mrdesc, );
return retval;
}
-
+
static int
tdfx_setmtrr(device_t dev) {
/*
@@ -426,13 +423,13 @@ tdfx_mmap(struct cdev *dev, vm_ooffset_t offset, vm_pa
/ OLD GET CONFIG /
/* struct tdfx_softc* tdfx_info; */
-
+
/* Get the configuration for our card XXX*/
/*tdfx_info = dev->si_drv1; */
//
struct tdfx_softc* tdfx_info[2];
-
+
tdfx_info[0] = (struct tdfx_softc*)devclass_get_softc(tdfx_devclass, 0);
/* If, for some reason, its not configured, we bail out */
@@ -449,7 +446,7 @@ tdfx_mmap(struct cdev *dev, vm_ooffset_t offset, vm_pa
*paddr = rman_get_start(tdfx_info[0]->memrange) + offset;
return 0;
}
-
+
if(tdfx_count > 1) {
tdfx_info[1] = (struct
tdfx_softc*)devclass_get_softc(tdfx_devclass, 1);
if((offset & 0xff00) == tdfx_info[1]->addr0) {
@@ -552,7 +549,6 @@ tdfx_query_fetch(u_int cmd, struct tdfx_pio_data *piod
return -EINVAL;
}
-
/* Read the value and return */
switch(piod->size) {
case 1:
@@ -675,7 +671,7 @@ tdfx_do_pio_rd(struct tdfx_pio_data *piod)
(piod->port != SC_DATA) || (piod->port !=
VGA_MISC_OUTPUT_READ)) &&
(piod->port < tdfx_info->pio0) && (piod->port >
tdfx_info->pio0max))
return -EPERM;
-
+
/* All VGA STATUS REGS are byte registers, size should never be > 1 */
if(piod->size != 1) {
return -EINVAL;
@@ -702,7 +698,7 @@ tdfx_do_pio_wt(struct tdfx_pio_data *piod)
(piod->port != VGA_MISC_OUTPUT_READ)) /* Can't write VGA_ST_1C
*/ &&
(piod->port < tdfx_info->pio0) && (piod->port >
tdfx_info->pio0max))
return -EPERM;
-
+
/* All VGA STATUS REGS are byte registers, size should never be > 1 */
if(piod->size != 1) {
return -EINVAL;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365145 - head/sys/dev/ti
Author: mjg
Date: Tue Sep 1 21:50:47 2020
New Revision: 365145
URL: https://svnweb.freebsd.org/changeset/base/365145
Log:
ti: clean up empty lines in .c and .h files
Modified:
head/sys/dev/ti/if_ti.c
Modified: head/sys/dev/ti/if_ti.c
==
--- head/sys/dev/ti/if_ti.c Tue Sep 1 21:50:31 2020(r365144)
+++ head/sys/dev/ti/if_ti.c Tue Sep 1 21:50:47 2020(r365145)
@@ -166,7 +166,6 @@ static const struct ti_type ti_devs[] = {
{ 0, 0, NULL }
};
-
static d_open_tti_open;
static d_close_t ti_close;
static d_ioctl_t ti_ioctl2;
@@ -446,7 +445,6 @@ ti_mem_read(struct ti_softc *sc, uint32_t addr, uint32
}
}
-
/*
* NIC memory write function.
* Can be used to copy data into NIC local memory.
@@ -587,7 +585,6 @@ ti_copy_mem(struct ti_softc *sc, uint32_t tigon_addr,
TI_LOCK(sc);
} else {
if (first_pass) {
-
ti_bcopy_swap(sc->ti_membuf,
sc->ti_membuf2, segsize,
TI_SWAP_NTOH);
@@ -2665,7 +2662,6 @@ ti_hdr_split(struct mbuf *top, int hdr_len, int pkt_le
if (m) {
m_freem(m);
mp->m_next = NULL;
-
}
if (mp->m_next != NULL)
panic("ti_hdr_split: last mbuf in chain should be null");
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365142 - head/sys/dev/uart
Author: mjg
Date: Tue Sep 1 21:50:00 2020
New Revision: 365142
URL: https://svnweb.freebsd.org/changeset/base/365142
Log:
uart: clean up empty lines in .c and .h files
Modified:
head/sys/dev/uart/uart_bus_acpi.c
head/sys/dev/uart/uart_bus_pccard.c
head/sys/dev/uart/uart_cpu_powerpc.c
head/sys/dev/uart/uart_dev_imx.h
head/sys/dev/uart/uart_dev_mu.c
head/sys/dev/uart/uart_dev_mvebu.c
head/sys/dev/uart/uart_dev_ns8250.c
head/sys/dev/uart/uart_dev_ns8250.h
head/sys/dev/uart/uart_dev_pl011.c
head/sys/dev/uart/uart_dev_quicc.c
Modified: head/sys/dev/uart/uart_bus_acpi.c
==
--- head/sys/dev/uart/uart_bus_acpi.c Tue Sep 1 21:49:49 2020
(r365141)
+++ head/sys/dev/uart/uart_bus_acpi.c Tue Sep 1 21:50:00 2020
(r365142)
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-
static int uart_acpi_probe(device_t dev);
static device_method_t uart_acpi_methods[] = {
Modified: head/sys/dev/uart/uart_bus_pccard.c
==
--- head/sys/dev/uart/uart_bus_pccard.c Tue Sep 1 21:49:49 2020
(r365141)
+++ head/sys/dev/uart/uart_bus_pccard.c Tue Sep 1 21:50:00 2020
(r365142)
@@ -53,7 +53,6 @@ static device_method_t uart_pccard_methods[] = {
DEVMETHOD(device_probe, uart_pccard_probe),
DEVMETHOD(device_attach,uart_pccard_attach),
DEVMETHOD(device_detach,uart_bus_detach),
-
{ 0, 0 }
};
Modified: head/sys/dev/uart/uart_cpu_powerpc.c
==
--- head/sys/dev/uart/uart_cpu_powerpc.cTue Sep 1 21:49:49 2020
(r365141)
+++ head/sys/dev/uart/uart_cpu_powerpc.cTue Sep 1 21:50:00 2020
(r365142)
@@ -99,7 +99,7 @@ ofw_get_console_phandle_path(phandle_t node, phandle_t
output = OF_finddevice(field.buf);
if (output == -1 && size == 4)
output = OF_instance_to_package(field.ref);
-
+
if (output != -1) {
*result = output;
return (0);
@@ -202,4 +202,3 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
di->parity = UART_PARITY_NONE;
return (0);
}
-
Modified: head/sys/dev/uart/uart_dev_imx.h
==
--- head/sys/dev/uart/uart_dev_imx.hTue Sep 1 21:49:49 2020
(r365141)
+++ head/sys/dev/uart/uart_dev_imx.hTue Sep 1 21:50:00 2020
(r365142)
@@ -217,5 +217,4 @@
#defineDIS(_bas, _r, _b) CLR((_bas), REG(_r), FLD(_r, _b))
#defineIS(_bas, _r, _b)IS_SET((_bas), REG(_r), FLD(_r, _b))
-
#endif /* _UART_DEV_IMX5XX_H */
Modified: head/sys/dev/uart/uart_dev_mu.c
==
--- head/sys/dev/uart/uart_dev_mu.c Tue Sep 1 21:49:49 2020
(r365141)
+++ head/sys/dev/uart/uart_dev_mu.c Tue Sep 1 21:50:00 2020
(r365142)
@@ -101,7 +101,7 @@ __FBSDID("$FreeBSD$");
#define AUX_MU_MCR_REG 0x04
#define AUX_MCR_RTS(1<<1)
-
+
#define AUX_MU_LSR_REG 0x05
#define LSR_RXREADY(1)
#define LSR_OVRRUN (1<<1)
@@ -153,7 +153,7 @@ static struct uart_ops uart_mu_ops = {
static int
uart_mu_probe(struct uart_bas *bas)
{
-
+
return (0);
}
@@ -169,7 +169,7 @@ uart_mu_param(struct uart_bas *bas, int baudrate, int
{
uint32_t line;
uint32_t baud;
-
+
/*
* Zero all settings to make sure
* UART is disabled and not configured
@@ -199,7 +199,7 @@ uart_mu_param(struct uart_bas *bas, int baudrate, int
*/
__uart_setreg(bas, AUX_MU_BAUD_REG, ((uint32_t)(baud &
0x)));
}
-
+
/* re-enable UART */
__uart_setreg(bas, AUX_MU_CNTL_REG, CNTL_RXENAB|CNTL_TXENAB);
}
@@ -283,7 +283,6 @@ static kobj_method_t uart_mu_methods[] = {
KOBJMETHOD(uart_transmit, uart_mu_bus_transmit),
KOBJMETHOD(uart_grab, uart_mu_bus_grab),
KOBJMETHOD(uart_ungrab, uart_mu_bus_ungrab),
-
{ 0, 0 }
};
@@ -319,7 +318,7 @@ uart_mu_bus_attach(struct uart_softc *sc)
psc->aux_ier = (IER_RXENABLE|IER_TXENABLE|IER_REQUIRED);
__uart_setreg(bas, AUX_MU_IER_REG, psc->aux_ier);
sc->sc_txbusy = 0;
-
+
return (0);
}
@@ -375,7 +374,7 @@ uart_mu_bus_ipend(struct uart_softc *sc)
struct uart_bas *bas;
uint32_t ints;
int ipend;
-
+
psc = (struct uart_mu_softc *)sc;
bas = >sc_bas;
@@ -436,11 +435,11 @@ uart_mu_bus_receive(struct uart_softc *sc)
struct uart_bas *bas;
uint32_t lsr, xc;
int rx;
-
+
bas = >sc_bas;
uart_lock(sc->sc_hwmtx);
psc =
svn commit: r365144 - head/sys/dev/tpm
Author: mjg
Date: Tue Sep 1 21:50:31 2020
New Revision: 365144
URL: https://svnweb.freebsd.org/changeset/base/365144
Log:
tpm: clean up empty lines in .c and .h files
Modified:
head/sys/dev/tpm/tpm.c
head/sys/dev/tpm/tpm20.c
head/sys/dev/tpm/tpm20.h
head/sys/dev/tpm/tpm_acpi.c
head/sys/dev/tpm/tpm_crb.c
head/sys/dev/tpm/tpm_tis.c
Modified: head/sys/dev/tpm/tpm.c
==
--- head/sys/dev/tpm/tpm.c Tue Sep 1 21:50:21 2020(r365143)
+++ head/sys/dev/tpm/tpm.c Tue Sep 1 21:50:31 2020(r365144)
@@ -146,7 +146,6 @@ __FBSDID("$FreeBSD$");
/* Set when enabling legacy interface in host bridge. */
int tpm_enabled;
-
#ifdef __FreeBSD__
#defineTPMSOFTC(dev) \
((struct tpm_softc *)dev->si_drv1)
@@ -244,7 +243,6 @@ tpm_identify(driver_t *driver, device_t parent)
}
#endif
-
int
tpm_attach(device_t dev)
{
@@ -270,7 +268,7 @@ tpm_attach(device_t dev)
/* In case PnP probe this may contain some initialization. */
tpm_tis12_probe(sc->sc_bt, sc->sc_bh);
-
+
if (tpm_legacy_probe(sc->sc_bt, sc->sc_bh)) {
sc->sc_init = tpm_legacy_init;
sc->sc_start = tpm_legacy_start;
@@ -330,7 +328,6 @@ tpm_detach(device_t dev)
return 0;
}
-
#else
/*
Modified: head/sys/dev/tpm/tpm20.c
==
--- head/sys/dev/tpm/tpm20.cTue Sep 1 21:50:21 2020(r365143)
+++ head/sys/dev/tpm/tpm20.cTue Sep 1 21:50:31 2020(r365144)
@@ -177,7 +177,6 @@ tpm20_close(struct cdev *dev, int flag, int mode, stru
return (0);
}
-
int
tpm20_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
int flags, struct thread *td)
@@ -234,7 +233,6 @@ tpm20_release(struct tpm_sc *sc)
destroy_dev(sc->sc_cdev);
}
-
int
tpm20_suspend(device_t dev)
{
@@ -266,7 +264,6 @@ tpm20_harvest(void *arg)
0x00, 0x00, 0x01, 0x7b, /* cmd TPM_CC_GetRandom */
0x00, TPM_HARVEST_SIZE /* number of bytes requested */
};
-
sc = arg;
sx_xlock(>dev_lock);
Modified: head/sys/dev/tpm/tpm20.h
==
--- head/sys/dev/tpm/tpm20.hTue Sep 1 21:50:21 2020(r365143)
+++ head/sys/dev/tpm/tpm20.hTue Sep 1 21:50:31 2020(r365144)
@@ -95,7 +95,6 @@ __FBSDID("$FreeBSD$");
#defineTPM_CDEV_NAME "tpm0"
#defineTPM_CDEV_PERM_FLAG 0600
-
#defineTPM2_START_METHOD_ACPI 2
#defineTPM2_START_METHOD_TIS 6
#defineTPM2_START_METHOD_CRB 7
Modified: head/sys/dev/tpm/tpm_acpi.c
==
--- head/sys/dev/tpm/tpm_acpi.c Tue Sep 1 21:50:21 2020(r365143)
+++ head/sys/dev/tpm/tpm_acpi.c Tue Sep 1 21:50:31 2020(r365144)
@@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-
-
char *tpm_ids[] = {"ATM1200", "BCM0102", "INTC0102", "SNO3504", "WEC1000",
"PNP0C31", NULL};
@@ -53,7 +51,7 @@ static int
tpm_acpi_probe(device_t dev)
{
int rv;
-
+
rv = ACPI_ID_PROBE(device_get_parent(dev), dev, tpm_ids, NULL);
if (rv <= 0)
device_set_desc(dev, "Trusted Platform Module");
Modified: head/sys/dev/tpm/tpm_crb.c
==
--- head/sys/dev/tpm/tpm_crb.c Tue Sep 1 21:50:21 2020(r365143)
+++ head/sys/dev/tpm/tpm_crb.c Tue Sep 1 21:50:31 2020(r365144)
@@ -85,7 +85,6 @@ struct tpmcrb_sc {
size_t rsp_buf_size;
};
-
int tpmcrb_transmit(struct tpm_sc *sc, size_t size);
static int tpmcrb_acpi_probe(device_t dev);
Modified: head/sys/dev/tpm/tpm_tis.c
==
--- head/sys/dev/tpm/tpm_tis.c Tue Sep 1 21:50:21 2020(r365143)
+++ head/sys/dev/tpm/tpm_tis.c Tue Sep 1 21:50:31 2020(r365144)
@@ -331,7 +331,6 @@ tpmtis_write_bytes(struct tpm_sc *sc, size_t count, ui
return (true);
}
-
static bool
tpmtis_request_locality(struct tpm_sc *sc, int locality)
{
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365143 - head/sys/dev/tsec
Author: mjg
Date: Tue Sep 1 21:50:21 2020
New Revision: 365143
URL: https://svnweb.freebsd.org/changeset/base/365143
Log:
tsec: clean up empty lines in .c and .h files
Modified:
head/sys/dev/tsec/if_tsec.c
head/sys/dev/tsec/if_tsec.h
Modified: head/sys/dev/tsec/if_tsec.c
==
--- head/sys/dev/tsec/if_tsec.c Tue Sep 1 21:50:00 2020(r365142)
+++ head/sys/dev/tsec/if_tsec.c Tue Sep 1 21:50:21 2020(r365143)
@@ -269,7 +269,7 @@ tsec_attach(struct tsec_softc *sc)
/* Advertise that polling is supported */
ifp->if_capabilities |= IFCAP_POLLING;
#endif
-
+
/* Attach PHY(s) */
error = mii_attach(sc->dev, >tsec_miibus, ifp, tsec_ifmedia_upd,
tsec_ifmedia_sts, BMSR_DEFCAPMASK, sc->phyaddr, MII_OFFSET_ANY,
@@ -373,7 +373,6 @@ tsec_mii_wait(struct tsec_softc *sc, uint32_t flags)
return (timeout == 0);
}
-
static void
tsec_init_locked(struct tsec_softc *sc)
{
@@ -556,7 +555,7 @@ tsec_init_locked(struct tsec_softc *sc)
/* Step 26: Setup multicast filters */
tsec_setup_multicast(sc);
-
+
/* Step 27: Activate network interface */
ifp->if_drv_flags |= IFF_DRV_RUNNING;
ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
@@ -742,7 +741,6 @@ tsec_start_locked(struct ifnet *ifp)
BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
for (;;) {
-
if (TSEC_FREE_TX_DESC(sc) < TSEC_TX_MAX_DMA_SEGS) {
/* No free descriptors */
ifp->if_drv_flags |= IFF_DRV_OACTIVE;
@@ -806,7 +804,7 @@ tsec_encap(struct ifnet *ifp, struct tsec_softc *sc, s
tx_idx = sc->tx_idx_head;
tx_bufmap = >tx_bufmap[tx_idx];
-
+
/* Create mapping in DMA memory */
error = bus_dmamap_load_mbuf_sg(sc->tsec_tx_mtag, tx_bufmap->map, m0,
segs, , BUS_DMA_NOWAIT);
@@ -831,7 +829,7 @@ tsec_encap(struct ifnet *ifp, struct tsec_softc *sc, s
bus_dmamap_sync(sc->tsec_tx_mtag, tx_bufmap->map,
BUS_DMASYNC_PREWRITE);
tx_bufmap->mbuf = m0;
-
+
/*
* Fill in the TX descriptors back to front so that READY bit in first
* descriptor is set last.
@@ -1328,7 +1326,6 @@ tsec_receive_intr_locked(struct tsec_softc *sc, int co
if (flags & (TSEC_RXBD_LG | TSEC_RXBD_SH | TSEC_RXBD_NO |
TSEC_RXBD_CR | TSEC_RXBD_OV | TSEC_RXBD_TR)) {
-
rx_desc->length = 0;
rx_desc->flags = (rx_desc->flags &
~TSEC_RXBD_ZEROONINIT) | TSEC_RXBD_E | TSEC_RXBD_I;
@@ -1847,7 +1844,6 @@ tsec_offload_setup(struct tsec_softc *sc)
TSEC_WRITE(sc, TSEC_REG_RCTRL, reg);
}
-
static void
tsec_offload_process_frame(struct tsec_softc *sc, struct mbuf *m)
{
@@ -1871,7 +1867,6 @@ tsec_offload_process_frame(struct tsec_softc *sc, stru
if ((protocol == IPPROTO_TCP || protocol == IPPROTO_UDP) &&
TSEC_RX_FCB_TCP_UDP_CSUM_CHECKED(flags) &&
(flags & TSEC_RX_FCB_TCP_UDP_CSUM_ERROR) == 0) {
-
csum_flags |= CSUM_DATA_VALID | CSUM_PSEUDO_HDR;
m->m_pkthdr.csum_data = 0x;
}
Modified: head/sys/dev/tsec/if_tsec.h
==
--- head/sys/dev/tsec/if_tsec.h Tue Sep 1 21:50:00 2020(r365142)
+++ head/sys/dev/tsec/if_tsec.h Tue Sep 1 21:50:21 2020(r365143)
@@ -56,7 +56,7 @@ struct tsec_bufmap {
struct tsec_softc {
/* XXX MII bus requires that struct ifnet is first!!! */
struct ifnet*tsec_ifp;
-
+
struct mtx transmit_lock; /* transmitter lock */
struct mtx receive_lock; /* receiver lock */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365141 - head/sys/dev/vge
Author: mjg
Date: Tue Sep 1 21:49:49 2020
New Revision: 365141
URL: https://svnweb.freebsd.org/changeset/base/365141
Log:
vge: clean up empty lines in .c and .h files
Modified:
head/sys/dev/vge/if_vge.c
head/sys/dev/vge/if_vgereg.h
head/sys/dev/vge/if_vgevar.h
Modified: head/sys/dev/vge/if_vge.c
==
--- head/sys/dev/vge/if_vge.c Tue Sep 1 21:49:31 2020(r365140)
+++ head/sys/dev/vge/if_vge.c Tue Sep 1 21:49:49 2020(r365141)
@@ -556,7 +556,6 @@ vge_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_i
return (1);
}
-
/*
* Program the multicast filter. We use the 64-entry CAM filter
* for perfect filtering. If there's more than 64 multicast addresses,
@@ -1953,7 +1952,6 @@ vge_start(struct ifnet *ifp)
vge_start_locked(ifp);
VGE_UNLOCK(sc);
}
-
static void
vge_start_locked(struct ifnet *ifp)
Modified: head/sys/dev/vge/if_vgereg.h
==
--- head/sys/dev/vge/if_vgereg.hTue Sep 1 21:49:31 2020
(r365140)
+++ head/sys/dev/vge/if_vgereg.hTue Sep 1 21:49:49 2020
(r365141)
@@ -396,7 +396,6 @@
* 0xC0 (controls which pattern is set)
*/
-
#define VGE_CAMCTL_WRITE 0x04/* CAM write command */
#define VGE_CAMCTL_READ0x08/* CAM read command */
#define VGE_CAMCTL_INTPKT_SIZ 0x10/* select interesting pkt CAM size */
Modified: head/sys/dev/vge/if_vgevar.h
==
--- head/sys/dev/vge/if_vgevar.hTue Sep 1 21:49:31 2020
(r365140)
+++ head/sys/dev/vge/if_vgevar.hTue Sep 1 21:49:49 2020
(r365141)
@@ -246,4 +246,3 @@ struct vge_softc {
#define VGE_RXCHUNK4
#define VGE_TIMEOUT1
-
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365140 - head/sys/dev/viapm
Author: mjg
Date: Tue Sep 1 21:49:31 2020
New Revision: 365140
URL: https://svnweb.freebsd.org/changeset/base/365140
Log:
viapm: clean up empty lines in .c and .h files
Modified:
head/sys/dev/viapm/viapm.c
Modified: head/sys/dev/viapm/viapm.c
==
--- head/sys/dev/viapm/viapm.c Tue Sep 1 21:49:14 2020(r365139)
+++ head/sys/dev/viapm/viapm.c Tue Sep 1 21:49:31 2020(r365140)
@@ -178,7 +178,6 @@ static devclass_t viapropm_devclass;
#define SMBSCTRL_ENABLE0x01/* enable slave */
-
/*
* VIA8233 definitions
*/
@@ -243,7 +242,6 @@ viapm_586b_probe(device_t dev)
return ENXIO;
}
-
static int
viapm_pro_probe(device_t dev)
{
@@ -528,7 +526,7 @@ viabb_setsda(device_t dev, int data)
return;
}
-
+
static int
viabb_reset(device_t dev, u_char speed, u_char addr, u_char *oldaddr)
{
@@ -987,7 +985,7 @@ static device_method_t viapropm_methods[] = {
DEVMETHOD(smbus_readw, viasmb_readw),
DEVMETHOD(smbus_bwrite, viasmb_bwrite),
DEVMETHOD(smbus_bread, viasmb_bread),
-
+
/* Bus interface */
DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource),
DEVMETHOD(bus_release_resource, bus_generic_release_resource),
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365139 - head/sys/dev/videomode
Author: mjg
Date: Tue Sep 1 21:49:14 2020
New Revision: 365139
URL: https://svnweb.freebsd.org/changeset/base/365139
Log:
videomode: clean up empty lines in .c and .h files
Modified:
head/sys/dev/videomode/edid.c
head/sys/dev/videomode/edidreg.h
head/sys/dev/videomode/pickmode.c
head/sys/dev/videomode/vesagtf.c
Modified: head/sys/dev/videomode/edid.c
==
--- head/sys/dev/videomode/edid.c Tue Sep 1 21:48:55 2020
(r365138)
+++ head/sys/dev/videomode/edid.c Tue Sep 1 21:49:14 2020
(r365139)
@@ -133,10 +133,10 @@ edid_is_valid(uint8_t *d)
{
int sum = 0, i;
uint8_t sig[8] = EDID_SIGNATURE;
-
+
if (memcmp(d, sig, 8) != 0)
return EINVAL;
-
+
for (i = 0; i < 128; i++)
sum += d[i];
if ((sum & 0xff) != 0)
@@ -391,7 +391,7 @@ edid_det_timing(uint8_t *data, struct videomode *vmp)
vblank = EDID_DET_TIMING_VBLANK(data);
vsyncwid = EDID_DET_TIMING_VSYNC_WIDTH(data);
vsyncoff = EDID_DET_TIMING_VSYNC_OFFSET(data);
-
+
/* Borders are contained within the blank areas. */
vmp->hdisplay = hactive;
@@ -644,4 +644,3 @@ edid_parse(uint8_t *data, struct edid_info *edid)
return 0;
}
-
Modified: head/sys/dev/videomode/edidreg.h
==
--- head/sys/dev/videomode/edidreg.hTue Sep 1 21:48:55 2020
(r365138)
+++ head/sys/dev/videomode/edidreg.hTue Sep 1 21:49:14 2020
(r365139)
@@ -54,7 +54,6 @@
#define EDID_OFFSET_MFG_TIMING 0x25
#defineEDID_OFFSET_STD_TIMING 0x26
#defineEDID_OFFSET_DESC_BLOCK 0x36
-
#defineEDID_SIGNATURE { 0, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0 }
/* assume x is 16-bit value */
@@ -209,7 +208,6 @@
#defineEDID_DET_TIMING_FLAG_VSYNC_POSITIVE 0x04
#defineEDID_DET_TIMING_FLAG_HSYNC_POSITIVE 0x02
#defineEDID_DET_TIMING_FLAG_STEREO_MODE0x01/* stereo mode
*/
-
/* N.B.: these tests assume that we already checked for detailed timing! */
#defineEDID_BLOCK_TYPE(ptr)((ptr)[3])
Modified: head/sys/dev/videomode/pickmode.c
==
--- head/sys/dev/videomode/pickmode.c Tue Sep 1 21:48:55 2020
(r365138)
+++ head/sys/dev/videomode/pickmode.c Tue Sep 1 21:49:14 2020
(r365139)
@@ -77,7 +77,6 @@ pick_mode_by_ref(int width, int height, int refresh)
DPRINTF("%s: looking for %d x %d at up to %d Hz\n", __func__, width,
height, refresh);
for (i = 0; i < videomode_count; i++) {
-
this = _list[i];
mref = this->dot_clock * 1000 / (this->htotal * this->vtotal);
diff = abs(mref - refresh);
Modified: head/sys/dev/videomode/vesagtf.c
==
--- head/sys/dev/videomode/vesagtf.cTue Sep 1 21:48:55 2020
(r365138)
+++ head/sys/dev/videomode/vesagtf.cTue Sep 1 21:49:14 2020
(r365139)
@@ -150,7 +150,6 @@
*
*/
-
#ifdef _KERNEL
#include
@@ -203,7 +202,6 @@ print_value(int n, const char *name, unsigned val)
#defineprint_value(n, name, val)
#endif
-
/*
* vert_refresh() - as defined by the GTF Timing Standard, compute the
* Stage 1 Parameters using the vertical refresh frequency. In other
@@ -565,7 +563,6 @@ vesagtf_mode_params(unsigned h_pixels, unsigned v_line
print_value(22, "[H FREQ]", h_freq);
#endif
-
/* Stage 1 computations are now complete; I should really pass
the results to another function and do the Stage 2
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365138 - head/sys/dev/vkbd
Author: mjg Date: Tue Sep 1 21:48:55 2020 New Revision: 365138 URL: https://svnweb.freebsd.org/changeset/base/365138 Log: vkbd: clean up empty lines in .c and .h files Modified: head/sys/dev/vkbd/vkbd.c head/sys/dev/vkbd/vkbd_var.h Modified: head/sys/dev/vkbd/vkbd.c == --- head/sys/dev/vkbd/vkbd.cTue Sep 1 21:48:37 2020(r365137) +++ head/sys/dev/vkbd/vkbd.cTue Sep 1 21:48:55 2020(r365138) @@ -344,7 +344,7 @@ done: state->ks_flags &= ~READ; VKBD_UNLOCK(state); - + return (error); } @@ -649,7 +649,7 @@ vkbd_init(int unit, keyboard_t **kbdp, void *arg, int imin(fkeymap_size*sizeof(fkeymap[0]), sizeof(fkey_tab))); kbd_set_maps(kbd, keymap, accmap, fkeymap, fkeymap_size); kbd->kb_data = (void *)state; - + KBD_FOUND_DEVICE(kbd); KBD_PROBE_DONE(kbd); @@ -1071,7 +1071,7 @@ vkbd_check_char(keyboard_t *kbd) return (FALSE); state = (vkbd_state_t *) kbd->kb_data; - + VKBD_LOCK(state); if (!(state->ks_flags & COMPOSE) && (state->ks_composed_char > 0)) ready = TRUE; @@ -1377,4 +1377,3 @@ vkbd_modevent(module_t mod, int type, void *data) } DEV_MODULE(vkbd, vkbd_modevent, NULL); - Modified: head/sys/dev/vkbd/vkbd_var.h == --- head/sys/dev/vkbd/vkbd_var.hTue Sep 1 21:48:37 2020 (r365137) +++ head/sys/dev/vkbd/vkbd_var.hTue Sep 1 21:48:55 2020 (r365138) @@ -50,4 +50,3 @@ typedef struct vkbd_statusvkbd_status_t; typedef struct vkbd_status * vkbd_status_p; #endif /* ndef _VKBD_VAR_H_ */ - ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365135 - head/sys/dev/vr
Author: mjg
Date: Tue Sep 1 21:48:08 2020
New Revision: 365135
URL: https://svnweb.freebsd.org/changeset/base/365135
Log:
vr: clean up empty lines in .c and .h files
Modified:
head/sys/dev/vr/if_vr.c
head/sys/dev/vr/if_vrreg.h
Modified: head/sys/dev/vr/if_vr.c
==
--- head/sys/dev/vr/if_vr.c Tue Sep 1 21:47:32 2020(r365134)
+++ head/sys/dev/vr/if_vr.c Tue Sep 1 21:48:08 2020(r365135)
@@ -380,7 +380,6 @@ vr_miibus_statchg(device_t dev)
}
}
-
static void
vr_cam_mask(struct vr_softc *sc, uint32_t mask, int type)
{
Modified: head/sys/dev/vr/if_vrreg.h
==
--- head/sys/dev/vr/if_vrreg.h Tue Sep 1 21:47:32 2020(r365134)
+++ head/sys/dev/vr/if_vrreg.h Tue Sep 1 21:48:08 2020(r365135)
@@ -491,7 +491,6 @@ struct vr_desc {
#defineVR_RXCTL_RXLERR 0x0080 /* 6105M */
#define VR_RXCTL_RX_INTR 0x0080
-
#define VR_RXCTL (VR_RXCTL_CHAIN|VR_RXCTL_RX_INTR)
#define VR_TXSTAT_DEFER0x0001
@@ -525,7 +524,6 @@ struct vr_desc {
#define VR_FLAG_FORCEDELAY 1
#define VR_FLAG_SCHEDDELAY 2
#define VR_FLAG_DELAYTIMEO 3
-
#define VR_TIMEOUT 1000
#define VR_MII_TIMEOUT 1
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365136 - head/sys/dev/vnic
Author: mjg
Date: Tue Sep 1 21:48:21 2020
New Revision: 365136
URL: https://svnweb.freebsd.org/changeset/base/365136
Log:
vnic: clean up empty lines in .c and .h files
Modified:
head/sys/dev/vnic/nicvf_main.c
head/sys/dev/vnic/nicvf_queues.c
head/sys/dev/vnic/thunder_mdio.c
Modified: head/sys/dev/vnic/nicvf_main.c
==
--- head/sys/dev/vnic/nicvf_main.c Tue Sep 1 21:48:08 2020
(r365135)
+++ head/sys/dev/vnic/nicvf_main.c Tue Sep 1 21:48:21 2020
(r365136)
@@ -656,7 +656,6 @@ nicvf_if_transmit(struct ifnet *ifp, struct mbuf *mbuf
int qidx;
int err = 0;
-
if (__predict_false(qs == NULL)) {
panic("%s: missing queue set for %s", __func__,
device_get_nameunit(nic->dev));
Modified: head/sys/dev/vnic/nicvf_queues.c
==
--- head/sys/dev/vnic/nicvf_queues.cTue Sep 1 21:48:08 2020
(r365135)
+++ head/sys/dev/vnic/nicvf_queues.cTue Sep 1 21:48:21 2020
(r365136)
@@ -891,7 +891,6 @@ nicvf_cmp_task(void *arg, int pending)
* process the entire CQ due to Tx or Rx CQ parse error.
*/
taskqueue_enqueue(cq->cmp_taskq, >cmp_task);
-
}
nicvf_clear_intr(nic, NICVF_INTR_CQ, cq->idx);
@@ -1533,7 +1532,6 @@ nicvf_free_resources(struct nicvf *nic)
while (taskqueue_cancel(qs->qs_err_taskq,
>qs_err_task, NULL) != 0) {
taskqueue_drain(qs->qs_err_taskq, >qs_err_task);
-
}
taskqueue_free(qs->qs_err_taskq);
qs->qs_err_taskq = NULL;
Modified: head/sys/dev/vnic/thunder_mdio.c
==
--- head/sys/dev/vnic/thunder_mdio.cTue Sep 1 21:48:08 2020
(r365135)
+++ head/sys/dev/vnic/thunder_mdio.cTue Sep 1 21:48:21 2020
(r365136)
@@ -142,7 +142,6 @@ MALLOC_DEFINE(M_THUNDER_MDIO, "ThunderX MDIO",
#defineMDIO_LOCK_ASSERT(sc)\
mtx_assert(&(sc)->mtx, MA_OWNED)
-
#definemdio_reg_read(sc, reg) \
bus_read_8((sc)->reg_base, (reg))
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r365137 - head/sys/dev/vmd
Author: mjg
Date: Tue Sep 1 21:48:37 2020
New Revision: 365137
URL: https://svnweb.freebsd.org/changeset/base/365137
Log:
vmd: clean up empty lines in .c and .h files
Modified:
head/sys/dev/vmd/vmd.c
head/sys/dev/vmd/vmd_bus.c
Modified: head/sys/dev/vmd/vmd.c
==
--- head/sys/dev/vmd/vmd.c Tue Sep 1 21:48:21 2020(r365136)
+++ head/sys/dev/vmd/vmd.c Tue Sep 1 21:48:37 2020(r365137)
@@ -316,7 +316,6 @@ vmd_attach(device_t dev)
goto fail;
}
-
sc->vmd_btag = rman_get_bustag(sc->vmd_regs_resource[0]);
sc->vmd_bhandle = rman_get_bushandle(sc->vmd_regs_resource[0]);
@@ -366,7 +365,6 @@ vmd_attach(device_t dev)
min_count - 1);
}
-
/*
* Add the initial resource to the rman.
*/
@@ -424,7 +422,6 @@ vmd_attach(device_t dev)
goto fail;
}
-
return (0);
fail:
@@ -517,7 +514,6 @@ vmd_pcib_route_interrupt(device_t pcib, device_t dev,
{
return (pcib_route_interrupt(pcib, dev, pin));
}
-
static int
vmd_pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount,
Modified: head/sys/dev/vmd/vmd_bus.c
==
--- head/sys/dev/vmd/vmd_bus.c Tue Sep 1 21:48:21 2020(r365136)
+++ head/sys/dev/vmd/vmd_bus.c Tue Sep 1 21:48:37 2020(r365137)
@@ -95,7 +95,7 @@ vmd_bus_attach(device_t dev)
end = rman_get_end(sc->vmd_io_resource);
resource_list_add_next(>resources, SYS_RES_IOPORT, start, end,
end - start + 1);
-
+
bus_generic_attach(dev);
return (0);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
