From bbacd445a4519848da79fe820dce263719697f95 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 13 Mar 2023 17:18:14 +0100 Subject: [PATCH] 4.19-stable patches added patches: revert-spi-mt7621-fix-an-error-message-in-mt7621_spi_probe.patch --- ...an-error-message-in-mt7621_spi_probe.patch | 48 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 49 insertions(+) create mode 100644 queue-4.19/revert-spi-mt7621-fix-an-error-message-in-mt7621_spi_probe.patch diff --git a/queue-4.19/revert-spi-mt7621-fix-an-error-message-in-mt7621_spi_probe.patch b/queue-4.19/revert-spi-mt7621-fix-an-error-message-in-mt7621_spi_probe.patch new file mode 100644 index 00000000000..6f20a8bda8b --- /dev/null +++ b/queue-4.19/revert-spi-mt7621-fix-an-error-message-in-mt7621_spi_probe.patch @@ -0,0 +1,48 @@ +From nobuhiro1.iwamatsu@toshiba.co.jp Mon Mar 13 16:52:56 2023 +From: Nobuhiro Iwamatsu +Date: Thu, 2 Mar 2023 06:23:50 +0900 +Subject: Revert "spi: mt7621: Fix an error message in mt7621_spi_probe()" +To: stable@vger.kernel.org +Cc: gregkh@linuxfoundation.org, sashal@kernel.org, Nobuhiro Iwamatsu +Message-ID: <20230301212350.4182867-1-nobuhiro1.iwamatsu@toshiba.co.jp> + +From: Nobuhiro Iwamatsu + +This reverts commit 269f650a0b26067092873308117e0bf0c6ec8289 which is +commit 2b2bf6b7faa9010fae10dc7de76627a3fdb525b3 upstream. + +dev_err_probe() does not suppot in 4.19.y. So this driver will fail to +build. + +``` + CC drivers/staging/mt7621-spi/spi-mt7621.o +drivers/staging/mt7621-spi/spi-mt7621.c: In function 'mt7621_spi_probe': +drivers/staging/mt7621-spi/spi-mt7621.c:446:24: error: implicit declaration of function 'dev_err_probe'; did you mean 'device_reprobe'? [-Werror=implicit-function-declaration] + 446 | return dev_err_probe(&pdev->dev, PTR_ERR(clk), + | ^~~~~~~~~~~~~ + | device_reprobe +``` + +Signed-off-by: Nobuhiro Iwamatsu (CIP) +Signed-off-by: Greg Kroah-Hartman +--- + drivers/staging/mt7621-spi/spi-mt7621.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +--- a/drivers/staging/mt7621-spi/spi-mt7621.c ++++ b/drivers/staging/mt7621-spi/spi-mt7621.c +@@ -442,9 +442,11 @@ static int mt7621_spi_probe(struct platf + return PTR_ERR(base); + + clk = devm_clk_get(&pdev->dev, NULL); +- if (IS_ERR(clk)) +- return dev_err_probe(&pdev->dev, PTR_ERR(clk), +- "unable to get SYS clock\n"); ++ if (IS_ERR(clk)) { ++ dev_err(&pdev->dev, "unable to get SYS clock, err=%d\n", ++ status); ++ return PTR_ERR(clk); ++ } + + status = clk_prepare_enable(clk); + if (status) diff --git a/queue-4.19/series b/queue-4.19/series index dec2fc6ae11..5a164ab6196 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -27,3 +27,4 @@ arm-dts-exynos-add-gpu-thermal-zone-cooling-maps-for.patch arm-dts-exynos-correct-tmu-phandle-in-odroid-hc1.patch arm-dts-exynos-correct-tmu-phandle-in-odroid-xu3-fam.patch scsi-core-remove-the-proc-scsi-proc_name-directory-e.patch +revert-spi-mt7621-fix-an-error-message-in-mt7621_spi_probe.patch -- 2.47.3