Unverified Commit c00574bb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v6.4/omap1-signed' of... 

Merge tag 'omap-for-v6.4/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into soc/arm

Clean-up for omap1 for v6.4 merge window

Two clean-up patches to fix Kconfig indentation and to simplify the
return path for ams_delta_modem_init().

* tag 'omap-for-v6.4/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap1: remove redundant variables err
  ARM: omap1: Kconfig: Fix indentation

Link: https://lore.kernel.org/r/pull-1680180485-415954@atomide.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fb481b2e c29313d5

arch/arm/mach-omap1/board-ams-delta.c

+1 −5
Original line number Diff line number Diff line
@@ -822,8 +822,6 @@ static int __init modem_nreset_init(void) 
 */

static int __init ams_delta_modem_init(void)

{

	int err;



	if (!machine_is_ams_delta())

		return -ENODEV;
@@ -832,9 +830,7 @@ static int __init ams_delta_modem_init(void) 
	/* Initialize the modem_nreset regulator consumer before use */

	modem_priv.regulator = ERR_PTR(-ENODEV);



	err = platform_device_register(&ams_delta_modem_device);



	return err;

	return platform_device_register(&ams_delta_modem_device);

}

arch_initcall_sync(ams_delta_modem_init);

arch/arm/mach-omap1/Kconfig

+1 −1

File changed.

Contains only whitespace changes.