From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 049A63D6666 for ; Tue, 28 Apr 2026 11:39:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777376390; cv=none; b=SyjmLaWcHD77Al/mOXqu4XLRohgCjGWfjs1iy9X5VNpqxfGnY+j7QXl39KXOuBApNxFKtDIBG+WmwtD9grlPn7WfWD1mk7GR550IfvTrg0dLK6AVEiPz0JSaPabaeoftqpiAIt0bUzT3nalAmca5TdN4L+DQxqIB/9V88e5hg7Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777376390; c=relaxed/simple; bh=LRXlNS9x02z8g+CGxmATU/6gvHvDK0YuBVqtECCU2ME=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jZmCvHZaW3fZlnG7hIGMiYMLsP/aiuKWwSMI23AfFxIPr++MzYqpB63+hkOmCV83va8QFkS7DuUXt5tGvzbmKz1sqhP7HW+YCwCX306AOLsc64Cq/Wb1Mbw3yOwGs/vWe9RETSZ7J/veGnHzLacE+Twg4HvmTK+UJqlSYyy40PE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=U8R5Ul/R; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="U8R5Ul/R" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-488af9fdaa7so66840695e9.1 for ; Tue, 28 Apr 2026 04:39:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777376385; x=1777981185; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2KGU01Qq2W7EXZE5uDuHFOzhjoXBSa5CoF8m94VBiMo=; b=U8R5Ul/Rtjv688G/ApPoqfcvPkZAw4zHfPzYzdfWwdy0NbioFyKUIuOqbmTm21kRrV 5mkkK7T4LZ7w1tIDmc3dOQrvhfVkIrlChjODdPWFaBwIjo62hybK5RlMCVSC/H9VdQRj jz3risBC4lv20gsYNYzaTwkpinOlUKOL6aEFhGH+Ob1+G1ZkcJoASg4AFXA7R6djPU3A GJUtLAf/HFG3ILwQDqXzuKi+OIQGmQ0mMxDs1ux3lub9XDp1IWBw0FjvynVWAvdG4cTr 7jFGsaNrp+IvO8UmJCOgUDGnxbWV2f26qw4WniXp9d5aDiLUMeblcQKdyBvcFdTLppof Qcgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777376385; x=1777981185; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2KGU01Qq2W7EXZE5uDuHFOzhjoXBSa5CoF8m94VBiMo=; b=Hih+Aws3X3P5rvVymKJiWgZzYl0iCF69/VelyNT5uLG+tEaSwhf4b0WN8wyIqA1Vxi eObGXekAmowzC2OHbzpvD6PbETopMEzfWwei5hv1XK9nAPYoDBCHBCpEPnlYtgvKLlAI I7m+H9z6TGAY+X2G+HNvmJb9cg4okd0BEzgKEc9zeSK9CioyoMZcQQOZiCi2uB5gT0lz DPi1+bXbQoyhmUFhto5wuenTlaKYFWzpWtwm6eaAaV0T9jaaAwdVYWeodYx8oViGgqm2 BnK3ncpmoaAQLdR4zO1bK3VmfRn24WILbTz8wTUkuD7ZY03Y0L2QhYU3QvxC1VVa6MBb Tamg== X-Gm-Message-State: AOJu0YzRjJPa4kgL0IxLhatsvByE+Zq9HkOq2qn307agrquAQ1MZCyBK MsHJKPq9Rl1Ik3ppPEOQU7FWbAwDw5ux/lGSQOQ79oihFJP/TH1oFe0S X-Gm-Gg: AeBDiesljrkggTGxsgzC+MDwh8K8+A5TT2RQqExvct5wZ9oxOlmvPMANXBFpM7jWPLo LEW5ozPxfrtC81tcZuhU9a0Jnf1u8T8FQ3Ge6tF1/uqowlzZidBNL8gyP1ta+yH9dS/0V5IVWyc jFhGjMqG4FMyvAeoauuMmqtXkdvnf93PCBjAaY/yGaWpntGOs6KzPq7JfrXVK1pRoi/VciihfUh 26691iFsStTclEo+TfMNzH/fcSB/P1qdtWwNB+BZsARn36DlWzlhJ8tcLUb0eZT0re1/2UxWwUZ zllU/og6mBeYQ54YqIdJ/b8Igsq0juxRi7/mK+/knJXS2jWBlIBjLvK9wch99//DQHj9OceOa7S UQqZG8mo/B/FfxQ8TmUTPlrgT9NfLx+ui1dbVb32E1OtLZ3XrAswEeZfdXKlFflCAZ8do/My8dm WK2NgD/bdTfphGvbnJFNVtoxc= X-Received: by 2002:a05:600c:1d0a:b0:488:a824:fe04 with SMTP id 5b1f17b1804b1-48a77b1e893mr45325545e9.26.1777376385036; Tue, 28 Apr 2026 04:39:45 -0700 (PDT) Received: from xeon ([188.163.112.56]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a77aeb223sm43541125e9.3.2026.04.28.04.39.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Apr 2026 04:39:44 -0700 (PDT) From: Svyatoslav Ryhel To: Lee Jones , Pavel Machek , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sakari Ailus , Mauro Carvalho Chehab , Svyatoslav Ryhel Cc: linux-leds@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v4 3/5] media: i2c: lm3560: Optimize mutex lock usage Date: Tue, 28 Apr 2026 14:39:20 +0300 Message-ID: <20260428113923.112920-4-clamor95@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260428113923.112920-1-clamor95@gmail.com> References: <20260428113923.112920-1-clamor95@gmail.com> Precedence: bulk X-Mailing-List: linux-leds@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Pass the device's own mutex lock to the control handler so that the media framework can handle control access instead of managing it manually. The lock must be common to both sub-devices since they share same hardware, so the individual sub-device locks will not work here. Signed-off-by: Svyatoslav Ryhel --- drivers/media/i2c/lm3560.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/media/i2c/lm3560.c b/drivers/media/i2c/lm3560.c index edfb07587cab..5b568ed9536b 100644 --- a/drivers/media/i2c/lm3560.c +++ b/drivers/media/i2c/lm3560.c @@ -162,14 +162,12 @@ static int lm3560_get_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no) struct lm3560_flash *flash = to_lm3560_flash(ctrl, led_no); int rval = -EINVAL; - mutex_lock(&flash->lock); - if (ctrl->id == V4L2_CID_FLASH_FAULT) { s32 fault = 0; unsigned int reg_val; rval = regmap_read(flash->regmap, REG_FLAG, ®_val); if (rval < 0) - goto out; + return rval; if (reg_val & FAULT_SHORT_CIRCUIT) fault |= V4L2_FLASH_FAULT_SHORT_CIRCUIT; if (reg_val & FAULT_OVERTEMP) @@ -179,8 +177,6 @@ static int lm3560_get_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no) ctrl->cur.val = fault; } -out: - mutex_unlock(&flash->lock); return rval; } @@ -190,8 +186,6 @@ static int lm3560_set_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no) u8 tout_bits; int rval = -EINVAL; - mutex_lock(&flash->lock); - switch (ctrl->id) { case V4L2_CID_FLASH_LED_MODE: flash->led_mode = ctrl->val; @@ -202,14 +196,12 @@ static int lm3560_set_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no) case V4L2_CID_FLASH_STROBE_SOURCE: rval = regmap_update_bits(flash->regmap, REG_CONFIG1, 0x04, (ctrl->val) << 2); - if (rval < 0) - goto err_out; break; case V4L2_CID_FLASH_STROBE: if (flash->led_mode != V4L2_FLASH_LED_MODE_FLASH) { rval = -EBUSY; - goto err_out; + break; } flash->led_mode = V4L2_FLASH_LED_MODE_FLASH; rval = lm3560_mode_ctrl(flash); @@ -218,7 +210,7 @@ static int lm3560_set_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no) case V4L2_CID_FLASH_STROBE_STOP: if (flash->led_mode != V4L2_FLASH_LED_MODE_FLASH) { rval = -EBUSY; - goto err_out; + break; } flash->led_mode = V4L2_FLASH_LED_MODE_NONE; rval = lm3560_mode_ctrl(flash); @@ -239,8 +231,6 @@ static int lm3560_set_ctrl(struct v4l2_ctrl *ctrl, enum lm3560_led_id led_no) break; } -err_out: - mutex_unlock(&flash->lock); return rval; } @@ -328,6 +318,8 @@ static int lm3560_init_controls(struct lm3560_flash *flash, if (fault != NULL) fault->flags |= V4L2_CTRL_FLAG_VOLATILE; + hdl->lock = &flash->lock; + if (hdl->error) return hdl->error; @@ -363,6 +355,7 @@ static int lm3560_subdev_init(struct lm3560_flash *flash, if (rval < 0) goto err_out; flash->subdev_led[led_no].entity.function = MEDIA_ENT_F_FLASH; + flash->subdev_led[led_no].state_lock = &flash->lock; rval = v4l2_async_register_subdev(&flash->subdev_led[led_no]); if (rval < 0) { -- 2.51.0