Skip to content

Commit b8c7dd1

Browse files
jbrandebakpm00
authored andcommitted
kernel-wide: fix spelling mistakes like "assocative" -> "associative"
There were several instances of the string "assocat" in the kernel, which should have been spelled "associat", with the various endings of -ive, -ed, -ion, and sometimes beginnging with dis-. Add to the spelling dictionary the corrections so that future instances will be caught by checkpatch, and fix the instances found. Originally noticed by accident with a 'git grep socat'. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Jesse Brandeburg <[email protected]> Cc: Randy Dunlap <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 2d87af0 commit b8c7dd1

File tree

10 files changed

+13
-10
lines changed

10 files changed

+13
-10
lines changed

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ static int eb_create(struct i915_execbuffer *eb)
340340
* Without a 1:1 association between relocation handles and
341341
* the execobject[] index, we instead create a hashtable.
342342
* We size it dynamically based on available memory, starting
343-
* first with 1:1 assocative hash and scaling back until
343+
* first with 1:1 associative hash and scaling back until
344344
* the allocation succeeds.
345345
*
346346
* Later on we use a positive lut_size to indicate we are

drivers/net/wireless/ti/wl1251/acx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ struct acx_rx_msdu_lifetime {
229229
* === ==========
230230
* 31:12 Reserved - Always equal to 0.
231231
* 11 Association - When set, the WiLink receives all association
232-
* related frames (association request/response, reassocation
232+
* related frames (association request/response, reassociation
233233
* request/response, and disassociation). When clear, these frames
234234
* are discarded.
235235
* 10 Auth/De auth - When set, the WiLink receives all authentication

drivers/scsi/qedf/qedf_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2286,7 +2286,7 @@ static bool qedf_process_completions(struct qedf_fastpath *fp)
22862286
* on.
22872287
*/
22882288
if (!io_req)
2289-
/* If there is not io_req assocated with this CQE
2289+
/* If there is not io_req associated with this CQE
22902290
* just queue it on CPU 0
22912291
*/
22922292
cpu = 0;

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
979979
left = pkt_len - (sizeof(struct ieee80211_hdr_3addr) + ie_offset);
980980
pos = pframe + (sizeof(struct ieee80211_hdr_3addr) + ie_offset);
981981

982-
/* check if this stat has been successfully authenticated/assocated */
982+
/* check if this stat has been successfully authenticated/associated */
983983
if (!((pstat->state) & WIFI_FW_AUTH_SUCCESS)) {
984984
if (!((pstat->state) & WIFI_FW_ASSOC_SUCCESS)) {
985985
status = WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA;

drivers/staging/rtl8723bs/core/rtw_pwrctrl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ void LPS_Enter(struct adapter *padapter, const char *msg)
452452
if (hal_btcoex_IsBtControlLps(padapter))
453453
return;
454454

455-
/* Skip lps enter request if number of assocated adapters is not 1 */
455+
/* Skip lps enter request if number of associated adapters is not 1 */
456456
if (check_fwstate(&(dvobj->padapters->mlmepriv), WIFI_ASOC_STATE))
457457
n_assoc_iface++;
458458
if (n_assoc_iface != 1)

include/linux/nvme-fc-driver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ enum {
620620
*
621621
* Structure used between LLDD and nvmet-fc layer to represent the exchange
622622
* context for a FC-NVME FCP I/O operation (e.g. a nvme sqe, the sqe-related
623-
* memory transfers, and its assocated cqe transfer).
623+
* memory transfers, and its associated cqe transfer).
624624
*
625625
* The structure is allocated by the LLDD whenever a FCP CMD IU is received
626626
* from the FC link. The address of the structure is passed to the nvmet-fc

include/linux/soc/apple/rtkit.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ struct apple_rtkit;
6969
* Initializes the internal state required to handle RTKit. This
7070
* should usually be called within _probe.
7171
*
72-
* @dev: Pointer to the device node this coprocessor is assocated with
72+
* @dev: Pointer to the device node this coprocessor is associated with
7373
* @cookie: opaque cookie passed to all functions defined in rtkit_ops
7474
* @mbox_name: mailbox name used to communicate with the co-processor
7575
* @mbox_idx: mailbox index to be used if mbox_name is NULL
@@ -83,7 +83,7 @@ struct apple_rtkit *devm_apple_rtkit_init(struct device *dev, void *cookie,
8383
* Non-devm version of devm_apple_rtkit_init. Must be freed with
8484
* apple_rtkit_free.
8585
*
86-
* @dev: Pointer to the device node this coprocessor is assocated with
86+
* @dev: Pointer to the device node this coprocessor is associated with
8787
* @cookie: opaque cookie passed to all functions defined in rtkit_ops
8888
* @mbox_name: mailbox name used to communicate with the co-processor
8989
* @mbox_idx: mailbox index to be used if mbox_name is NULL

net/netfilter/nf_conntrack_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,7 @@ static int nf_ct_resolve_clash_harder(struct sk_buff *skb, u32 repl_idx)
10901090
* A conntrack entry can be inserted to the connection tracking table
10911091
* if there is no existing entry with an identical tuple.
10921092
*
1093-
* If there is one, @skb (and the assocated, unconfirmed conntrack) has
1093+
* If there is one, @skb (and the associated, unconfirmed conntrack) has
10941094
* to be dropped. In case @skb is retransmitted, next conntrack lookup
10951095
* will find the already-existing entry.
10961096
*

net/tipc/socket.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ static int tipc_release(struct socket *sock)
657657
}
658658

659659
/**
660-
* __tipc_bind - associate or disassocate TIPC name(s) with a socket
660+
* __tipc_bind - associate or disassociate TIPC name(s) with a socket
661661
* @sock: socket structure
662662
* @skaddr: socket address describing name(s) and desired operation
663663
* @alen: size of socket address data structure

scripts/spelling.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,10 @@ assigment||assignment
176176
assigments||assignments
177177
assistent||assistant
178178
assocaited||associated
179+
assocated||associated
179180
assocating||associating
180181
assocation||association
182+
assocative||associative
181183
associcated||associated
182184
assotiated||associated
183185
asssert||assert
@@ -543,6 +545,7 @@ direcly||directly
543545
direectly||directly
544546
diregard||disregard
545547
disassocation||disassociation
548+
disassocative||disassociative
546549
disapear||disappear
547550
disapeared||disappeared
548551
disappared||disappeared

0 commit comments

Comments
 (0)