UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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().
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAmQlg/URHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXNb3Q/9EJXtA2f1sF8+pCLPb6a6IXLE0z8rEAT8
 Wvy0PzFzJuj7cxa7q+IpxmOEWNw6NKF5zwwTrrPwskXtJSaI+0jlr/qvA3bz0CRf
 sdtFMGFHBp+/s9vZoC6oZoUtOSRVfE+gXxYe+kjMUKvoRZgTdH3gtA1jOKZFeid5
 z/WHODcZolKN40k4NSS5Qb1zHvK6bRFSZ6Z6WGdBVt2vfICQSSYtshm0kmVXUHrO
 VegqRgX21+i+MoEKogQ3/1PYex9e3l3pWu9FroUEnrPmEPUrsnKiX4m4u3ShBGzw
 1oTR0vckaqmQe4mXFAENsE9euriPtmo4U2NGDPnTWlPpreweQHWREde60w3fRftM
 HonNq7SZBHH2NGYZvp1jiZUSm+lasO+vaslctDufSqDkrORrE2t3ZNwCpUpgLdwV
 0IUcTDKElXqXI1W45F+qLnJ1e/JmZmCZYCheKghRdCIPFa27+BpQ8PbyhKaLuAGW
 6UAniws6LZ5ey4zUry87bxUFbf4buwzaBgUBvHnBjEZflxGXajgB5/yeEbUTAiO5
 8vlTC8B9/kXGuioztyw17sjjR5v+WOzLu5/V/Hpkl2nsaVsN6b5AHmSjQ4WADvvm
 RgiihRHQF8Mt+KNxzq753eMqsbpJspfXurVn41rAk+ZeJZFTNMlBALv0N39hPt/3
 NZkFV7Pmh0I=
 =hktt
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmQsNMMACgkQmmx57+YA
 GNnD+Q/5AVBP7NN7DGXZzul52S2tSv2dFgM5k886EGg0kc804Ou2dxc10RqbswCh
 ICCBbEW2jz5H5GeBYzVxFleRGCw+8hlpH0WFkTw79ht0OamPYeKiFDJnL0SO8/Xz
 +uOjed6T+EXVelMjkb0gCbOyP7sFyoWE+NpzaRlMWkxNnwsEW+SL0rCXRhS1qrAm
 jm7APyp1jcDnWTS3b76wFmDdRCsz0oP8zBvo0u3YNW2/TgTqq2R18+wkAhxsDJez
 aI3Vpdh/LS291o//0oNAcVa3osh7HCkFYnBqgi/WwJxFUMROvFbdpmYrVigUvc8P
 dcRuMP/RL1/TO4iJ7uzAIzg7uRRbAi8LORWz5jRzJGle2FTPNVlrzMYO+zQtk+y9
 gdZA4bAwh6rhk1xLz2pGKM3AVbrOjFpg8SCbAEdDZW2wwX/YJiYkhb9dq188Nuc+
 LENBPnCUmN2WIdgmk0p54i1N8pyHpr/kBpmYfF0OPP5nui+SoHSd0j+nLyflVWnH
 3exWjsfNgpXj94L97fdrqoUwWaazY0j4iE7PIsicPkT1P0ek0QLQTMIP0Ytz5fgu
 mzqQyzwkVdEcb4cjuta4oY28pAQnvVJuz5p7/Q7mc7qKPevGwgvZBSy54S8gSsE1
 4zULT2DQ3FAk3Hv0OuFiTULlRBtRgCq8fRxam5p6AKW+asr1AlY=
 =OTXH
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-04-04 16:31:30 +02:00
parent fb481b2e5a c29313d58c
commit c00574bb43
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap1/Kconfig
View File

@ -118,7 +118,7 @@ config MACH_OMAP_OSK
depends on ARCH_OMAP16XX
help
TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
if you have such a board.
if you have such a board.
config MACH_OMAP_PALMTE
bool "Palm Tungsten E"

6
arch/arm/mach-omap1/board-ams-delta.c
View File

@ -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);