From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 EA00E1D7E41 for ; Sun, 3 May 2026 04:25:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777782312; cv=none; b=Ti75pOQ6mxIwG5JMRGsbmCxhO7zytJMZxvxX6FYZgxjG6MB80A45VsBFX6C8yv2nt90qyg5BDmPANNZU+9uQ0oRic4PSS+bNiUXlZQB6sxL5/IKRE0U8D8TYDiHMcFfjGTm0rivkFH7/3GOlZ4gwjDjNoRRWZdUrUKucZOH+RrM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777782312; c=relaxed/simple; bh=V+EOqq9qYi4AMv7pFUMpujIl0oVH1GDKkDhe2ojm7CM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XqnO3htZO0zNcbiKfcpxhHEwcTqQNEsv6MtXwDUsT/2EyyhggdpGHpi3BOGH7C/UrvVepEKFthCEZtJAVK3VO6yyzmLH7PpVVZycoJKcsSPmyfnYqt4N9lXlwc647x66ei1xU/M76aBAgIEbKM/rb/ghmMRPnTqBO7hsgKdX4NQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Bb5XgPwu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Bb5XgPwu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2C1FC2BCB4; Sun, 3 May 2026 04:25:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777782311; bh=V+EOqq9qYi4AMv7pFUMpujIl0oVH1GDKkDhe2ojm7CM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bb5XgPwu/KS1EkHdsXlMKgvmb+tNdJpCZhEshUAcXsq4lpp1Jjl9GDTR+QzXnrPcD uCVm+vmZo7FeD772I99J0PH514u90flJd+5NdwSCZ9sAkx/ygDQc0iQGqQRCxmkjcm /nuaNKLeP0RxKCRfWVAjy5KEtnPOR/B9a3lvUMREKdIXyK3WR+e+PUxsHW3XLKrHGa D/cAgZ36P59vDae+pWlZyHA3P9xan19PmPFKRxdKsSwwL4eyElMxlkkdRrodkCI+Wl K+xdU9p9mUwvYJtpCTGTZdZ07QvyLV5WCg67XzNtzU+1QnksQeu1HGn57yZMM4EWU3 N6zjjj8RJUisw== From: Sasha Levin To: stable@vger.kernel.org Cc: Antoniu Miclaus , Andy Shevchenko , Jonathan Cameron , Sasha Levin Subject: [PATCH 6.18.y 1/2] iio: frequency: admv1013: add dev variable Date: Sun, 3 May 2026 00:24:54 -0400 Message-ID: <20260503042456.979738-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050123-unsteady-compost-e4bf@gregkh> References: <2026050123-unsteady-compost-e4bf@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Antoniu Miclaus [ Upstream commit e61b5bb0e91390adee41eaddc0a1a7d55d5652b2 ] Introduce a local struct device pointer in functions that reference &spi->dev for device-managed resource calls and device property reads, improving code readability. Signed-off-by: Antoniu Miclaus Reviewed-by: Andy Shevchenko Signed-off-by: Jonathan Cameron Stable-dep-of: aac0a51b1670 ("iio: frequency: admv1013: fix NULL pointer dereference on str") Signed-off-by: Sasha Levin --- drivers/iio/frequency/admv1013.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/iio/frequency/admv1013.c b/drivers/iio/frequency/admv1013.c index d8e8d541990f8..d29e288da011a 100644 --- a/drivers/iio/frequency/admv1013.c +++ b/drivers/iio/frequency/admv1013.c @@ -518,11 +518,11 @@ static int admv1013_properties_parse(struct admv1013_state *st) { int ret; const char *str; - struct spi_device *spi = st->spi; + struct device *dev = &st->spi->dev; - st->det_en = device_property_read_bool(&spi->dev, "adi,detector-enable"); + st->det_en = device_property_read_bool(dev, "adi,detector-enable"); - ret = device_property_read_string(&spi->dev, "adi,input-mode", &str); + ret = device_property_read_string(dev, "adi,input-mode", &str); if (ret) st->input_mode = ADMV1013_IQ_MODE; @@ -533,7 +533,7 @@ static int admv1013_properties_parse(struct admv1013_state *st) else return -EINVAL; - ret = device_property_read_string(&spi->dev, "adi,quad-se-mode", &str); + ret = device_property_read_string(dev, "adi,quad-se-mode", &str); if (ret) st->quad_se_mode = ADMV1013_SE_MODE_DIFF; @@ -546,11 +546,11 @@ static int admv1013_properties_parse(struct admv1013_state *st) else return -EINVAL; - ret = devm_regulator_bulk_get_enable(&st->spi->dev, + ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(admv1013_vcc_regs), admv1013_vcc_regs); if (ret) { - dev_err_probe(&spi->dev, ret, + dev_err_probe(dev, ret, "Failed to request VCC regulators\n"); return ret; } @@ -562,9 +562,10 @@ static int admv1013_probe(struct spi_device *spi) { struct iio_dev *indio_dev; struct admv1013_state *st; + struct device *dev = &spi->dev; int ret, vcm_uv; - indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); + indio_dev = devm_iio_device_alloc(dev, sizeof(*st)); if (!indio_dev) return -ENOMEM; @@ -581,20 +582,20 @@ static int admv1013_probe(struct spi_device *spi) if (ret) return ret; - ret = devm_regulator_get_enable_read_voltage(&spi->dev, "vcm"); + ret = devm_regulator_get_enable_read_voltage(dev, "vcm"); if (ret < 0) - return dev_err_probe(&spi->dev, ret, + return dev_err_probe(dev, ret, "failed to get the common-mode voltage\n"); vcm_uv = ret; - st->clkin = devm_clk_get_enabled(&spi->dev, "lo_in"); + st->clkin = devm_clk_get_enabled(dev, "lo_in"); if (IS_ERR(st->clkin)) - return dev_err_probe(&spi->dev, PTR_ERR(st->clkin), + return dev_err_probe(dev, PTR_ERR(st->clkin), "failed to get the LO input clock\n"); st->nb.notifier_call = admv1013_freq_change; - ret = devm_clk_notifier_register(&spi->dev, st->clkin, &st->nb); + ret = devm_clk_notifier_register(dev, st->clkin, &st->nb); if (ret) return ret; @@ -606,11 +607,11 @@ static int admv1013_probe(struct spi_device *spi) return ret; } - ret = devm_add_action_or_reset(&spi->dev, admv1013_powerdown, st); + ret = devm_add_action_or_reset(dev, admv1013_powerdown, st); if (ret) return ret; - return devm_iio_device_register(&spi->dev, indio_dev); + return devm_iio_device_register(dev, indio_dev); } static const struct spi_device_id admv1013_id[] = { -- 2.53.0