linux-kernel - Re: [PATCH 31/34] spi: remove incorrect of_match

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date: Wed, 3 Apr 2024 23:05:51 +0200
From: Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
To: Mark Brown <broonie@...nel.org>
Cc: Arnd Bergmann <arnd@...nel.org>, linux-kernel@...r.kernel.org, 
	Neil Armstrong <neil.armstrong@...aro.org>, Kevin Hilman <khilman@...libre.com>, 
	Heiko Stuebner <heiko@...ech.de>, Andi Shyti <andi.shyti@...nel.org>, 
	Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>, Arnd Bergmann <arnd@...db.de>, 
	Jerome Brunet <jbrunet@...libre.com>, Martin Blumenstingl <martin.blumenstingl@...glemail.com>, 
	Alim Akhtar <alim.akhtar@...sung.com>, Li Zetao <lizetao1@...wei.com>, 
	Jonathan Cameron <Jonathan.Cameron@...wei.com>, Rob Herring <robh@...nel.org>, 
	Yang Yingliang <yangyingliang@...wei.com>, Andy Shevchenko <andriy.shevchenko@...ux.intel.com>, 
	Luis de Arquer <luis.dearquer@...rtim.com>, Tudor Ambarus <tudor.ambarus@...aro.org>, 
	Sam Protsenko <semen.protsenko@...aro.org>, Peter Griffin <peter.griffin@...aro.org>, 
	Jaewon Kim <jaewon02.kim@...sung.com>, linux-spi@...r.kernel.org, linux-arm-kernel@...ts.infradead.org, 
	linux-amlogic@...ts.infradead.org, linux-rockchip@...ts.infradead.org, 
	linux-samsung-soc@...r.kernel.org
Subject: Re: [PATCH 31/34] spi: remove incorrect of_match_ptr annotations

On Wed, Apr 03, 2024 at 10:56:58AM +0100, Mark Brown wrote:
> On Wed, Apr 03, 2024 at 10:06:49AM +0200, Arnd Bergmann wrote:
> 
> > These appear to all be copied from the same original driver, so fix them at the
> > same time by removing the unnecessary of_match_ptr() annotation. As far as I
> > can tell, all these drivers are only actually used on configurations that
> > have CONFIG_OF enabled.
> 
> Why are we not fixing of_match_ptr() here, or at least adding the ifdefs
> in case someone does end up wanting to run without OF?

Fixing of_match_ptr =

diff --git a/include/linux/of.h b/include/linux/of.h
index a0bedd038a05..d980bccffda0 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -890,7 +890,7 @@ static inline const void *of_device_get_match_data(const struct device *dev)
 	return NULL;
 }
 
-#define of_match_ptr(_ptr)	NULL
+#define of_match_ptr(_ptr)	(0 ? (_ptr) : NULL)
 #define of_match_node(_matches, _node)	NULL
 #endif /* CONFIG_OF */
 
?

Assuming this helps, I agree this would be the better fix.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)