From: Uwe Kleine-König Date: Sun, 17 Dec 2023 19:31:32 +0000 (+0100) Subject: memory: emif: Simplify code handling CONFIG_OF X-Git-Tag: v6.9-rc1~177^2~11^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d10e03cf9a4d78c67ef779dab5a5f4fb94fb835e;p=thirdparty%2Fkernel%2Flinux.git memory: emif: Simplify code handling CONFIG_OF The first thing that of_get_memory_device_details() does is calling of_parse_phandle(). With CONFIG_OF=n this returns NULL in a static inline function. So the compiler can determine that of_get_memory_device_details() also returns NULL. bloat-o-meter confirms that this patch has no effects on the size of the generated code for CONFIG_OF=n builds. Signed-off-by: Uwe Kleine-König Link: https://lore.kernel.org/r/9d53683c34a730c8579a1468b643b11d1379106e.1702829744.git.u.kleine-koenig@pengutronix.de Signed-off-by: Krzysztof Kozlowski --- diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c index f5e654abe04c4..c5a24501db9b4 100644 --- a/drivers/memory/emif.c +++ b/drivers/memory/emif.c @@ -826,7 +826,6 @@ static int is_custom_config_valid(struct emif_custom_configs *cust_cfgs, return valid; } -#if defined(CONFIG_OF) static void __init_or_module of_get_custom_configs(struct device_node *np_emif, struct emif_data *emif) { @@ -983,15 +982,6 @@ out: return emif; } -#else - -static struct emif_data * __init_or_module of_get_memory_device_details( - struct device_node *np_emif, struct device *dev) -{ - return NULL; -} -#endif - static struct emif_data *__init_or_module get_device_details( struct platform_device *pdev) {