Skip to content

Commit 54cb981

Browse files
committed
Merge tag 'omap-for-v6.5/cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into soc/arm
Clean-up for omaps for v6.5 Two patches for checkpatch warnings, and one change to use pr_err instead of printk. * tag 'omap-for-v6.5/cleanup-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: omap2: Fix checkpatch issues arm: omap1: replace printk() with pr_err macro ARM: omap: Fix checkpatch issues Link: https://lore.kernel.org/r/pull-1685946511-835910@atomide.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 8f7913c + 937e872 commit 54cb981

8 files changed

Lines changed: 18 additions & 19 deletions

File tree

arch/arm/mach-omap1/pm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ static int __init omap_pm_init(void)
632632

633633
error = sysfs_create_file(power_kobj, &sleep_while_idle_attr.attr);
634634
if (error)
635-
printk(KERN_ERR "sysfs_create_file failed: %d\n", error);
635+
pr_err("sysfs_create_file failed: %d\n", error);
636636

637637
if (cpu_is_omap16xx()) {
638638
/* configure LOW_PWR pin */

arch/arm/mach-omap1/sram-init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#define OMAP1_SRAM_PA 0x20000000
2525
#define SRAM_BOOTLOADER_SZ 0x80
26-
#define ROUND_DOWN(value,boundary) ((value) & (~((boundary)-1)))
26+
#define ROUND_DOWN(value, boundary) ((value) & (~((boundary) - 1)))
2727

2828
static void __iomem *omap_sram_base;
2929
static unsigned long omap_sram_start;

arch/arm/mach-omap2/omap-wakeupgen.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ static void irq_restore_context(void)
374374
static void irq_save_secure_context(void)
375375
{
376376
u32 ret;
377+
377378
ret = omap_secure_dispatcher(OMAP4_HAL_SAVEGIC_INDEX,
378379
FLAG_START_CRITICAL,
379380
0, 0, 0, 0, 0);

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1851,7 +1851,7 @@ static struct omap_hwmod_ocp_if omap3xxx_l4_core__dss_rfbi = {
18511851
.fw = {
18521852
.omap2 = {
18531853
.l4_fw_region = OMAP3_L4_CORE_FW_DSS_RFBI_REGION,
1854-
.l4_prot_group = OMAP3_L4_CORE_FW_DSS_PROT_GROUP ,
1854+
.l4_prot_group = OMAP3_L4_CORE_FW_DSS_PROT_GROUP,
18551855
.flags = OMAP_FIREWALL_L4,
18561856
},
18571857
},
@@ -2172,7 +2172,7 @@ static struct omap_hwmod am35xx_emac_hwmod = {
21722172
/*
21732173
* According to Mark Greer, the MPU will not return from WFI
21742174
* when the EMAC signals an interrupt.
2175-
* http://www.spinics.net/lists/arm-kernel/msg174734.html
2175+
* https://lore.kernel.org/all/1336770778-23044-3-git-send-email-mgreer@animalcreek.com/
21762176
*/
21772177
.flags = (HWMOD_NO_IDLEST | HWMOD_BLOCK_WFI),
21782178
};
@@ -2346,13 +2346,12 @@ static struct omap_hwmod_ocp_if *omap36xx_sham_hwmod_ocp_ifs[] __initdata = {
23462346
NULL
23472347
};
23482348

2349-
23502349
/*
23512350
* Apparently the SHA/MD5 and AES accelerator IP blocks are
23522351
* only present on some AM35xx chips, and no one knows which
2353-
* ones. See
2354-
* http://www.spinics.net/lists/arm-kernel/msg215466.html So
2355-
* if you need these IP blocks on an AM35xx, try uncommenting
2352+
* ones.
2353+
* See https://lore.kernel.org/all/20130108203853.GB1876@animalcreek.com/
2354+
* So if you need these IP blocks on an AM35xx, try uncommenting
23562355
* the following lines.
23572356
*/
23582357
static struct omap_hwmod_ocp_if *am35xx_sham_hwmod_ocp_ifs[] __initdata = {

arch/arm/mach-omap2/omap_phy_internal.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// SPDX-License-Identifier: GPL-2.0-or-later
22
/*
3-
* This file configures the internal USB PHY in OMAP4430. Used
4-
* with TWL6030 transceiver and MUSB on OMAP4430.
5-
*
6-
* Copyright (C) 2010 Texas Instruments Incorporated - https://www.ti.com
7-
* Author: Hema HK <hemahk@ti.com>
8-
*/
3+
* This file configures the internal USB PHY in OMAP4430. Used
4+
* with TWL6030 transceiver and MUSB on OMAP4430.
5+
*
6+
* Copyright (C) 2010 Texas Instruments Incorporated - https://www.ti.com
7+
* Author: Hema HK <hemahk@ti.com>
8+
*/
99

1010
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
1111

arch/arm/mach-omap2/sdrc2xxx.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
/*
3-
* linux/arch/arm/mach-omap2/sdrc2xxx.c
4-
*
53
* SDRAM timing related functions for OMAP2xxx
64
*
75
* Copyright (C) 2005, 2008 Texas Instruments Inc.

arch/arm/mach-omap2/sram.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
#define GP_DEVICE 0x300
4747

48-
#define ROUND_DOWN(value,boundary) ((value) & (~((boundary)-1)))
48+
#define ROUND_DOWN(value, boundary) ((value) & (~((boundary) - 1)))
4949

5050
static unsigned long omap_sram_start;
5151
static unsigned long omap_sram_size;
@@ -118,7 +118,7 @@ static void omap_sram_reset(void)
118118
*/
119119
static int is_sram_locked(void)
120120
{
121-
if (OMAP2_DEVICE_TYPE_GP == omap_type()) {
121+
if (omap_type() == OMAP2_DEVICE_TYPE_GP) {
122122
/* RAMFW: R/W access to all initiators for all qualifier sets */
123123
if (cpu_is_omap242x()) {
124124
writel_relaxed(0xFF, OMAP24XX_VA_REQINFOPERM0); /* all q-vects */

arch/arm/mach-omap2/ti81xx-restart.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@ void ti81xx_restart(enum reboot_mode mode, const char *cmd)
2626
{
2727
omap2_prm_set_mod_reg_bits(TI81XX_GLOBAL_RST_COLD, 0,
2828
TI81XX_PRM_DEVICE_RSTCTRL);
29-
while (1);
29+
while (1)
30+
;
3031
}

0 commit comments

Comments
 (0)