From nobody Sun Feb 8 15:53:56 2026 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (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 C5072199230 for ; Tue, 13 Aug 2024 12:13:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551234; cv=none; b=K11UBoqXPj5AXoVXCti8ltDS5wYeyJdqqB041geReVVpqtiHHukHP84heSsXP/OHhuqBJtc/NyIP7C6p8UGBMW5R/6xDaSvbZNqS0gMqkFH1PrTCNoqlkjN1XJXXj1PzRH/LrFbJxKHdzb9ce7ENTBmfjnrzpa8psKTTW5KrkEs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551234; c=relaxed/simple; bh=g+rNwochslFeeyi6Ofw/XN2e0QyEqWoJrguFWPehPrQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dR1KeD2pfPDGp9Yc9UqU44eMhBTSyXtvXrewwfckkdNqacY0Xv/y3AnQ+HxjvkuGfMOsUcjHbSwmLc2/MqwqBT6tPCtrTSQQf6pHWqSKsG8m21C5eheTxjTeS7C0drXILpXOoWJXknZWB/w62VpL3AqRfTvbxH0JptG1/oALJGE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=FJkGtUgx; arc=none smtp.client-ip=209.85.222.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="FJkGtUgx" Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-7a1e2ac1ee5so353054085a.2 for ; Tue, 13 Aug 2024 05:13:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1723551231; x=1724156031; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Q2YaJNxhLs5F8lLYTx7H4r6rahb3C2THbGnEdQxh/xA=; b=FJkGtUgx8jqlftw8QTjDYEKtLyHy8f9YTd5QchYiWhdyy/JfMkuBkTjwL1crIZUAS5 HtLarB/W4OKIThoR8D8o9Zae/kav761oIEJM7b/yirEuR9tQhWbkz592Q9bKQLdmgQ1u 4oHAqvrrbX1veu3+e4o5vwveSlEKHnWD4pPsQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723551231; x=1724156031; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q2YaJNxhLs5F8lLYTx7H4r6rahb3C2THbGnEdQxh/xA=; b=i7QSPAo6SDlHQIBnfo1nSrAryUgDKv/sXBZa8NHEzuOXec9eVduStc13GAo8JRXCbl nrTEQCWICS548mbAmoEH7at0DiXbMr8Y5WqgB1IuDc7BWicZdvWgq4y6jpAC0a6HEYOh 0keKpzXxhnvsBpcNRXrzPL+3JK1R2xqdRuYv9zOkUw1ygOss3+/jxuB0vmh9Eafw9jJ+ mxkLJKasyPfVV6dKK9W02lT9oEE3Dm7Z5lP0jk/jhHDVUQqOxVhKLqG5Um4W/dlsVa8o Iy7trvc+EZV4lnzf5NBHEolZTBekXB1BiUOl0NOQvENAfALn7i0zTuewAEtx7+RlBqwr NhqA== X-Forwarded-Encrypted: i=1; AJvYcCUfimELzlkraRSecycdanBoqhlkfNLFl3srokVK4uD/QulcjSpgTAYalqfb18Weuoy5dnnDhVgoxF3HcGmElYKnaQdH8pr5MsIP7O6c X-Gm-Message-State: AOJu0Yx3CuX1kGr6zOyRTSH5Tk3d1Vk67if9Ng0zWQdqRhkVDOudfzP5 0Vu2YzfiwD6LWlqhTvHwht/jecdsyaPvrvda4mGA/70UZ2VpYLPqGLk3lJCWjw== X-Google-Smtp-Source: AGHT+IEbPwywblqg1PHmJ6WOVqLAFdQNUuhFh7OmJ87lW/f5GlJN4YVEnCjKh12Gxxs2z0IijZihGw== X-Received: by 2002:a05:620a:4109:b0:7a1:e2e0:b3c9 with SMTP id af79cd13be357-7a4e151ba74mr391481985a.24.1723551230715; Tue, 13 Aug 2024 05:13:50 -0700 (PDT) Received: from denia.c.googlers.com (123.178.145.34.bc.googleusercontent.com. [34.145.178.123]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4c7d71ca8sm331765485a.50.2024.08.13.05.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 05:13:50 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 13 Aug 2024 12:13:48 +0000 Subject: [PATCH 1/6] media: ar0521: Refactor ar0521_power_off() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240813-smatch-clock-v1-1-664c84295b1c@chromium.org> References: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> In-Reply-To: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> To: Sakari Ailus , =?utf-8?q?Krzysztof_Ha=C5=82asa?= , Mauro Carvalho Chehab , Sylwester Nawrocki , Andrzej Hajda , Neil Armstrong , Greg Kroah-Hartman , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Ricardo Ribalda X-Mailer: b4 0.13.0 Factor out all the power off logic, except the clk_disable_unprepare(), to a new function __ar0521_power_off(). This allows ar0521_power_on() to explicitly clean-out the clock during the error-path. The following smatch warning is fixed: drivers/media/i2c/ar0521.c:912 ar0521_power_on() warn: 'sensor->extclk' fro= m clk_prepare_enable() not released on lines: 912. Signed-off-by: Ricardo Ribalda --- drivers/media/i2c/ar0521.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/ar0521.c b/drivers/media/i2c/ar0521.c index 09331cf95c62..2c528db31ba6 100644 --- a/drivers/media/i2c/ar0521.c +++ b/drivers/media/i2c/ar0521.c @@ -835,7 +835,7 @@ static const struct initial_reg { be(0x0707)), /* 3F44: couple k factor 2 */ }; =20 -static int ar0521_power_off(struct device *dev) +static void __ar0521_power_off(struct device *dev) { struct v4l2_subdev *sd =3D dev_get_drvdata(dev); struct ar0521_dev *sensor =3D to_ar0521_dev(sd); @@ -850,6 +850,16 @@ static int ar0521_power_off(struct device *dev) if (sensor->supplies[i]) regulator_disable(sensor->supplies[i]); } +} + +static int ar0521_power_off(struct device *dev) +{ + struct v4l2_subdev *sd =3D dev_get_drvdata(dev); + struct ar0521_dev *sensor =3D to_ar0521_dev(sd); + + clk_disable_unprepare(sensor->extclk); + __ar0521_power_off(dev); + return 0; } =20 @@ -908,7 +918,8 @@ static int ar0521_power_on(struct device *dev) =20 return 0; off: - ar0521_power_off(dev); + clk_disable_unprepare(sensor->extclk); + __ar0521_power_off(dev); return ret; } =20 --=20 2.46.0.76.ge559c4bf1a-goog From nobody Sun Feb 8 15:53:56 2026 Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) (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 9B04B199259 for ; Tue, 13 Aug 2024 12:13:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551234; cv=none; b=VDNv/PzNGlSKO9gcDQhak4yItyVSGzl+ytjiSLWzxQ3PdHvnvCbF5BSw+jDw423WOXylOneae4HFVRj4oBNLCwkYEWx9/Xo3I0HTaOI9Z6C6ttgPOXYR9x+zhNvgCsJtFT52ULlJyeDNlM2QK8K5GJp9RkzhWuywvHTXpTAi1zk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551234; c=relaxed/simple; bh=m5XHSgRo8F8WjUA+xwLRz6jjxaEE3qje9U5hDygSCPc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qvdIpFfLUZ72lHrH4yjf0i2z8FM4FvF69bfORQoC9zsaRfCb5sSRHfLKVgqWd7a6xxEWaPJFRV231inW9CF9yevLQ0QA9q9vjjRNkT/85te7LOdvVCDAGiCGOT3TV7ktuuQPe0CeQ2QgMzP7E3ZTpIw+LpO352/7+IsMMqILByE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=NnIzU98n; arc=none smtp.client-ip=209.85.222.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="NnIzU98n" Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-7a1d024f775so359898585a.2 for ; Tue, 13 Aug 2024 05:13:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1723551231; x=1724156031; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=1NN4I3pMa1z6u3JhFybH/YMr+WwEfsG16l3i3ACZ6OI=; b=NnIzU98n9usdqMARhJaHFWnNolZkXw26IDzbHeoG5B7YyN0PWOcS9L5BpW4Pp/7auz 52cS2XhOE9rF10zd0rpeT443ZXJi9T8UcHr2GejupbfT5CDmiafZLAUM+T9uIGKPNhH8 sTlMcitR5WIFfnZl7RvWKbuTHXB4zG1exPgtw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723551231; x=1724156031; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1NN4I3pMa1z6u3JhFybH/YMr+WwEfsG16l3i3ACZ6OI=; b=TfH5BMELFDIdl3aYKHJpnafcGdC5/bcTkeC6UYwWSMwPVP0xXLiuh1FRijMOJ52EGG 01HNYWNGZrzoz+SrjpzfZh6ufOHXgOCfm5RvLsz+WGwHvoXdd8xWGr64+2fc9kXGKK5k TzrW2FFoV/tHq/Oz0wB75VOWdNkZbXfMGTGvRlNxQkbRyi4wdRVFg3dRFpvolfkAe7pH O/eER38CcCw/heivTiyF/N0/jt4D2iOTo2dzZ1AqK7FPn9misC9WCwzq2LI98KBTsQKO 6zeicv4mj5e45K6Os1L0sK9C7MV8n3Ia/7GHycxx4R1RfxiZUHcwjYOygt9lYbWUV5QG NQpA== X-Forwarded-Encrypted: i=1; AJvYcCVVYpxGRw4/8+ZPZy0N8Eyj+O2z4yo3U740/OYirOJCB53gbtnqkvWNZZY+C/nhjqNh/sTWezgNidcJAZLI0RIjlwjjXeMk/x/XX5W7 X-Gm-Message-State: AOJu0YxUWi7Q82mjfBH7l32F5pXOK8OyPp14IOrd3jYamYKgSyFNydIk 5tNBCcBnRVho+/EONQJJym7L587iU24/KbAlEpgz4xwn4iP/g6y0mTZARx1pVw== X-Google-Smtp-Source: AGHT+IEbzzCLxiIWDetpY/N6kglqi3rroSN+bG6y6yQxlctkjM/b9mCaiLCXSWS8MVpF1YKtj23MkQ== X-Received: by 2002:a05:620a:4451:b0:79d:76e5:be76 with SMTP id af79cd13be357-7a4e15afa64mr377756785a.41.1723551231504; Tue, 13 Aug 2024 05:13:51 -0700 (PDT) Received: from denia.c.googlers.com (123.178.145.34.bc.googleusercontent.com. [34.145.178.123]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4c7d71ca8sm331765485a.50.2024.08.13.05.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 05:13:51 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 13 Aug 2024 12:13:49 +0000 Subject: [PATCH 2/6] media: i2c: ov5645: Refactor ov5645_set_power_off() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240813-smatch-clock-v1-2-664c84295b1c@chromium.org> References: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> In-Reply-To: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> To: Sakari Ailus , =?utf-8?q?Krzysztof_Ha=C5=82asa?= , Mauro Carvalho Chehab , Sylwester Nawrocki , Andrzej Hajda , Neil Armstrong , Greg Kroah-Hartman , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Ricardo Ribalda X-Mailer: b4 0.13.0 Factor out all the power off logic, except clk_disable_unprepare(), to a new function __ov5645_set_power_off(). This allows ov5645_set_power_on() to excplicitly clean-out the clock during the error-path. The following smatch warning is fixed: drivers/media/i2c/ov5645.c:690 ov5645_set_power_on() warn: 'ov5645->xclk' f= rom clk_prepare_enable() not released on lines: 690. Signed-off-by: Ricardo Ribalda --- drivers/media/i2c/ov5645.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/ov5645.c b/drivers/media/i2c/ov5645.c index 6c2d221f6973..0c32bd2940ec 100644 --- a/drivers/media/i2c/ov5645.c +++ b/drivers/media/i2c/ov5645.c @@ -635,7 +635,7 @@ static int ov5645_set_register_array(struct ov5645 *ov5= 645, return 0; } =20 -static int ov5645_set_power_off(struct device *dev) +static void __ov5645_set_power_off(struct device *dev) { struct v4l2_subdev *sd =3D dev_get_drvdata(dev); struct ov5645 *ov5645 =3D to_ov5645(sd); @@ -643,8 +643,16 @@ static int ov5645_set_power_off(struct device *dev) ov5645_write_reg(ov5645, OV5645_IO_MIPI_CTRL00, 0x58); gpiod_set_value_cansleep(ov5645->rst_gpio, 1); gpiod_set_value_cansleep(ov5645->enable_gpio, 0); - clk_disable_unprepare(ov5645->xclk); regulator_bulk_disable(OV5645_NUM_SUPPLIES, ov5645->supplies); +} + +static int ov5645_set_power_off(struct device *dev) +{ + struct v4l2_subdev *sd =3D dev_get_drvdata(dev); + struct ov5645 *ov5645 =3D to_ov5645(sd); + + __ov5645_set_power_off(dev); + clk_disable_unprepare(ov5645->xclk); =20 return 0; } @@ -686,7 +694,8 @@ static int ov5645_set_power_on(struct device *dev) return 0; =20 exit: - ov5645_set_power_off(dev); + __ov5645_set_power_off(dev); + clk_disable_unprepare(ov5645->xclk); return ret; } =20 --=20 2.46.0.76.ge559c4bf1a-goog From nobody Sun Feb 8 15:53:56 2026 Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (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 2D15E1993B0 for ; Tue, 13 Aug 2024 12:13:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551235; cv=none; b=VjJWI7Tl8I65Yqqttt4gkc12StZG+Hf6EAYw6vxCfq9DfPQDSgPeJrgR2QdzNr3FCxW3F+UyDlWuqb0hqUwvw41ZFWJdNpuUMbv539BrJAdQCuSJgKi3TaoJ/nx9HKT+fbvIiynzObxjNlGiWM8AkZCMstIWEG6WfIcIia/gjzY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551235; c=relaxed/simple; bh=F14N6L/7XjC8oRmavmnQiXfhM7cavcf0lfyqWY/R5js=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sbXTKYot3J7nOSkCABSwZFKK3Efy1az2b5PQLp0OcG82b4RAkI7CuzNiqhHN/mXC/AkEhNb0wBt9VtDE1j2Bq2g0E6SqyWcSBU2/CF8I6RFezo2PCTuG+uOAbuoPkp72R5nqIl5mj2B+YmduqaGtN8RidLDDRlgvXTp0OTSPdwc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=UbDlZ6d8; arc=none smtp.client-ip=209.85.222.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="UbDlZ6d8" Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-7a1d7a544e7so365189485a.3 for ; Tue, 13 Aug 2024 05:13:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1723551233; x=1724156033; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=LrZdtpz/qyn21riVVQ3i7W1bl9boREamJ7f5SQNbyMY=; b=UbDlZ6d8Kfn+w1WNhEcrYWG1Ri4Yg6sAGi38rXGDkVBS2hTzI7n/I30K5qZrA6nJOP cFt0uzjbN3uArZ/n11SGX9jlXJFmF20O4TfNok4JtQvVNkrFnGbqvZ9GJG4gOoD63Ooj AxvR7kASGCwsSu8hze71fCXDqGeY0x3SJCNtY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723551233; x=1724156033; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LrZdtpz/qyn21riVVQ3i7W1bl9boREamJ7f5SQNbyMY=; b=t6AH3tKtDyc4MEbDk3goUFXE4JzHeWpIsWydqjJBAR5w6+T9qtejeQOEryEyqpf734 bos280P0YsovmSlO6/CkAtWfZ4VQfmSaPzBjZduB5CwdmDxybdhQNnhGlfhuaf5aa0KC aZtAq2JbH1MJGwXimWYTp3ACzwAXdE4XXqavu2libcemCv2G0qaxuSDIHMUT4a8Tll2u HdQncIvB+lDdWX1W7OR23GPZ5OCfopaz4FZTwFGcjP0v9KyLxGZ58nLQMa0ojt5rV5RV 7o5lA7s9RpKhCB6NPqZdDyYEk/0vV8bMm30lv1cftzaSYtedx3P7STii1h+gKvwN5O1Y g6ew== X-Forwarded-Encrypted: i=1; AJvYcCUKkT/gfg078R7vHP79BhICUGEgBdLxYphR7t7GhqnF6NpoI9qvjSp4IzvXQa18aE/88h2AMewwIn14NAE=@vger.kernel.org X-Gm-Message-State: AOJu0YzFO4MeE3JbCBELHs9GDfx6tpycVGXiMV7WqanQkIxZ+wIO/QkL hq84hVJ5vo/IY0tevKTs/uJALUaHSCImJHS6+esJabGA0PfkbmB/QW+YgNd44Q== X-Google-Smtp-Source: AGHT+IFw/fFUPyShPG2/Ze40YU4KamjQKDfYMrBvg1bfZRKNcTmejJtMfWfYfhDU5SD5ItOdKzwbXQ== X-Received: by 2002:a05:620a:4043:b0:79f:515:e211 with SMTP id af79cd13be357-7a4e15bdc69mr410951685a.46.1723551233113; Tue, 13 Aug 2024 05:13:53 -0700 (PDT) Received: from denia.c.googlers.com (123.178.145.34.bc.googleusercontent.com. [34.145.178.123]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4c7d71ca8sm331765485a.50.2024.08.13.05.13.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 05:13:52 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 13 Aug 2024 12:13:50 +0000 Subject: [PATCH 3/6] media: i2c: s5c73m3: Move clk_prepare to its own function Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240813-smatch-clock-v1-3-664c84295b1c@chromium.org> References: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> In-Reply-To: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> To: Sakari Ailus , =?utf-8?q?Krzysztof_Ha=C5=82asa?= , Mauro Carvalho Chehab , Sylwester Nawrocki , Andrzej Hajda , Neil Armstrong , Greg Kroah-Hartman , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Ricardo Ribalda X-Mailer: b4 0.13.0 Smatch is very confused by a clk_prepare_enable() being called in an error-path. Fix this warning by moving the clk_prepare_enable() to its own function. drivers/media/i2c/s5c73m3/s5c73m3-core.c:1425 __s5c73m3_power_off() warn: '= state->clock' from clk_prepare_enable() not released on lines: 1425. Signed-off-by: Ricardo Ribalda --- drivers/media/i2c/s5c73m3/s5c73m3-core.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/s5c73m3/s5c73m3-core.c b/drivers/media/i2c/s= 5c73m3/s5c73m3-core.c index e89e888f028e..7716dfe2b8c9 100644 --- a/drivers/media/i2c/s5c73m3/s5c73m3-core.c +++ b/drivers/media/i2c/s5c73m3/s5c73m3-core.c @@ -1392,6 +1392,16 @@ static int __s5c73m3_power_on(struct s5c73m3 *state) return ret; } =20 +/* + * This function has been created just to avoid a smatch warning, + * please do not merge into __s5c73m3_power_off() until you have + * confirmed that it does not introduce a new warning. + */ +static void s5c73m3_enable_clk(struct s5c73m3 *state) +{ + clk_prepare_enable(state->clock); +} + static int __s5c73m3_power_off(struct s5c73m3 *state) { int i, ret; @@ -1421,7 +1431,8 @@ static int __s5c73m3_power_off(struct s5c73m3 *state) state->supplies[i].supply, r); } =20 - clk_prepare_enable(state->clock); + s5c73m3_enable_clk(state); + return ret; } =20 --=20 2.46.0.76.ge559c4bf1a-goog From nobody Sun Feb 8 15:53:56 2026 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (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 68BD6199EAD for ; Tue, 13 Aug 2024 12:13:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551237; cv=none; b=Ne/GxsBr6keJM6C9S886lEDHbSFyI5HeysZ6t34EFMdjRdMvms2oKkYhGRreW1Lt2UOrT18mEVvKnVfVtMEa2VtcCsDGN4WOeg6c5ouO9LSDYAOfMsDxpZZukN0RX9lWDASwM4AUFhMWXoQBpVX53iZi7ZMEH+8huiN66jkT8JU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551237; c=relaxed/simple; bh=Q2wAxRulEUNylV84MEI5qrVLjgN6aDtCQyka6+hlcM4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UbH5l/ogUpVYUnDM8oWxYh2SicLLJ9fLb1jVHPDmB9ceCJsxIKKXkPGV8anl9eWJTVkS+97nXb5TNWqzFgWUL64QCEEGwueOqise61PnAEWoHZ6uR6ZMvDyRpas+mVt8DAapWjQdKslamc2lTKKWJvplpGFwniuJ4RlRSd9Mg9o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=kXYjvtXC; arc=none smtp.client-ip=209.85.222.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="kXYjvtXC" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-7a4df9dc885so86958885a.0 for ; Tue, 13 Aug 2024 05:13:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1723551234; x=1724156034; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=9Etl9GyPmdRz22pfGaoR8C42DApQqo8svGDO8wQI1tI=; b=kXYjvtXC9AQDwE8RQupA4pmEQYRg5Y9TfZt0n0+E6NqgA0wUBgGXZi6KRM7idRWdap f4JutDpECFSfSE0WYFUKzqGQqC+lbc4x+iRL1Gv2JV2LpAcqDFXpThyw6h2m4OQBlPVZ Dy0NGcDr9NzsUB5AQ/HfroBSiAU1cdjLlZMcM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723551234; x=1724156034; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9Etl9GyPmdRz22pfGaoR8C42DApQqo8svGDO8wQI1tI=; b=TFT+i3jk/cl4AunkRO5HI2bmsA09LTtBWzCIU3+u0yB1Sgd3PN+7ybHac2azFs3RIk b5tNbDoLVMc1jz7k8dqmsr/Y6hJBQOpnJ0YpOJS26q3YSQNBQf2XFVUR1VviX09OMAjN DxOH45uJ3ygq/6/lTc5DD2I+LFeQ7HYkBajwShSwyeOnEcHq9U3wr9BNp//ppucpN58g qCS1wf0xoY9OQ5aFBhOEstbRLTvygjofMCeX7NPBU+TWV4PF6WOeVmISHoPxPH2AyfoC Jk9FrtxKcNZe+c9ungMFb7VT9R9iIyq1Yvi1GQ+u/ndpDg4lwQdr504tIT/2x6I+MFrk 16cA== X-Forwarded-Encrypted: i=1; AJvYcCXy8/2JRK0ftwaQCrLAP4rs7p3bf3H9QiutTH50+0v+APelPNprLK5qF+0jxTtdHIvVHr2eaZaknizSxG8tzGhAe12rCw6dRxY9h9Zj X-Gm-Message-State: AOJu0YwlQPjrA3DXbtYSVtOhIFWY9IbWoPlmaVpeLSh/dH3Q0YsDzEPp TECeZ+Ut7ZUKcg2frZFVm7meTUPlUMQiq9F9Mg2yddJs4pYK1xa6e2t7l/Q6KANu83UfEeYnPao = X-Google-Smtp-Source: AGHT+IE5trF99pt6yxLy0hVGziVuLU740Yhk23ir8obTxxE56RFdMfq2z26jixLlIL2miIGD5ezz0A== X-Received: by 2002:a05:620a:d82:b0:7a1:da71:e73a with SMTP id af79cd13be357-7a4e37605b0mr498168385a.2.1723551234290; Tue, 13 Aug 2024 05:13:54 -0700 (PDT) Received: from denia.c.googlers.com (123.178.145.34.bc.googleusercontent.com. [34.145.178.123]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4c7d71ca8sm331765485a.50.2024.08.13.05.13.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 05:13:53 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 13 Aug 2024 12:13:51 +0000 Subject: [PATCH 4/6] media: tc358746: Move clk_prepare to its own function Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240813-smatch-clock-v1-4-664c84295b1c@chromium.org> References: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> In-Reply-To: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> To: Sakari Ailus , =?utf-8?q?Krzysztof_Ha=C5=82asa?= , Mauro Carvalho Chehab , Sylwester Nawrocki , Andrzej Hajda , Neil Armstrong , Greg Kroah-Hartman , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Ricardo Ribalda X-Mailer: b4 0.13.0 Smatch is very confused by a clk_prepare_enable() being called in an error-path. Fix this warning by moving the clk_prepare_enable() to its own function. drivers/media/i2c/tc358746.c:1631 tc358746_suspend() warn: 'tc358746->refcl= k' from clk_prepare_enable() not released on lines: 1631. Signed-off-by: Ricardo Ribalda --- drivers/media/i2c/tc358746.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/tc358746.c b/drivers/media/i2c/tc358746.c index edf79107adc5..389582420ba7 100644 --- a/drivers/media/i2c/tc358746.c +++ b/drivers/media/i2c/tc358746.c @@ -1616,6 +1616,16 @@ static void tc358746_remove(struct i2c_client *clien= t) pm_runtime_dont_use_autosuspend(sd->dev); } =20 +/* + * This function has been created just to avoid a smatch warning, + * please do not merge it into tc358746_suspend until you have + * confirmed that it does not introduce a new warning. + */ +static void tc358746_clk_enable(struct tc358746 *tc358746) +{ + clk_prepare_enable(tc358746->refclk); +} + static int tc358746_suspend(struct device *dev) { struct tc358746 *tc358746 =3D dev_get_drvdata(dev); @@ -1626,7 +1636,7 @@ static int tc358746_suspend(struct device *dev) err =3D regulator_bulk_disable(ARRAY_SIZE(tc358746_supplies), tc358746->supplies); if (err) - clk_prepare_enable(tc358746->refclk); + tc358746_clk_enable(tc358746); =20 return err; } --=20 2.46.0.76.ge559c4bf1a-goog From nobody Sun Feb 8 15:53:56 2026 Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (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 30A0919AD87 for ; Tue, 13 Aug 2024 12:13:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551239; cv=none; b=qsspBu79k3nspRFAICkx4dYOaJZk7PfY86QBx/GAgmt6JsVmzytvmYB92QD9Zd+rOVo8wqirQmmTZOzhe5PulFDDudU+C1VEmWYJCxKzmdun7EbYGUC4lo44fgLiqMCFVPNblQ5O8HTNDQ473wQsGSQbmYblZsYzEVHl3rZZ6rk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551239; c=relaxed/simple; bh=98X2t2WGiLxxCwmlaq0/ko8VmZHn8l1cDrLmrBX7bbI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UWyLnDZ7DAIiMM0gwt602FrfMHp12oKXfo62qK6+DxZkvIw4jjRiyowhXFUi/i6Sm4xwm4NsEUJEUIu8d3dYSaSqoYn/kL27EXtLPdcoQifFJDT4AKgn/rdobFO3BzQEOBYxwoXHs2Zwd+scDupZt5xZY49+4416jNAtfrU8o8E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=kaQqtdws; arc=none smtp.client-ip=209.85.222.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="kaQqtdws" Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-7a1dd2004e1so337973885a.3 for ; Tue, 13 Aug 2024 05:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1723551235; x=1724156035; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ryvSTyFRHLyFB4VqqsDZg/Laqqf7RuuAiNN+vKB3Dic=; b=kaQqtdws1n+9WYWkcqyYKwk96e+SvEU8nQkTp/2R5cZS+HQ/Vs6ezvlTmFuPLKiYVT hImULzf7ogwbUUvdGVDmev8VruMSo/L+bmQq6AHCc99i3L+54QFg39cBiOiuSkGgtEcT h0g846mjMKq9XPun+I/QbC73br7kVmFxMJdow= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723551235; x=1724156035; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ryvSTyFRHLyFB4VqqsDZg/Laqqf7RuuAiNN+vKB3Dic=; b=CRGL3TvYMG+vZsRWik4brax5u4ouFJUszml8iERW2iPQ9PT9u0vsHCZWXpf2op9O4v 6a6jaSFbHK36H5L0pyuGPLJdt5eHCToHIlcenHwNOfAYt/qbjbNyQ6pmUdNFvfcqKvo8 CshxLoscDv6nPaW3SDFe8tlDMsrEXXtzblSOaO95TCKxE3FhgLqNKRYcVaAZhG3kufR4 hBmDK9ti6jJemYTh5SyRPZpAH0pfBCuW3YV2izOAMjeudtHK2EsjSjmvS8dyKpEBWfxQ KaoYixXAMuCFwnm8he4T1ZDp08BRnmURvMx+l3vvg/vE3By0J4tUVU1ryLtgjFfSATqC C+kQ== X-Forwarded-Encrypted: i=1; AJvYcCX49+x4cMSFvLu8RCN0WFrjxuDtUY++XuyYO3flTB3fGjaz3njY1Ve9QsTPJz+0doKI7i3nXa8BHzNnwD3X3XxL5jLPFWQU/Jq/DO27 X-Gm-Message-State: AOJu0YxFMe+2phGvpCkr+jfutOYsv26NX6+ZzgR95/UqU/N3RoLDmoDO /fRzNjXRQ6rUx8TPAk8RD1VlQ4X6n/MzcczJ9LE5FhCW+I3f3MW6nmwgImCGmsGrnw5ELnftoJw = X-Google-Smtp-Source: AGHT+IEOX25WNCrWUaMxc3lkZuEvbZq3/dMLr0NrYO2cFstfRrmQqZhk/+W2xbcY25YibUai9xTEGw== X-Received: by 2002:a05:620a:31a9:b0:7a1:6062:ed63 with SMTP id af79cd13be357-7a4e15a434dmr379872785a.29.1723551235139; Tue, 13 Aug 2024 05:13:55 -0700 (PDT) Received: from denia.c.googlers.com (123.178.145.34.bc.googleusercontent.com. [34.145.178.123]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4c7d71ca8sm331765485a.50.2024.08.13.05.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 05:13:54 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 13 Aug 2024 12:13:52 +0000 Subject: [PATCH 5/6] media: meson: vdec_1: Refactor vdec_1_stop() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240813-smatch-clock-v1-5-664c84295b1c@chromium.org> References: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> In-Reply-To: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> To: Sakari Ailus , =?utf-8?q?Krzysztof_Ha=C5=82asa?= , Mauro Carvalho Chehab , Sylwester Nawrocki , Andrzej Hajda , Neil Armstrong , Greg Kroah-Hartman , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Ricardo Ribalda X-Mailer: b4 0.13.0 Factor out all the power off logic, except the clk_disable_unprepare(), to a new function __vdec_1_stop(). This allows vdec_1_start() to explicitly clean-out the clock during the error-path. The following smatch warning is fixed: drivers/staging/media/meson/vdec/vdec_1.c:239 vdec_1_start() warn: 'core->v= dec_1_clk' from clk_prepare_enable() not released on lines: 239. Signed-off-by: Ricardo Ribalda --- drivers/staging/media/meson/vdec/vdec_1.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/meson/vdec/vdec_1.c b/drivers/staging/me= dia/meson/vdec/vdec_1.c index 3fe2de0c9331..a65cb4959446 100644 --- a/drivers/staging/media/meson/vdec/vdec_1.c +++ b/drivers/staging/media/meson/vdec/vdec_1.c @@ -129,7 +129,7 @@ static u32 vdec_1_vififo_level(struct amvdec_session *s= ess) return amvdec_read_dos(core, VLD_MEM_VIFIFO_LEVEL); } =20 -static int vdec_1_stop(struct amvdec_session *sess) +static void __vdec_1_stop(struct amvdec_session *sess) { struct amvdec_core *core =3D sess->core; struct amvdec_codec_ops *codec_ops =3D sess->fmt_out->codec_ops; @@ -158,10 +158,17 @@ static int vdec_1_stop(struct amvdec_session *sess) regmap_update_bits(core->regmap_ao, AO_RTI_GEN_PWR_SLEEP0, GEN_PWR_VDEC_1, GEN_PWR_VDEC_1); =20 - clk_disable_unprepare(core->vdec_1_clk); - if (sess->priv) codec_ops->stop(sess); +} + +static int vdec_1_stop(struct amvdec_session *sess) +{ + struct amvdec_core *core =3D sess->core; + + __vdec_1_stop(sess); + + clk_disable_unprepare(core->vdec_1_clk); =20 return 0; } @@ -235,7 +242,8 @@ static int vdec_1_start(struct amvdec_session *sess) return 0; =20 stop: - vdec_1_stop(sess); + __vdec_1_stop(sess); + clk_disable_unprepare(core->vdec_1_clk); return ret; } =20 --=20 2.46.0.76.ge559c4bf1a-goog From nobody Sun Feb 8 15:53:56 2026 Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) (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 4509D19B3DA for ; Tue, 13 Aug 2024 12:13:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551239; cv=none; b=h6I11Zo7GHWlGtNO8mbHTvqFkamvjnjO50/jUvS7AIOHygnyCl3VB59V7LwXSz5/Q+p+tNsfniTM8VMshimFLXEXo6SQ6AyAQI0crDmDu0vkqykBN+GSQrsR76EegusmjV+QzgcA+SBbyEqIm+urxV65+6I1zClVlJXsYlN8R7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723551239; c=relaxed/simple; bh=jH7TrqthPbyuatpm9k3mnNi3VlOKWR/v7KyFH3wuPGA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Mqttpc5XqjD2YDVLOCmezW1xvx+cAhpnh4mOpATxgOpwV8vunUbF+4RXbnmS1PcDwWRCL3Gx/grQf+G2ZdoM0sQzY/0Vh0VRQwGQG7bfxtDf7XTgb1/8jGmwHuJR4B6DLXF7FH7AmvzOM88dOOV96PV1gbk791wQ4NTfoOYtKEA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=fDvvYQh+; arc=none smtp.client-ip=209.85.210.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="fDvvYQh+" Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-70943713472so2149890a34.2 for ; Tue, 13 Aug 2024 05:13:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1723551236; x=1724156036; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=tbox2ZoitlY78mZ2yFdlFoyXWXf8v8pDSpmA621vz/E=; b=fDvvYQh+g7IkDt64D6KWdNujPXX001pS8SBuLzJjCJZiKkIZx4McB+OVlTdt3DZzeB kRrUq1Mw+cmm1q8s2ywwXAMLNKm3lpu2dnFA6lJ0I2gtxNEsCBhQYkRCrXqZtb6JnSZk 02tCQzypa0MFgeFkhMnI6ZZ35CSS7Jx4zz7vo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723551236; x=1724156036; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tbox2ZoitlY78mZ2yFdlFoyXWXf8v8pDSpmA621vz/E=; b=Uvh1ks10BY4bLQuv6vR8NEQUhY5IVCQ9YCAFrwD1omdYALNCLKw1l2dl/zSQkV/HZW Kb5MHzWcwUlmQ67nosnpvPvFNHQrlYGcgT+lF/ejIIQSALoO+GLoO2cOvHEQRIEw89tU vTtQCMiiul8dDSh0mGyjQXjXvmiFelWUtvWBnGyIeUQwa3v0a5WPX7PDFIoAYJTBR/yO Rc59TmIdnJT1fjOaK5+2STY9xElXmGMZPV6H9biMA82R3QO31xyuAwQv/t1L1zYrpr4H xCkcGZ5EGuzSstJiDGgKKVD5a9ihmwxcGCA+wHdbwizbvSQ3FtCOJ9LVpuV6L+OP+BDl 0Twg== X-Forwarded-Encrypted: i=1; AJvYcCUTTiRYN63o0koyLkMsotUPYuyGqUR3JRSfMDQdd9ueYoHeX6DzQ65IVtHPR/YHTQr52ejZpZG56DqiB6UPGwkbNJjJhQvKjYpmzSuV X-Gm-Message-State: AOJu0Yw6w/0KSFER/48S6V8KchDxUEmBkqJziMfIY8Jj7gCuEwAFx0PL oUU93XwJ0wpPhYYLhNYcNlVKhGMO9ladeHbWL6iZ0LV74mrW72gQL0A2/6/9HA== X-Google-Smtp-Source: AGHT+IGgXIJUCN4cjOUkGFgon+WiB2P8zLnuNtMLuoWTLxNw2YXdYtwoDqVO1oPdH1blkel8OnEpNw== X-Received: by 2002:a05:6358:e4a4:b0:1af:1105:49b7 with SMTP id e5c5f4694b2df-1b19d2f4c8fmr402139355d.30.1723551236049; Tue, 13 Aug 2024 05:13:56 -0700 (PDT) Received: from denia.c.googlers.com (123.178.145.34.bc.googleusercontent.com. [34.145.178.123]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7a4c7d71ca8sm331765485a.50.2024.08.13.05.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 05:13:55 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 13 Aug 2024 12:13:53 +0000 Subject: [PATCH 6/6] media: meson: vdec: hevc: Refactor vdec_hevc_start and vdec_hevc_stop Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240813-smatch-clock-v1-6-664c84295b1c@chromium.org> References: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> In-Reply-To: <20240813-smatch-clock-v1-0-664c84295b1c@chromium.org> To: Sakari Ailus , =?utf-8?q?Krzysztof_Ha=C5=82asa?= , Mauro Carvalho Chehab , Sylwester Nawrocki , Andrzej Hajda , Neil Armstrong , Greg Kroah-Hartman , Kevin Hilman , Jerome Brunet , Martin Blumenstingl Cc: Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Ricardo Ribalda X-Mailer: b4 0.13.0 Make a new function __vdec_hevc_start(), that does all the initialization, except the clock initialization for G12A and SM1. Factor out all the stop logic, except the clk_disable_unprepare(), to a new function __vdec_hevc_stop. This allows vdec_hevc_start() to explicitly celan-out the clock during the error-path. The following smatch warnings are fixed: drivers/staging/media/meson/vdec/vdec_hevc.c:227 vdec_hevc_start() warn: 'c= ore->vdec_hevc_clk' from clk_prepare_enable() not released on lines: 227. drivers/staging/media/meson/vdec/vdec_hevc.c:227 vdec_hevc_start() warn: 'c= ore->vdec_hevcf_clk' from clk_prepare_enable() not released on lines: 227. Signed-off-by: Ricardo Ribalda --- drivers/staging/media/meson/vdec/vdec_hevc.c | 43 +++++++++++++++++++++---= ---- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/drivers/staging/media/meson/vdec/vdec_hevc.c b/drivers/staging= /media/meson/vdec/vdec_hevc.c index afced435c907..1939c47def58 100644 --- a/drivers/staging/media/meson/vdec/vdec_hevc.c +++ b/drivers/staging/media/meson/vdec/vdec_hevc.c @@ -110,7 +110,7 @@ static u32 vdec_hevc_vififo_level(struct amvdec_session= *sess) return readl_relaxed(sess->core->dos_base + HEVC_STREAM_LEVEL); } =20 -static int vdec_hevc_stop(struct amvdec_session *sess) +static void __vdec_hevc_stop(struct amvdec_session *sess) { struct amvdec_core *core =3D sess->core; struct amvdec_codec_ops *codec_ops =3D sess->fmt_out->codec_ops; @@ -142,6 +142,13 @@ static int vdec_hevc_stop(struct amvdec_session *sess) else regmap_update_bits(core->regmap_ao, AO_RTI_GEN_PWR_SLEEP0, GEN_PWR_VDEC_HEVC, GEN_PWR_VDEC_HEVC); +} + +static int vdec_hevc_stop(struct amvdec_session *sess) +{ + struct amvdec_core *core =3D sess->core; + + __vdec_hevc_stop(sess); =20 clk_disable_unprepare(core->vdec_hevc_clk); if (core->platform->revision =3D=3D VDEC_REVISION_G12A || @@ -151,20 +158,12 @@ static int vdec_hevc_stop(struct amvdec_session *sess) return 0; } =20 -static int vdec_hevc_start(struct amvdec_session *sess) +static int __vdec_hevc_start(struct amvdec_session *sess) { int ret; struct amvdec_core *core =3D sess->core; struct amvdec_codec_ops *codec_ops =3D sess->fmt_out->codec_ops; =20 - if (core->platform->revision =3D=3D VDEC_REVISION_G12A || - core->platform->revision =3D=3D VDEC_REVISION_SM1) { - clk_set_rate(core->vdec_hevcf_clk, 666666666); - ret =3D clk_prepare_enable(core->vdec_hevcf_clk); - if (ret) - return ret; - } - clk_set_rate(core->vdec_hevc_clk, 666666666); ret =3D clk_prepare_enable(core->vdec_hevc_clk); if (ret) { @@ -223,10 +222,32 @@ static int vdec_hevc_start(struct amvdec_session *ses= s) return 0; =20 stop: - vdec_hevc_stop(sess); + __vdec_hevc_stop(sess); + clk_disable_unprepare(core->vdec_hevc_clk); return ret; } =20 +static int vdec_hevc_start(struct amvdec_session *sess) +{ + struct amvdec_core *core =3D sess->core; + int ret; + + if (core->platform->revision =3D=3D VDEC_REVISION_G12A || + core->platform->revision =3D=3D VDEC_REVISION_SM1) { + clk_set_rate(core->vdec_hevcf_clk, 666666666); + ret =3D clk_prepare_enable(core->vdec_hevcf_clk); + if (ret) + return ret; + + ret =3D __vdec_hevc_start(sess); + if (ret) + clk_disable_unprepare(core->vdec_hevcf_clk); + return ret; + } + + return __vdec_hevc_start(sess); +} + struct amvdec_ops vdec_hevc_ops =3D { .start =3D vdec_hevc_start, .stop =3D vdec_hevc_stop, --=20 2.46.0.76.ge559c4bf1a-goog