From nobody Tue Jun 16 10:24:49 2026 Received: from xmbghk7.mail.qq.com (xmbghk7.mail.qq.com [43.163.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E9BC3354AC7; Sat, 18 Apr 2026 12:58:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=43.163.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776517105; cv=none; b=gmvYFdjd1RjjQJeGU5c5PMpEqn1J+82izUh5woBKK9TKf1wa5noD088C4ElvSC82zVZazJEw9OwjWVYoKtMCYqaUxYvn26VhTj6+ufb7FXutWvtnQHRYQZEl9ta0nxr7VkLbcbMT61+DWKe0hhsxEqREvex0CdoCm5zJTTPg5+U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776517105; c=relaxed/simple; bh=igHqjmFI9c+fM8PBbF4fr1pkWr51OGDBtdUkl2mhmqM=; h=Message-ID:Content-Type:MIME-Version:From:To:Cc:Subject:Date; b=HZvX0iXP3W4mjQNOBHdJ0scs7uWfAxSqHxapiUR28xsSBu77jHLZn2s+DB0cHx40a3Hzn1CyZHyLIGkNP6vSPNwaoM+ncyxJFOR5noYhGinNv6tHaJNUf6Fs0awAf9IVoulSLFvIreTe06GbVNNd8bPHSxw1doJFTPfG+4qtYK4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qq.com; spf=pass smtp.mailfrom=qq.com; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b=s36DXGhi; arc=none smtp.client-ip=43.163.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=qq.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qq.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=qq.com header.i=@qq.com header.b="s36DXGhi" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1776517090; bh=igHqjmFI9c+fM8PBbF4fr1pkWr51OGDBtdUkl2mhmqM=; h=From:To:Cc:Subject:Date; b=s36DXGhiRc45eK1GZIs0LW08tKi6aWjKeRY0PYTmmpwJUYfoa3z188Uvs2bgVb/v9 FV8tLtU8Ao7uwpIFCIpM9ryNjqoMxQwSACdLSoEaCVBPRcfRhkuXZEY2eNCRkhIcAR CdGy6g0HYXeNGYwo3bgHIdrSnB+HRvvOQ9DyIZII= Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa ([2409:8a20:c5c:cba1:8896:daed:9ee1:9565]) by newxmesmtplogicsvrszb51-1.qq.com (NewEsmtp) with SMTP id E863B84C; Sat, 18 Apr 2026 20:58:06 +0800 X-QQ-mid: xmsmtpt1776517086tllm0cev4 Message-ID: X-QQ-XMAILINFO: NdEotMrWVzCwesWjIf8orf2Dco3S6vG4d0mbnQqweA1s/76ZWi2jPGMWqldfBf Y8OY75oA+AOtrzjvDgqOImqYL/3XUKCaWrSMcCkQgu/NJ/Ywp7FXDEGuaxv7cU1Ks04MPsc440sO Bt6w6EFVOpNp9Fg/Jl3ZrnLjtfLVfPN4D3KGivm99AcNESsmnR81huDe5Jwrj0NwM6P7JnZLvqPM okxJeXnoxfb4ZI667sqnnWNCD0nX31SicMLDmar3DVZgeAazlbj1ho+At6HWVzFTlFYsSQfEdfIy fnzwfV/TZWEVcURu4XTrH1OBB0J4K1/c9Owd9ZZ1w6EQpEBRoXq2QcjttCbgTXtdcEUv5Yvj6ve7 e6d8Z7bce4JI2P6j4YM9tzlzxMCC7bmT4fE1/5DlKNrMW52cJuKE+c8YPsuUd0sJ7EdT9hjxE0ks mlD2VItLDf0STOR6EniZzf8JbFeXPtry6w77AGiCrXyxqFrKBLWEtTTfhS+JedRVTZa2RxEjApKD ikgkowqFi87J+7Wv/NLtRGb3j9EnvO4PShdcJhe0G3/ohKFkapm0kInjWOvR6lhReoxpU4cidAwO TZnL/ExhrxZkxe/Re7QvfnXZZ3ddzS4N7kPAY1abaaKWpYCkRmT5lNMputgNs3ecKCuuLti/ER/3 FEOg42HjqpKaqrSyjGQJVA92OYrKpatzJQSjkcwq2JpvDHeQ1C9FGHK+3vb1nUGgIvn6q57U4oLz L8VLSB76Z3k4hICP0WJHxEL1pLWJc8ge8cawQARokA6Eo6wSMpj1100kJOGLEQ7lSZMvAB/Y89io Gw7x1wLj3MLXP8f0Ff5REhI7H9rL0XMqoNog2r42edfAUoKmHmeuw9WtssNf9P3P9hcwsZGKwYYm a9Gc5tPvIgBNDXcWRUCZ0BbEQX5R1HeaICGWwIionWuL/d8LWnnE5Id/UYqMQ2bIrdSffy6RTBVH z9hqjk/eH5IQDQYEtRl/84/AjzuigvHqPCyXt7AW8FtDBbi2VaOnpZ2cBBZxEEF3+SFGBVFRWB7R PS/yY+k3PVvPPMJ1q/ X-QQ-XMRINFO: NyFYKkN4Ny6FuXrnB5Ye7Aabb3ujjtK+gg== Content-Type: text/plain; charset="utf-8" Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: wooridge <1063373698@qq.com> To: Alex Deucher , Christian Konig , Greg KH Cc: linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-cxl@vger.kernel.org, linux-rdma@vger.kernel.org, linux-pm@vger.kernel.org, linux-watchdog@vger.kernel.org Subject: [PATCH] treewide: fix occured typo in drivers Date: Sat, 18 Apr 2026 20:58:06 +0800 X-OQ-MSGID: <177651708626.35988.1712073859365136451@qq.com> From 6f5ab6262d3077bc7163575d2f66cd355f18f912 Mon Sep 17 00:00:00 2001 From: wooridge Date: Sat, 18 Apr 2026 20:56:36 +0800 Subject: [PATCH] treewide: fix "occured" typo in drivers/ Fix the common misspelling "occured" -> "occurred" across multiple driver subsystems. This typo appears in comments, kernel-doc, string literals, and one struct field name (timeout_occured -> timeout_occurred in amdgpu dmub_srv). Found via: grep -r "occured" drivers/ Signed-off-by: wooridge --- drivers/cxl/cxlmem.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 4 ++-- drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 4 ++-- drivers/gpu/drm/radeon/radeon_fence.c | 4 ++-- drivers/i2c/busses/i2c-bcm-kona.c | 2 +- drivers/iio/magnetometer/ak8975.c | 2 +- drivers/infiniband/hw/qedr/verbs.c | 2 +- drivers/misc/genwqe/card_base.c | 2 +- drivers/misc/genwqe/card_ddcb.c | 2 +- drivers/misc/vmw_vmci/vmci_queue_pair.c | 4 ++-- drivers/mtd/ubi/wl.c | 2 +- drivers/nfc/microread/i2c.c | 2 +- drivers/nfc/pn544/i2c.c | 2 +- drivers/nfc/st21nfca/i2c.c | 2 +- drivers/power/supply/ab8500_fg.c | 2 +- drivers/power/supply/smb347-charger.c | 2 +- drivers/target/iscsi/iscsi_target.c | 2 +- drivers/video/backlight/ktd253-backlight.c | 2 +- drivers/watchdog/davinci_wdt.c | 2 +- 22 files changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index e21d744d639b..99592ea795a8 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -163,7 +163,7 @@ static inline struct cxl_ep *cxl_ep_load(struct cxl_por= t *port, C(MBUNSUPPORTED, -ENXIO, "unsupported on the mailbox it was issued on"),\ C(PAYLOADLEN, -ENXIO, "invalid payload length"), \ C(LOG, -ENXIO, "invalid or unsupported log page"), \ - C(INTERRUPTED, -ENXIO, "asynchronous event occured"), \ + C(INTERRUPTED, -ENXIO, "asynchronous event occurred"), \ C(FEATUREVERSION, -ENXIO, "unsupported feature version"), \ C(FEATURESELVALUE, -ENXIO, "unsupported feature selection value"), \ C(FEATURETRANSFERIP, -ENXIO, "feature transfer in progress"), \ diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ctx.c index f2c038c91c70..1d3d0c09d8ad 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c @@ -559,7 +559,7 @@ static int amdgpu_ctx_query(struct amdgpu_device *adev, out->state.flags =3D 0x0; out->state.hangs =3D 0x0; =20 - /* determine if a GPU reset has occured since the last call */ + /* determine if a GPU reset has occurred since the last call */ reset_counter =3D atomic_read(&adev->gpu_reset_counter); /* TODO: this should ideally return NO, GUILTY, or INNOCENT. */ if (ctx->reset_counter_query =3D=3D reset_counter) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ids.c index 64c519cd7395..ed1fbf957d73 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c @@ -150,12 +150,12 @@ void amdgpu_pasid_free_delayed(struct dma_resv *resv, */ =20 /** - * amdgpu_vmid_had_gpu_reset - check if reset occured since last use + * amdgpu_vmid_had_gpu_reset - check if reset occurred since last use * * @adev: amdgpu_device pointer * @id: VMID structure * - * Check if GPU reset occured since last use of the VMID. + * Check if GPU reset occurred since last use of the VMID. */ bool amdgpu_vmid_had_gpu_reset(struct amdgpu_device *adev, struct amdgpu_vmid *id) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h b/drivers/gpu/drm/amd/= amdgpu/amdgpu_job.h index 56a88e14a044..bc011b4639f2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.h @@ -31,7 +31,7 @@ #define AMDGPU_PREAMBLE_IB_PRESENT (1 << 0) /* bit set means preamble IB is first presented in belonging context */ #define AMDGPU_PREAMBLE_IB_PRESENT_FIRST (1 << 1) -/* bit set means context switch occured */ +/* bit set means context switch occurred */ #define AMDGPU_HAVE_CTX_SWITCH (1 << 2) /* bit set means IB is preempted */ #define AMDGPU_IB_PREEMPTED (1 << 3) diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c b/drivers/gpu/drm= /amd/display/dc/dc_dmub_srv.c index b15360bcdacf..29ec031cae7e 100644 --- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c @@ -285,8 +285,8 @@ bool dc_dmub_srv_wait_for_idle(struct dc_dmub_srv *dc_d= mub_srv, =20 if (status !=3D DMUB_STATUS_OK) { DC_LOG_DEBUG("No reply for DMUB command: status=3D%d\n", status); - if (!dmub->debug.timeout_info.timeout_occured) { - dmub->debug.timeout_info.timeout_occured =3D true; + if (!dmub->debug.timeout_info.timeout_occurred) { + dmub->debug.timeout_info.timeout_occurred =3D true; if (cmd_list) dmub->debug.timeout_info.timeout_cmd =3D *cmd_list; dmub->debug.timeout_info.timestamp =3D dm_get_timestamp(dc_dmub_srv->c= tx); diff --git a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h b/drivers/gpu/drm/= amd/display/dmub/dmub_srv.h index 3b6bba017040..9ce60a47068d 100644 --- a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h +++ b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h @@ -353,11 +353,11 @@ struct dmub_srv_hw_params { =20 /** * struct dmub_srv_debug - Debug info for dmub_srv - * @timeout_occured: Indicates a timeout occured on any message from drive= r to dmub + * @timeout_occurred: Indicates a timeout occurred on any message from dri= ver to dmub * @timeout_cmd: first cmd sent from driver that timed out - subsequent ti= meouts are not stored */ struct dmub_timeout_info { - bool timeout_occured; + bool timeout_occurred; union dmub_rb_cmd timeout_cmd; unsigned long long timestamp; }; diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon= /radeon_fence.c index 02a40e4750c7..943861b62ee9 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c @@ -191,7 +191,7 @@ static int radeon_fence_check_signaled(wait_queue_entry= _t *wait, * @ring: ring index the fence is associated with * * Checks the current fence value and calculates the last - * signalled fence value. Returns true if activity occured + * signalled fence value. Returns true if activity occurred * on the ring, and the fence_queue should be waken up. */ static bool radeon_fence_activity(struct radeon_device *rdev, int ring) @@ -262,7 +262,7 @@ static bool radeon_fence_activity(struct radeon_device = *rdev, int ring) * @work: delayed work item * * Checks for fence activity and if there is none probe - * the hardware if a lockup occured. + * the hardware if a lockup occurred. */ static void radeon_fence_check_lockup(struct work_struct *work) { diff --git a/drivers/i2c/busses/i2c-bcm-kona.c b/drivers/i2c/busses/i2c-bcm= -kona.c index 9d8838bbd938..d4f287b31fd7 100644 --- a/drivers/i2c/busses/i2c-bcm-kona.c +++ b/drivers/i2c/busses/i2c-bcm-kona.c @@ -427,7 +427,7 @@ static int bcm_kona_i2c_write_fifo_single(struct bcm_ko= na_i2c_dev *dev, return -EREMOTEIO; } =20 - /* Check if a timeout occured */ + /* Check if a timeout occurred */ if (!time_left) { dev_err(dev->device, "completion timed out\n"); return -EREMOTEIO; diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/a= k8975.c index d30315ad85de..d959e1bbeb36 100644 --- a/drivers/iio/magnetometer/ak8975.c +++ b/drivers/iio/magnetometer/ak8975.c @@ -697,7 +697,7 @@ static int wait_conversion_complete_polled(struct ak897= 5_data *data) return read_status; } =20 -/* Returns 0 if the end of conversion interrupt occured or -ETIME otherwis= e */ +/* Returns 0 if the end of conversion interrupt occurred or -ETIME otherwi= se */ static int wait_conversion_complete_interrupt(struct ak8975_data *data) { int ret; diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qed= r/verbs.c index 33b4a0e6d3a8..80e8345a9954 100644 --- a/drivers/infiniband/hw/qedr/verbs.c +++ b/drivers/infiniband/hw/qedr/verbs.c @@ -1095,7 +1095,7 @@ int qedr_destroy_cq(struct ib_cq *ibcq, struct ib_uda= ta *udata) /* We don't want the IRQ handler to handle a non-existing CQ so we * wait until all CNQ interrupts, if any, are received. This will always * happen and will always happen very fast. If not, then a serious error - * has occured. That is why we can use a long delay. + * has occurred. That is why we can use a long delay. * We spin for a short time so we don=E2=80=99t lose time on context swit= ching * in case all the completions are handled in that span. Otherwise * we sleep for a while and check again. Since the CNQ may be diff --git a/drivers/misc/genwqe/card_base.c b/drivers/misc/genwqe/card_bas= e.c index 86bfa82723ff..df94c6af9550 100644 --- a/drivers/misc/genwqe/card_base.c +++ b/drivers/misc/genwqe/card_base.c @@ -922,7 +922,7 @@ static int genwqe_reload_bistream(struct genwqe_dev *cd) * * Condition for the health-thread to trigger: * a) when a kthread_stop() request comes in or - * b) a critical GFIR occured + * b) a critical GFIR occurred * * Informational GFIRs are checked and potentially printed in * GENWQE_HEALTH_CHECK_INTERVAL seconds. diff --git a/drivers/misc/genwqe/card_ddcb.c b/drivers/misc/genwqe/card_ddc= b.c index 969178573940..97de35231042 100644 --- a/drivers/misc/genwqe/card_ddcb.c +++ b/drivers/misc/genwqe/card_ddcb.c @@ -543,7 +543,7 @@ int __genwqe_wait_ddcb(struct genwqe_dev *cd, struct dd= cb_requ *req) return -EINVAL; } =20 - /* Severe error occured. Driver is forced to stop operation */ + /* Severe error occurred. Driver is forced to stop operation */ if (cd->card_state !=3D GENWQE_CARD_USED) { dev_err(&pci_dev->dev, "[%s] err: DDCB#%d forced to stop (rc=3D%d)\n", diff --git a/drivers/misc/vmw_vmci/vmci_queue_pair.c b/drivers/misc/vmw_vmc= i/vmci_queue_pair.c index 872aad355dbe..b777bc3fdde2 100644 --- a/drivers/misc/vmw_vmci/vmci_queue_pair.c +++ b/drivers/misc/vmw_vmci/vmci_queue_pair.c @@ -2532,7 +2532,7 @@ static bool qp_wait_for_ready_queue(struct vmci_qp *q= pair) * VMCI_ERROR_QUEUEPAIR_NOSPACE if no space was available to enqueue * data, VMCI_ERROR_INVALID_SIZE, if any queue pointer is outside the * queue (as defined by the queue size), VMCI_ERROR_INVALID_ARGS, if - * an error occured when accessing the buffer, + * an error occurred when accessing the buffer, * VMCI_ERROR_QUEUEPAIR_NOTATTACHED, if the queue pair pages aren't * available. Otherwise, the number of bytes written to the queue is * returned. Updates the tail pointer of the produce queue. @@ -2598,7 +2598,7 @@ static ssize_t qp_enqueue_locked(struct vmci_queue *p= roduce_q, * VMCI_ERROR_QUEUEPAIR_NODATA if no data was available to dequeue. * VMCI_ERROR_INVALID_SIZE, if any queue pointer is outside the queue * (as defined by the queue size). - * VMCI_ERROR_INVALID_ARGS, if an error occured when accessing the buffer. + * VMCI_ERROR_INVALID_ARGS, if an error occurred when accessing the buffer. * Otherwise the number of bytes dequeued is returned. * Side effects: * Updates the head pointer of the consume queue. diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index e3705db8e570..e8ceee6735db 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -1504,7 +1504,7 @@ static bool scrub_possible(struct ubi_device *ubi, st= ruct ubi_wl_entry *e) * @pnum: the physical eraseblock to schedule * @force: don't read the block, assume bitflips happened and take action. * - * This function reads the given eraseblock and checks if bitflips occured. + * This function reads the given eraseblock and checks if bitflips occurre= d. * In case of bitflips, the eraseblock is scheduled for scrubbing. * If scrubbing is forced with @force, the eraseblock is not read, * but scheduled for scrubbing right away. diff --git a/drivers/nfc/microread/i2c.c b/drivers/nfc/microread/i2c.c index 113b2e306e35..fd1ccb6cf7cc 100644 --- a/drivers/nfc/microread/i2c.c +++ b/drivers/nfc/microread/i2c.c @@ -40,7 +40,7 @@ struct microread_i2c_phy { struct nfc_hci_dev *hdev; =20 int hard_fault; /* - * < 0 if hardware error occured (e.g. i2c err) + * < 0 if hardware error occurred (e.g. i2c err) * and prevents normal operation. */ }; diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c index a0dfb3f98d5a..1ecef0acaa50 100644 --- a/drivers/nfc/pn544/i2c.c +++ b/drivers/nfc/pn544/i2c.c @@ -171,7 +171,7 @@ struct pn544_i2c_phy { int run_mode; =20 int hard_fault; /* - * < 0 if hardware error occured (e.g. i2c err) + * < 0 if hardware error occurred (e.g. i2c err) * and prevents normal operation. */ }; diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index 6d7861383806..3db5427753e9 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c @@ -66,7 +66,7 @@ struct st21nfca_i2c_phy { int run_mode; =20 /* - * < 0 if hardware error occured (e.g. i2c err) + * < 0 if hardware error occurred (e.g. i2c err) * and prevents normal operation. */ int hard_fault; diff --git a/drivers/power/supply/ab8500_fg.c b/drivers/power/supply/ab8500= _fg.c index 9dd99722667a..eb5c1ae68e44 100644 --- a/drivers/power/supply/ab8500_fg.c +++ b/drivers/power/supply/ab8500_fg.c @@ -2037,7 +2037,7 @@ static irqreturn_t ab8500_fg_cc_convend_handler(int i= rq, void *_di) } =20 /** - * ab8500_fg_batt_ovv_handler() - Battery OVV occured + * ab8500_fg_batt_ovv_handler() - Battery OVV occurred * @irq: interrupt number * @_di: pointer to the ab8500_fg structure * diff --git a/drivers/power/supply/smb347-charger.c b/drivers/power/supply/s= mb347-charger.c index 8b95f7e8712f..fc3f90ef2bc9 100644 --- a/drivers/power/supply/smb347-charger.c +++ b/drivers/power/supply/smb347-charger.c @@ -1083,7 +1083,7 @@ static int smb347_get_charging_status(struct smb347_c= harger *smb, } else { /* * in this case no charger error or termination - * occured but charging is not in progress!!! + * occurred but charging is not in progress!!! */ status =3D POWER_SUPPLY_STATUS_NOT_CHARGING; } diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/isc= si_target.c index e80449f6ce15..a0e7b7a13947 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c @@ -4528,7 +4528,7 @@ static void iscsit_logout_post_handler_closesession( /* * Traditional iscsi/tcp will invoke this logic from TX thread * context during session logout, so clear tx_thread_active and - * sleep if iscsit_close_connection() has not already occured. + * sleep if iscsit_close_connection() has not already occurred. * * Since iser-target invokes this logic from it's own workqueue, * always sleep waiting for RX/TX thread shutdown to complete diff --git a/drivers/video/backlight/ktd253-backlight.c b/drivers/video/bac= klight/ktd253-backlight.c index 327b4ee75254..f2c5527d02e0 100644 --- a/drivers/video/backlight/ktd253-backlight.c +++ b/drivers/video/backlight/ktd253-backlight.c @@ -53,7 +53,7 @@ static int ktd253_backlight_stepdown(struct ktd253_backli= ght *ktd253) * * Architectures do not always support ndelay() and we will get a few us * instead. If we get to a critical time limit an interrupt has likely - * occured in the low part of the loop and we need to restart from the + * occurred in the low part of the loop and we need to restart from the * top so we have the backlight in a known state. */ u64 ns; diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index 5f2184bda7b2..36ba71113614 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c @@ -121,7 +121,7 @@ static unsigned int davinci_wdt_get_timeleft(struct wat= chdog_device *wdd) u32 val; struct davinci_wdt_device *davinci_wdt =3D watchdog_get_drvdata(wdd); =20 - /* if timeout has occured then return 0 */ + /* if timeout has occurred then return 0 */ val =3D ioread32(davinci_wdt->base + WDTCR); if (val & WDFLAG) return 0; --=20 2.50.1 (Apple Git-155)