mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-17 01:04:19 +08:00
Few coccinelle robot clean-up patches for careless human coding
issues for v4.15 merge window sent by their human operatorrrrrs. -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAln3VUIRHHRvbnlAYXRv bWlkZS5jb20ACgkQG9Q+yVyrpXOBcxAA07MX90Ao/48PLf3nLTYNWm6AurLNgbol wEcb4xxFW/kn1OlF3YrQmo+3kYmFpt9iEMMY46VT6kuYYvLLTDPlIxt3xcdDlQtJ sHX+51EudFH4f9qLZp3zhPtTN/JjvF866Wnp66+l5lI1c50jD9TtI6RYbsdvprvl 8kVB4eFQzMJvoKUjmOkpheACaH91HPOiWNgS0R2PRFNN63Oyy8UwE1Mtl3Ry9Ayx eSc6V0JZzIgogG3Np9VnKiK78toYWsaphO50HLLOsGezOEmG7IUgxWxvFCge83ew BKT3fk5yY8D1kLrGYirkJj0VkLTSO8+P/cgxLXw8VJu5P6uwXBKbjwBJEejmxFRZ hnCy1VJM6df88Bx/PalhSd5LWreQH5xlt67FmKwGXlRRVqTay2wKN+AZid/tMjqC A97BUIHjnXIAk31R1pNXjBWInN9oaEA10ueihIDFWFJw23dP/MFb0Gs1Yi5ZwPPW Dv/7AGhSicCS20LgsF37Ye7wFihNI8K6mQYFqUgJjsVQ9+k/G3wNtRh1My3aHiK5 F63Pq0ySfPx6p6Ka9+9SjgXqflE1NJ10OPasQ973TC12UG1uwMiI228Wh55Wij6E AeyXYbfLJ1T5jrmOTb1+WEL8KRM5nYG3pNL19vRvB3IoRUGHz8rdFV8/6a5fzMvO xkep0b0++30= =vA9m -----END PGP SIGNATURE----- Merge tag 'omap-for-v4.15/coccinelle-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc Pull "omap coccinelle warning fixes for v4.15 merge window" from Tony Lindgren: Few coccinelle robot clean-up patches for careless human coding issues for v4.15 merge window sent by their human operatorrrrrs. * tag 'omap-for-v4.15/coccinelle-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP3: Delete an unnecessary variable initialisation in omap3xxx_hwmod_init() ARM: OMAP3: Use common error handling code in omap3xxx_hwmod_init() ARM: omap1: add const and initconst to omap_lcd_config
This commit is contained in:
commit
da18392fd0
@ -156,7 +156,7 @@ static struct map_desc ams_delta_io_desc[] __initdata = {
|
||||
}
|
||||
};
|
||||
|
||||
static struct omap_lcd_config ams_delta_lcd_config __initdata = {
|
||||
static const struct omap_lcd_config ams_delta_lcd_config __initconst = {
|
||||
.ctrl_name = "internal",
|
||||
};
|
||||
|
||||
|
@ -266,7 +266,7 @@ static struct platform_device *devices[] __initdata = {
|
||||
&kp_device,
|
||||
};
|
||||
|
||||
static struct omap_lcd_config fsample_lcd_config = {
|
||||
static const struct omap_lcd_config fsample_lcd_config = {
|
||||
.ctrl_name = "internal",
|
||||
};
|
||||
|
||||
|
@ -357,7 +357,7 @@ static struct omap_usb_config h2_usb_config __initdata = {
|
||||
.pins[1] = 3,
|
||||
};
|
||||
|
||||
static struct omap_lcd_config h2_lcd_config __initdata = {
|
||||
static const struct omap_lcd_config h2_lcd_config __initconst = {
|
||||
.ctrl_name = "internal",
|
||||
};
|
||||
|
||||
|
@ -376,7 +376,7 @@ static struct omap_usb_config h3_usb_config __initdata = {
|
||||
.pins[1] = 3,
|
||||
};
|
||||
|
||||
static struct omap_lcd_config h3_lcd_config __initdata = {
|
||||
static const struct omap_lcd_config h3_lcd_config __initconst = {
|
||||
.ctrl_name = "internal",
|
||||
};
|
||||
|
||||
|
@ -391,7 +391,7 @@ static struct omap_usb_config htcherald_usb_config __initdata = {
|
||||
};
|
||||
|
||||
/* LCD Device resources */
|
||||
static struct omap_lcd_config htcherald_lcd_config __initdata = {
|
||||
static const struct omap_lcd_config htcherald_lcd_config __initconst = {
|
||||
.ctrl_name = "internal",
|
||||
};
|
||||
|
||||
|
@ -302,7 +302,7 @@ static struct omap_usb_config innovator1510_usb_config __initdata = {
|
||||
.pins[0] = 2,
|
||||
};
|
||||
|
||||
static struct omap_lcd_config innovator1510_lcd_config __initdata = {
|
||||
static const struct omap_lcd_config innovator1510_lcd_config __initconst = {
|
||||
.ctrl_name = "internal",
|
||||
};
|
||||
#endif
|
||||
@ -323,7 +323,7 @@ static struct omap_usb_config h2_usb_config __initdata = {
|
||||
.pins[1] = 3,
|
||||
};
|
||||
|
||||
static struct omap_lcd_config innovator1610_lcd_config __initdata = {
|
||||
static const struct omap_lcd_config innovator1610_lcd_config __initconst = {
|
||||
.ctrl_name = "internal",
|
||||
};
|
||||
#endif
|
||||
|
@ -103,7 +103,7 @@ static struct mipid_platform_data nokia770_mipid_platform_data = {
|
||||
.shutdown = mipid_shutdown,
|
||||
};
|
||||
|
||||
static struct omap_lcd_config nokia770_lcd_config __initdata = {
|
||||
static const struct omap_lcd_config nokia770_lcd_config __initconst = {
|
||||
.ctrl_name = "hwa742",
|
||||
};
|
||||
|
||||
|
@ -295,7 +295,7 @@ static struct omap_usb_config osk_usb_config __initdata = {
|
||||
};
|
||||
|
||||
#ifdef CONFIG_OMAP_OSK_MISTRAL
|
||||
static struct omap_lcd_config osk_lcd_config __initdata = {
|
||||
static const struct omap_lcd_config osk_lcd_config __initconst = {
|
||||
.ctrl_name = "internal",
|
||||
};
|
||||
#endif
|
||||
|
@ -178,7 +178,7 @@ static struct omap_usb_config palmte_usb_config __initdata = {
|
||||
.pins[0] = 2,
|
||||
};
|
||||
|
||||
static struct omap_lcd_config palmte_lcd_config __initdata = {
|
||||
static const struct omap_lcd_config palmte_lcd_config __initconst = {
|
||||
.ctrl_name = "internal",
|
||||
};
|
||||
|
||||
|
@ -241,7 +241,7 @@ static struct omap_usb_config palmtt_usb_config __initdata = {
|
||||
.pins[0] = 2,
|
||||
};
|
||||
|
||||
static struct omap_lcd_config palmtt_lcd_config __initdata = {
|
||||
static const struct omap_lcd_config palmtt_lcd_config __initconst = {
|
||||
.ctrl_name = "internal",
|
||||
};
|
||||
|
||||
|
@ -206,7 +206,7 @@ static struct omap_usb_config palmz71_usb_config __initdata = {
|
||||
.pins[0] = 2,
|
||||
};
|
||||
|
||||
static struct omap_lcd_config palmz71_lcd_config __initdata = {
|
||||
static const struct omap_lcd_config palmz71_lcd_config __initconst = {
|
||||
.ctrl_name = "internal",
|
||||
};
|
||||
|
||||
|
@ -225,7 +225,7 @@ static struct platform_device *devices[] __initdata = {
|
||||
&kp_device,
|
||||
};
|
||||
|
||||
static struct omap_lcd_config perseus2_lcd_config __initdata = {
|
||||
static const struct omap_lcd_config perseus2_lcd_config __initconst = {
|
||||
.ctrl_name = "internal",
|
||||
};
|
||||
|
||||
|
@ -297,7 +297,7 @@ static struct omap_usb_config sx1_usb_config __initdata = {
|
||||
|
||||
/*----------- LCD -------------------------*/
|
||||
|
||||
static struct omap_lcd_config sx1_lcd_config __initdata = {
|
||||
static const struct omap_lcd_config sx1_lcd_config __initconst = {
|
||||
.ctrl_name = "internal",
|
||||
};
|
||||
|
||||
|
@ -3107,7 +3107,7 @@ int __init omap3xxx_hwmod_init(void)
|
||||
int r;
|
||||
struct omap_hwmod_ocp_if **h = NULL, **h_gp = NULL, **h_sham = NULL;
|
||||
struct omap_hwmod_ocp_if **h_aes = NULL;
|
||||
struct device_node *bus = NULL;
|
||||
struct device_node *bus;
|
||||
unsigned int rev;
|
||||
|
||||
omap_hwmod_init();
|
||||
@ -3167,18 +3167,14 @@ int __init omap3xxx_hwmod_init(void)
|
||||
|
||||
if (h_sham && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "sham")) {
|
||||
r = omap_hwmod_register_links(h_sham);
|
||||
if (r < 0) {
|
||||
of_node_put(bus);
|
||||
return r;
|
||||
}
|
||||
if (r < 0)
|
||||
goto put_node;
|
||||
}
|
||||
|
||||
if (h_aes && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "aes")) {
|
||||
r = omap_hwmod_register_links(h_aes);
|
||||
if (r < 0) {
|
||||
of_node_put(bus);
|
||||
return r;
|
||||
}
|
||||
if (r < 0)
|
||||
goto put_node;
|
||||
}
|
||||
of_node_put(bus);
|
||||
|
||||
@ -3229,4 +3225,8 @@ int __init omap3xxx_hwmod_init(void)
|
||||
r = omap_hwmod_register_links(omap3xxx_dss_hwmod_ocp_ifs);
|
||||
|
||||
return r;
|
||||
|
||||
put_node:
|
||||
of_node_put(bus);
|
||||
return r;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user