* [PATCH] treewide: Remove the unnecessary space before semicolon
@ 2022-10-26 4:40 Bin Meng
2022-10-26 4:54 ` Stefan Roese
2022-11-03 16:58 ` Tom Rini
0 siblings, 2 replies; 9+ messages in thread
From: Bin Meng @ 2022-10-26 4:40 UTC (permalink / raw)
To: u-boot
Cc: Ashok Reddy Soma, Derald D. Woods, Joe Hershberger,
Marek Behún, Michal Simek, Pali Rohár, Priyanka Jain,
Priyanka Singh, Ramon Fried, Simon Glass, Stefan Roese,
Vladimir Oltean, Wolfgang Denk
%s/return ;/return;
Signed-off-by: Bin Meng <bmeng@tinylab.org>
---
arch/powerpc/cpu/mpc85xx/cpu_init.c | 2 +-
arch/powerpc/cpu/mpc85xx/cpu_init_early.c | 2 +-
arch/powerpc/cpu/mpc85xx/fdt.c | 6 +++---
arch/powerpc/cpu/mpc85xx/liodn.c | 4 ++--
arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c | 2 +-
arch/powerpc/cpu/mpc85xx/portals.c | 8 ++++----
arch/powerpc/cpu/mpc85xx/tlb.c | 2 +-
arch/powerpc/cpu/mpc8xxx/fdt.c | 2 +-
arch/powerpc/cpu/mpc8xxx/law.c | 2 +-
arch/powerpc/lib/bootm.c | 4 ++--
board/ti/evm/evm.c | 2 +-
drivers/ddr/fsl/util.c | 2 +-
drivers/net/fm/init.c | 4 ++--
13 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 92a7e608ce..90f024d0a7 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -446,7 +446,7 @@ ulong cpu_init_f(void)
/* Implement a dummy function for those platforms w/o SERDES */
static void __fsl_serdes__init(void)
{
- return ;
+ return;
}
__attribute__((weak, alias("__fsl_serdes__init"))) void fsl_serdes_init(void);
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
index 1bba216371..e6347cfd2d 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
@@ -76,7 +76,7 @@ void setup_ifc(void)
ifc_out32(&(ifc_regs.gregs->csor_cs[0].csor), CONFIG_SYS_CSOR0);
ifc_out32(&(ifc_regs.gregs->amask_cs[0].amask), CONFIG_SYS_AMASK0);
- return ;
+ return;
}
#endif
diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index c8ad6a1b01..61d8aa7f4c 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -271,13 +271,13 @@ static inline void ft_fixup_l2cache(void *blob)
if (ph == NULL) {
debug("no next-level-cache property\n");
- return ;
+ return;
}
off = fdt_node_offset_by_phandle(blob, *ph);
if (off < 0) {
printf("%s: %s\n", __func__, fdt_strerror(off));
- return ;
+ return;
}
ft_fixup_l2cache_compatible(blob, off);
@@ -373,7 +373,7 @@ next:
l3_off = fdt_node_offset_by_phandle(blob, l3_off);
if (l3_off < 0) {
printf("%s: %s\n", __func__, fdt_strerror(off));
- return ;
+ return;
}
ft_fixup_l3cache(blob, l3_off);
}
diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
index a084002494..34974c92bd 100644
--- a/arch/powerpc/cpu/mpc85xx/liodn.c
+++ b/arch/powerpc/cpu/mpc85xx/liodn.c
@@ -111,7 +111,7 @@ static void setup_fman_liodn_base(enum fsl_dpaa_dev dev,
#endif
default:
printf("Error: Invalid device type to %s\n", __FUNCTION__);
- return ;
+ return;
}
base = (liodn_bases[dev].id[0] << 16) | liodn_bases[dev].id[0];
@@ -232,7 +232,7 @@ static void fdt_fixup_srio_liodn(void *blob, struct srio_liodn_id_table *tbl)
/* search for srio node, if doesn't exist just return - nothing todo */
srio_off = fdt_node_offset_by_compatible(blob, -1, "fsl,srio");
if (srio_off < 0)
- return ;
+ return;
for (i = 0; i < srio_liodn_tbl_sz; i++) {
int off, portid = tbl[i].portid;
diff --git a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
index 2a5c3e3200..38f30afdfc 100644
--- a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
@@ -45,7 +45,7 @@ void fsl_serdes_init(void)
if (srds1_cfg >= ARRAY_SIZE(serdes1_cfg_tbl)) {
printf("Invalid PORDEVSR[IO_SEL] = %d\n", srds1_cfg);
- return ;
+ return;
}
for (lane = 0; lane < SRDS1_MAX_LANES; lane++) {
diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
index 52e2124fb9..6b4cbddcdf 100644
--- a/arch/powerpc/cpu/mpc85xx/portals.c
+++ b/arch/powerpc/cpu/mpc85xx/portals.c
@@ -21,7 +21,7 @@ void fdt_portal(void *blob, const char *compat, const char *container,
off = fdt_node_offset_by_compatible(blob, -1, compat);
if (off < 0)
- return ;
+ return;
off = fdt_parent_offset(blob, off);
/* if non-zero assume we have a container */
@@ -35,7 +35,7 @@ void fdt_portal(void *blob, const char *compat, const char *container,
range = fdt_getprop_w(blob, off, "ranges", &len);
if (range == NULL) {
printf("ERROR: container for %s has no ranges", compat);
- return ;
+ return;
}
range[0] = 0;
@@ -61,13 +61,13 @@ void fdt_portal(void *blob, const char *compat, const char *container,
if (container && (memcmp(container, name, len))) {
printf("WARNING: container names didn't match %s %s\n",
container, name);
- return ;
+ return;
}
memcpy(&buf, name, len);
len += sprintf(&buf[len], "@%llx", addr);
fdt_set_name(blob, off, buf);
- return ;
+ return;
}
printf("ERROR: %s isn't in a container. Not supported\n", compat);
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index e39fe14382..81e60722f9 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -41,7 +41,7 @@ __weak void init_tlbs(void)
tlb_table[i].mas7);
}
- return ;
+ return;
}
#if !defined(CONFIG_NAND_SPL) && \
diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
index 871554a7f4..3004290248 100644
--- a/arch/powerpc/cpu/mpc8xxx/fdt.c
+++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
@@ -128,7 +128,7 @@ void ft_srio_setup(void *blob)
/* search for srio node, if doesn't exist just return - nothing todo */
srio_off = fdt_node_offset_by_compatible(blob, -1, "fsl,srio");
if (srio_off < 0)
- return ;
+ return;
#ifdef CONFIG_SRIO1
if (is_serdes_configured(SRIO1))
diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
index 198b5b10a5..24bbe3b45f 100644
--- a/arch/powerpc/cpu/mpc8xxx/law.c
+++ b/arch/powerpc/cpu/mpc8xxx/law.c
@@ -353,5 +353,5 @@ void init_laws(void)
}
#endif
- return ;
+ return;
}
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 512787854c..8ae8d8a3e7 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -113,7 +113,7 @@ static void boot_jump_linux(struct bootm_headers *images)
cmd_start, cmd_end, 0, 0);
/* does not return */
}
- return ;
+ return;
}
void arch_lmb_reserve(struct lmb *lmb)
@@ -148,7 +148,7 @@ void arch_lmb_reserve(struct lmb *lmb)
cpu_mp_lmb_reserve(lmb);
#endif
- return ;
+ return;
}
static void boot_prep_linux(struct bootm_headers *images)
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index 39b5c706a9..a7f9a7eca1 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -234,7 +234,7 @@ static void reset_net_chip(void)
ret = gpio_request(rst_gpio, "");
if (ret < 0) {
printf("Unable to get GPIO %d\n", rst_gpio);
- return ;
+ return;
}
/* Configure as output */
diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index 43cb01804b..589d7df731 100644
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -147,7 +147,7 @@ __fsl_ddr_set_lawbar(const common_timing_params_t *memctl_common_params,
if (set_ddr_laws(base, size, law_memctl) < 0) {
printf("%s: ERROR (ctrl #%d, TRGT ID=%x)\n", __func__, ctrl_num,
law_memctl);
- return ;
+ return;
}
debug("setup ddr law base = 0x%llx, size 0x%llx, TRGT_ID 0x%x\n",
base, size, law_memctl);
diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
index af94dabe29..43d2000d24 100644
--- a/drivers/net/fm/init.c
+++ b/drivers/net/fm/init.c
@@ -149,7 +149,7 @@ void fman_enet_init(void)
}
}
- return ;
+ return;
}
void fm_disable_port(enum fm_port port)
@@ -233,7 +233,7 @@ static void
__def_board_ft_fman_fixup_port(void *blob, char * prop, phys_addr_t pa,
enum fm_port port, int offset)
{
- return ;
+ return;
}
void board_ft_fman_fixup_port(void *blob, char * prop, phys_addr_t pa,
--
2.34.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] treewide: Remove the unnecessary space before semicolon
2022-10-26 4:40 [PATCH] treewide: Remove the unnecessary space before semicolon Bin Meng
@ 2022-10-26 4:54 ` Stefan Roese
2022-11-03 16:58 ` Tom Rini
1 sibling, 0 replies; 9+ messages in thread
From: Stefan Roese @ 2022-10-26 4:54 UTC (permalink / raw)
To: Bin Meng, u-boot
Cc: Ashok Reddy Soma, Derald D. Woods, Joe Hershberger,
Marek Behún, Michal Simek, Pali Rohár, Priyanka Jain,
Priyanka Singh, Ramon Fried, Simon Glass, Vladimir Oltean,
Wolfgang Denk
On 26.10.22 06:40, Bin Meng wrote:
> %s/return ;/return;
>
> Signed-off-by: Bin Meng <bmeng@tinylab.org>
> ---
>
> arch/powerpc/cpu/mpc85xx/cpu_init.c | 2 +-
> arch/powerpc/cpu/mpc85xx/cpu_init_early.c | 2 +-
> arch/powerpc/cpu/mpc85xx/fdt.c | 6 +++---
> arch/powerpc/cpu/mpc85xx/liodn.c | 4 ++--
> arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c | 2 +-
> arch/powerpc/cpu/mpc85xx/portals.c | 8 ++++----
> arch/powerpc/cpu/mpc85xx/tlb.c | 2 +-
> arch/powerpc/cpu/mpc8xxx/fdt.c | 2 +-
> arch/powerpc/cpu/mpc8xxx/law.c | 2 +-
> arch/powerpc/lib/bootm.c | 4 ++--
> board/ti/evm/evm.c | 2 +-
> drivers/ddr/fsl/util.c | 2 +-
> drivers/net/fm/init.c | 4 ++--
> 13 files changed, 21 insertions(+), 21 deletions(-)
Nice.
Reviewed by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
> index 92a7e608ce..90f024d0a7 100644
> --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
> +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
> @@ -446,7 +446,7 @@ ulong cpu_init_f(void)
> /* Implement a dummy function for those platforms w/o SERDES */
> static void __fsl_serdes__init(void)
> {
> - return ;
> + return;
> }
> __attribute__((weak, alias("__fsl_serdes__init"))) void fsl_serdes_init(void);
>
> diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
> index 1bba216371..e6347cfd2d 100644
> --- a/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
> +++ b/arch/powerpc/cpu/mpc85xx/cpu_init_early.c
> @@ -76,7 +76,7 @@ void setup_ifc(void)
> ifc_out32(&(ifc_regs.gregs->csor_cs[0].csor), CONFIG_SYS_CSOR0);
> ifc_out32(&(ifc_regs.gregs->amask_cs[0].amask), CONFIG_SYS_AMASK0);
>
> - return ;
> + return;
> }
> #endif
>
> diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
> index c8ad6a1b01..61d8aa7f4c 100644
> --- a/arch/powerpc/cpu/mpc85xx/fdt.c
> +++ b/arch/powerpc/cpu/mpc85xx/fdt.c
> @@ -271,13 +271,13 @@ static inline void ft_fixup_l2cache(void *blob)
>
> if (ph == NULL) {
> debug("no next-level-cache property\n");
> - return ;
> + return;
> }
>
> off = fdt_node_offset_by_phandle(blob, *ph);
> if (off < 0) {
> printf("%s: %s\n", __func__, fdt_strerror(off));
> - return ;
> + return;
> }
>
> ft_fixup_l2cache_compatible(blob, off);
> @@ -373,7 +373,7 @@ next:
> l3_off = fdt_node_offset_by_phandle(blob, l3_off);
> if (l3_off < 0) {
> printf("%s: %s\n", __func__, fdt_strerror(off));
> - return ;
> + return;
> }
> ft_fixup_l3cache(blob, l3_off);
> }
> diff --git a/arch/powerpc/cpu/mpc85xx/liodn.c b/arch/powerpc/cpu/mpc85xx/liodn.c
> index a084002494..34974c92bd 100644
> --- a/arch/powerpc/cpu/mpc85xx/liodn.c
> +++ b/arch/powerpc/cpu/mpc85xx/liodn.c
> @@ -111,7 +111,7 @@ static void setup_fman_liodn_base(enum fsl_dpaa_dev dev,
> #endif
> default:
> printf("Error: Invalid device type to %s\n", __FUNCTION__);
> - return ;
> + return;
> }
>
> base = (liodn_bases[dev].id[0] << 16) | liodn_bases[dev].id[0];
> @@ -232,7 +232,7 @@ static void fdt_fixup_srio_liodn(void *blob, struct srio_liodn_id_table *tbl)
> /* search for srio node, if doesn't exist just return - nothing todo */
> srio_off = fdt_node_offset_by_compatible(blob, -1, "fsl,srio");
> if (srio_off < 0)
> - return ;
> + return;
>
> for (i = 0; i < srio_liodn_tbl_sz; i++) {
> int off, portid = tbl[i].portid;
> diff --git a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
> index 2a5c3e3200..38f30afdfc 100644
> --- a/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
> +++ b/arch/powerpc/cpu/mpc85xx/mpc8548_serdes.c
> @@ -45,7 +45,7 @@ void fsl_serdes_init(void)
>
> if (srds1_cfg >= ARRAY_SIZE(serdes1_cfg_tbl)) {
> printf("Invalid PORDEVSR[IO_SEL] = %d\n", srds1_cfg);
> - return ;
> + return;
> }
>
> for (lane = 0; lane < SRDS1_MAX_LANES; lane++) {
> diff --git a/arch/powerpc/cpu/mpc85xx/portals.c b/arch/powerpc/cpu/mpc85xx/portals.c
> index 52e2124fb9..6b4cbddcdf 100644
> --- a/arch/powerpc/cpu/mpc85xx/portals.c
> +++ b/arch/powerpc/cpu/mpc85xx/portals.c
> @@ -21,7 +21,7 @@ void fdt_portal(void *blob, const char *compat, const char *container,
>
> off = fdt_node_offset_by_compatible(blob, -1, compat);
> if (off < 0)
> - return ;
> + return;
>
> off = fdt_parent_offset(blob, off);
> /* if non-zero assume we have a container */
> @@ -35,7 +35,7 @@ void fdt_portal(void *blob, const char *compat, const char *container,
> range = fdt_getprop_w(blob, off, "ranges", &len);
> if (range == NULL) {
> printf("ERROR: container for %s has no ranges", compat);
> - return ;
> + return;
> }
>
> range[0] = 0;
> @@ -61,13 +61,13 @@ void fdt_portal(void *blob, const char *compat, const char *container,
> if (container && (memcmp(container, name, len))) {
> printf("WARNING: container names didn't match %s %s\n",
> container, name);
> - return ;
> + return;
> }
>
> memcpy(&buf, name, len);
> len += sprintf(&buf[len], "@%llx", addr);
> fdt_set_name(blob, off, buf);
> - return ;
> + return;
> }
>
> printf("ERROR: %s isn't in a container. Not supported\n", compat);
> diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
> index e39fe14382..81e60722f9 100644
> --- a/arch/powerpc/cpu/mpc85xx/tlb.c
> +++ b/arch/powerpc/cpu/mpc85xx/tlb.c
> @@ -41,7 +41,7 @@ __weak void init_tlbs(void)
> tlb_table[i].mas7);
> }
>
> - return ;
> + return;
> }
>
> #if !defined(CONFIG_NAND_SPL) && \
> diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c
> index 871554a7f4..3004290248 100644
> --- a/arch/powerpc/cpu/mpc8xxx/fdt.c
> +++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
> @@ -128,7 +128,7 @@ void ft_srio_setup(void *blob)
> /* search for srio node, if doesn't exist just return - nothing todo */
> srio_off = fdt_node_offset_by_compatible(blob, -1, "fsl,srio");
> if (srio_off < 0)
> - return ;
> + return;
>
> #ifdef CONFIG_SRIO1
> if (is_serdes_configured(SRIO1))
> diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c
> index 198b5b10a5..24bbe3b45f 100644
> --- a/arch/powerpc/cpu/mpc8xxx/law.c
> +++ b/arch/powerpc/cpu/mpc8xxx/law.c
> @@ -353,5 +353,5 @@ void init_laws(void)
> }
> #endif
>
> - return ;
> + return;
> }
> diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
> index 512787854c..8ae8d8a3e7 100644
> --- a/arch/powerpc/lib/bootm.c
> +++ b/arch/powerpc/lib/bootm.c
> @@ -113,7 +113,7 @@ static void boot_jump_linux(struct bootm_headers *images)
> cmd_start, cmd_end, 0, 0);
> /* does not return */
> }
> - return ;
> + return;
> }
>
> void arch_lmb_reserve(struct lmb *lmb)
> @@ -148,7 +148,7 @@ void arch_lmb_reserve(struct lmb *lmb)
> cpu_mp_lmb_reserve(lmb);
> #endif
>
> - return ;
> + return;
> }
>
> static void boot_prep_linux(struct bootm_headers *images)
> diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
> index 39b5c706a9..a7f9a7eca1 100644
> --- a/board/ti/evm/evm.c
> +++ b/board/ti/evm/evm.c
> @@ -234,7 +234,7 @@ static void reset_net_chip(void)
> ret = gpio_request(rst_gpio, "");
> if (ret < 0) {
> printf("Unable to get GPIO %d\n", rst_gpio);
> - return ;
> + return;
> }
>
> /* Configure as output */
> diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
> index 43cb01804b..589d7df731 100644
> --- a/drivers/ddr/fsl/util.c
> +++ b/drivers/ddr/fsl/util.c
> @@ -147,7 +147,7 @@ __fsl_ddr_set_lawbar(const common_timing_params_t *memctl_common_params,
> if (set_ddr_laws(base, size, law_memctl) < 0) {
> printf("%s: ERROR (ctrl #%d, TRGT ID=%x)\n", __func__, ctrl_num,
> law_memctl);
> - return ;
> + return;
> }
> debug("setup ddr law base = 0x%llx, size 0x%llx, TRGT_ID 0x%x\n",
> base, size, law_memctl);
> diff --git a/drivers/net/fm/init.c b/drivers/net/fm/init.c
> index af94dabe29..43d2000d24 100644
> --- a/drivers/net/fm/init.c
> +++ b/drivers/net/fm/init.c
> @@ -149,7 +149,7 @@ void fman_enet_init(void)
> }
> }
>
> - return ;
> + return;
> }
>
> void fm_disable_port(enum fm_port port)
> @@ -233,7 +233,7 @@ static void
> __def_board_ft_fman_fixup_port(void *blob, char * prop, phys_addr_t pa,
> enum fm_port port, int offset)
> {
> - return ;
> + return;
> }
>
> void board_ft_fman_fixup_port(void *blob, char * prop, phys_addr_t pa,
Viele Grüße,
Stefan Roese
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] treewide: Remove the unnecessary space before semicolon
2022-10-26 4:40 [PATCH] treewide: Remove the unnecessary space before semicolon Bin Meng
2022-10-26 4:54 ` Stefan Roese
@ 2022-11-03 16:58 ` Tom Rini
1 sibling, 0 replies; 9+ messages in thread
From: Tom Rini @ 2022-11-03 16:58 UTC (permalink / raw)
To: Bin Meng
Cc: u-boot, Ashok Reddy Soma, Derald D. Woods, Joe Hershberger,
Marek Behún, Michal Simek, Pali Rohár, Priyanka Jain,
Priyanka Singh, Ramon Fried, Simon Glass, Stefan Roese,
Vladimir Oltean, Wolfgang Denk
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
On Wed, Oct 26, 2022 at 12:40:07PM +0800, Bin Meng wrote:
> %s/return ;/return;
>
> Signed-off-by: Bin Meng <bmeng@tinylab.org>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] treewide: Remove the unnecessary space before semicolon
2022-10-24 7:28 Bin Meng
` (3 preceding siblings ...)
2022-10-24 11:25 ` Christian Schoenebeck
@ 2022-10-24 11:42 ` Laurent Vivier
4 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2022-10-24 11:42 UTC (permalink / raw)
To: Bin Meng, qemu-devel, qemu-trivial
Cc: Alistair Francis, Bin Meng, Christian Schoenebeck, Gerd Hoffmann,
Greg Kurz, Jason Wang, Magnus Damm, Michael S. Tsirkin,
Palmer Dabbelt, Pavel Pisa, Peter Maydell, Vikram Garhwal,
Yoshinori Sato, qemu-arm, qemu-riscv
Le 24/10/2022 à 09:28, Bin Meng a écrit :
> %s/return ;/return;
>
> Signed-off-by: Bin Meng <bmeng@tinylab.org>
> ---
>
> include/hw/elf_ops.h | 2 +-
> hw/9pfs/9p.c | 2 +-
> hw/dma/pl330.c | 2 +-
> hw/net/can/can_sja1000.c | 2 +-
> hw/timer/renesas_cmt.c | 2 +-
> hw/timer/renesas_tmr.c | 8 ++++----
> hw/virtio/virtio-pci.c | 2 +-
> target/riscv/vector_helper.c | 2 +-
> target/rx/op_helper.c | 4 ++--
> ui/vnc-jobs.c | 2 +-
> ui/vnc.c | 2 +-
> 11 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h
> index 7c3b1d0f6c..fbe0b1e956 100644
> --- a/include/hw/elf_ops.h
> +++ b/include/hw/elf_ops.h
> @@ -117,7 +117,7 @@ static void glue(load_symbols, SZ)(struct elfhdr *ehdr, int fd, int must_swab,
> shdr_table = load_at(fd, ehdr->e_shoff,
> sizeof(struct elf_shdr) * ehdr->e_shnum);
> if (!shdr_table) {
> - return ;
> + return;
> }
>
> if (must_swab) {
> diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> index aebadeaa03..76c591a01b 100644
> --- a/hw/9pfs/9p.c
> +++ b/hw/9pfs/9p.c
> @@ -1786,7 +1786,7 @@ static void coroutine_fn v9fs_walk(void *opaque)
> err = pdu_unmarshal(pdu, offset, "ddw", &fid, &newfid, &nwnames);
> if (err < 0) {
> pdu_complete(pdu, err);
> - return ;
> + return;
> }
> offset += err;
>
> diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
> index 08e5938ec7..e5d521c329 100644
> --- a/hw/dma/pl330.c
> +++ b/hw/dma/pl330.c
> @@ -1328,7 +1328,7 @@ static void pl330_debug_exec(PL330State *s)
> }
> if (!insn) {
> pl330_fault(ch, PL330_FAULT_UNDEF_INSTR | PL330_FAULT_DBG_INSTR);
> - return ;
> + return;
> }
> ch->stall = 0;
> insn->exec(ch, opcode, args, insn->size - 1);
> diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
> index e0f76d3eb3..73201f9139 100644
> --- a/hw/net/can/can_sja1000.c
> +++ b/hw/net/can/can_sja1000.c
> @@ -431,7 +431,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
> (unsigned long long)val, (unsigned int)addr);
>
> if (addr > CAN_SJA_MEM_SIZE) {
> - return ;
> + return;
> }
>
> if (s->clock & 0x80) { /* PeliCAN Mode */
> diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c
> index 2e0fd21a36..69eabc678a 100644
> --- a/hw/timer/renesas_cmt.c
> +++ b/hw/timer/renesas_cmt.c
> @@ -57,7 +57,7 @@ static void update_events(RCMTState *cmt, int ch)
>
> if ((cmt->cmstr & (1 << ch)) == 0) {
> /* count disable, so not happened next event. */
> - return ;
> + return;
> }
> next_time = cmt->cmcor[ch] - cmt->cmcnt[ch];
> next_time *= NANOSECONDS_PER_SECOND;
> diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c
> index d96002e1ee..c15f654738 100644
> --- a/hw/timer/renesas_tmr.c
> +++ b/hw/timer/renesas_tmr.c
> @@ -67,18 +67,18 @@ static void update_events(RTMRState *tmr, int ch)
> int i, event;
>
> if (tmr->tccr[ch] == 0) {
> - return ;
> + return;
> }
> if (FIELD_EX8(tmr->tccr[ch], TCCR, CSS) == 0) {
> /* external clock mode */
> /* event not happened */
> - return ;
> + return;
> }
> if (FIELD_EX8(tmr->tccr[0], TCCR, CSS) == CSS_CASCADING) {
> /* cascading mode */
> if (ch == 1) {
> tmr->next[ch] = none;
> - return ;
> + return;
> }
> diff[cmia] = concat_reg(tmr->tcora) - concat_reg(tmr->tcnt);
> diff[cmib] = concat_reg(tmr->tcorb) - concat_reg(tmr->tcnt);
> @@ -384,7 +384,7 @@ static void timer_events(RTMRState *tmr, int ch)
> tmr->tcorb[ch]) & 0xff;
> } else {
> if (ch == 1) {
> - return ;
> + return;
> }
> tcnt = issue_event(tmr, ch, 16,
> concat_reg(tmr->tcnt),
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index e7d80242b7..34db51e241 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -1675,7 +1675,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
> if (virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) {
> error_setg(errp, "VIRTIO_F_IOMMU_PLATFORM was supported by"
> " neither legacy nor transitional device");
> - return ;
> + return;
> }
> /*
> * Legacy and transitional devices use specific subsystem IDs.
> diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
> index b94f809eb3..0020b9a95d 100644
> --- a/target/riscv/vector_helper.c
> +++ b/target/riscv/vector_helper.c
> @@ -211,7 +211,7 @@ static void vext_set_elems_1s(void *base, uint32_t is_agnostic, uint32_t cnt,
> return;
> }
> if (tot - cnt == 0) {
> - return ;
> + return;
> }
> memset(base + cnt, -1, tot - cnt);
> }
> diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c
> index 9ca32dcc82..acce650185 100644
> --- a/target/rx/op_helper.c
> +++ b/target/rx/op_helper.c
> @@ -286,7 +286,7 @@ void helper_suntil(CPURXState *env, uint32_t sz)
> uint32_t tmp;
> tcg_debug_assert(sz < 3);
> if (env->regs[3] == 0) {
> - return ;
> + return;
> }
> do {
> tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
> @@ -305,7 +305,7 @@ void helper_swhile(CPURXState *env, uint32_t sz)
> uint32_t tmp;
> tcg_debug_assert(sz < 3);
> if (env->regs[3] == 0) {
> - return ;
> + return;
> }
> do {
> tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
> diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
> index 4562bf8928..886f9bf611 100644
> --- a/ui/vnc-jobs.c
> +++ b/ui/vnc-jobs.c
> @@ -373,7 +373,7 @@ void vnc_start_worker_thread(void)
> VncJobQueue *q;
>
> if (vnc_worker_thread_running())
> - return ;
> + return;
>
> q = vnc_queue_init();
> qemu_thread_create(&q->thread, "vnc_worker", vnc_worker_thread, q,
> diff --git a/ui/vnc.c b/ui/vnc.c
> index acb3629cd8..88f55cbf3c 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -3085,7 +3085,7 @@ static void vnc_rect_updated(VncDisplay *vd, int x, int y, struct timeval * tv)
>
> rect = vnc_stat_rect(vd, x, y);
> if (rect->updated) {
> - return ;
> + return;
> }
> rect->times[rect->idx] = *tv;
> rect->idx = (rect->idx + 1) % ARRAY_SIZE(rect->times);
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] treewide: Remove the unnecessary space before semicolon
2022-10-24 7:28 Bin Meng
` (2 preceding siblings ...)
2022-10-24 10:17 ` Peter Maydell
@ 2022-10-24 11:25 ` Christian Schoenebeck
2022-10-24 11:42 ` Laurent Vivier
4 siblings, 0 replies; 9+ messages in thread
From: Christian Schoenebeck @ 2022-10-24 11:25 UTC (permalink / raw)
To: qemu-devel, qemu-trivial
Cc: Alistair Francis, Bin Meng, Gerd Hoffmann, Greg Kurz, Jason Wang,
Magnus Damm, Michael S. Tsirkin, Palmer Dabbelt, Pavel Pisa,
Peter Maydell, Vikram Garhwal, Yoshinori Sato, qemu-arm,
qemu-riscv, Bin Meng
On Monday, October 24, 2022 9:28:02 AM CEST Bin Meng wrote:
> %s/return ;/return;
>
> Signed-off-by: Bin Meng <bmeng@tinylab.org>
> ---
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
>
> include/hw/elf_ops.h | 2 +-
> hw/9pfs/9p.c | 2 +-
> hw/dma/pl330.c | 2 +-
> hw/net/can/can_sja1000.c | 2 +-
> hw/timer/renesas_cmt.c | 2 +-
> hw/timer/renesas_tmr.c | 8 ++++----
> hw/virtio/virtio-pci.c | 2 +-
> target/riscv/vector_helper.c | 2 +-
> target/rx/op_helper.c | 4 ++--
> ui/vnc-jobs.c | 2 +-
> ui/vnc.c | 2 +-
> 11 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h
> index 7c3b1d0f6c..fbe0b1e956 100644
> --- a/include/hw/elf_ops.h
> +++ b/include/hw/elf_ops.h
> @@ -117,7 +117,7 @@ static void glue(load_symbols, SZ)(struct elfhdr *ehdr, int fd, int must_swab,
> shdr_table = load_at(fd, ehdr->e_shoff,
> sizeof(struct elf_shdr) * ehdr->e_shnum);
> if (!shdr_table) {
> - return ;
> + return;
> }
>
> if (must_swab) {
> diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> index aebadeaa03..76c591a01b 100644
> --- a/hw/9pfs/9p.c
> +++ b/hw/9pfs/9p.c
> @@ -1786,7 +1786,7 @@ static void coroutine_fn v9fs_walk(void *opaque)
> err = pdu_unmarshal(pdu, offset, "ddw", &fid, &newfid, &nwnames);
> if (err < 0) {
> pdu_complete(pdu, err);
> - return ;
> + return;
> }
> offset += err;
>
> diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
> index 08e5938ec7..e5d521c329 100644
> --- a/hw/dma/pl330.c
> +++ b/hw/dma/pl330.c
> @@ -1328,7 +1328,7 @@ static void pl330_debug_exec(PL330State *s)
> }
> if (!insn) {
> pl330_fault(ch, PL330_FAULT_UNDEF_INSTR | PL330_FAULT_DBG_INSTR);
> - return ;
> + return;
> }
> ch->stall = 0;
> insn->exec(ch, opcode, args, insn->size - 1);
> diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
> index e0f76d3eb3..73201f9139 100644
> --- a/hw/net/can/can_sja1000.c
> +++ b/hw/net/can/can_sja1000.c
> @@ -431,7 +431,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
> (unsigned long long)val, (unsigned int)addr);
>
> if (addr > CAN_SJA_MEM_SIZE) {
> - return ;
> + return;
> }
>
> if (s->clock & 0x80) { /* PeliCAN Mode */
> diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c
> index 2e0fd21a36..69eabc678a 100644
> --- a/hw/timer/renesas_cmt.c
> +++ b/hw/timer/renesas_cmt.c
> @@ -57,7 +57,7 @@ static void update_events(RCMTState *cmt, int ch)
>
> if ((cmt->cmstr & (1 << ch)) == 0) {
> /* count disable, so not happened next event. */
> - return ;
> + return;
> }
> next_time = cmt->cmcor[ch] - cmt->cmcnt[ch];
> next_time *= NANOSECONDS_PER_SECOND;
> diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c
> index d96002e1ee..c15f654738 100644
> --- a/hw/timer/renesas_tmr.c
> +++ b/hw/timer/renesas_tmr.c
> @@ -67,18 +67,18 @@ static void update_events(RTMRState *tmr, int ch)
> int i, event;
>
> if (tmr->tccr[ch] == 0) {
> - return ;
> + return;
> }
> if (FIELD_EX8(tmr->tccr[ch], TCCR, CSS) == 0) {
> /* external clock mode */
> /* event not happened */
> - return ;
> + return;
> }
> if (FIELD_EX8(tmr->tccr[0], TCCR, CSS) == CSS_CASCADING) {
> /* cascading mode */
> if (ch == 1) {
> tmr->next[ch] = none;
> - return ;
> + return;
> }
> diff[cmia] = concat_reg(tmr->tcora) - concat_reg(tmr->tcnt);
> diff[cmib] = concat_reg(tmr->tcorb) - concat_reg(tmr->tcnt);
> @@ -384,7 +384,7 @@ static void timer_events(RTMRState *tmr, int ch)
> tmr->tcorb[ch]) & 0xff;
> } else {
> if (ch == 1) {
> - return ;
> + return;
> }
> tcnt = issue_event(tmr, ch, 16,
> concat_reg(tmr->tcnt),
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index e7d80242b7..34db51e241 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -1675,7 +1675,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
> if (virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) {
> error_setg(errp, "VIRTIO_F_IOMMU_PLATFORM was supported by"
> " neither legacy nor transitional device");
> - return ;
> + return;
> }
> /*
> * Legacy and transitional devices use specific subsystem IDs.
> diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
> index b94f809eb3..0020b9a95d 100644
> --- a/target/riscv/vector_helper.c
> +++ b/target/riscv/vector_helper.c
> @@ -211,7 +211,7 @@ static void vext_set_elems_1s(void *base, uint32_t is_agnostic, uint32_t cnt,
> return;
> }
> if (tot - cnt == 0) {
> - return ;
> + return;
> }
> memset(base + cnt, -1, tot - cnt);
> }
> diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c
> index 9ca32dcc82..acce650185 100644
> --- a/target/rx/op_helper.c
> +++ b/target/rx/op_helper.c
> @@ -286,7 +286,7 @@ void helper_suntil(CPURXState *env, uint32_t sz)
> uint32_t tmp;
> tcg_debug_assert(sz < 3);
> if (env->regs[3] == 0) {
> - return ;
> + return;
> }
> do {
> tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
> @@ -305,7 +305,7 @@ void helper_swhile(CPURXState *env, uint32_t sz)
> uint32_t tmp;
> tcg_debug_assert(sz < 3);
> if (env->regs[3] == 0) {
> - return ;
> + return;
> }
> do {
> tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
> diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
> index 4562bf8928..886f9bf611 100644
> --- a/ui/vnc-jobs.c
> +++ b/ui/vnc-jobs.c
> @@ -373,7 +373,7 @@ void vnc_start_worker_thread(void)
> VncJobQueue *q;
>
> if (vnc_worker_thread_running())
> - return ;
> + return;
>
> q = vnc_queue_init();
> qemu_thread_create(&q->thread, "vnc_worker", vnc_worker_thread, q,
> diff --git a/ui/vnc.c b/ui/vnc.c
> index acb3629cd8..88f55cbf3c 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -3085,7 +3085,7 @@ static void vnc_rect_updated(VncDisplay *vd, int x, int y, struct timeval * tv)
>
> rect = vnc_stat_rect(vd, x, y);
> if (rect->updated) {
> - return ;
> + return;
> }
> rect->times[rect->idx] = *tv;
> rect->idx = (rect->idx + 1) % ARRAY_SIZE(rect->times);
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] treewide: Remove the unnecessary space before semicolon
2022-10-24 7:28 Bin Meng
2022-10-24 8:17 ` Pavel Pisa
2022-10-24 8:31 ` Michael S. Tsirkin
@ 2022-10-24 10:17 ` Peter Maydell
2022-10-24 11:25 ` Christian Schoenebeck
2022-10-24 11:42 ` Laurent Vivier
4 siblings, 0 replies; 9+ messages in thread
From: Peter Maydell @ 2022-10-24 10:17 UTC (permalink / raw)
To: Bin Meng
Cc: qemu-devel, qemu-trivial, Alistair Francis, Bin Meng,
Christian Schoenebeck, Gerd Hoffmann, Greg Kurz, Jason Wang,
Magnus Damm, Michael S. Tsirkin, Palmer Dabbelt, Pavel Pisa,
Vikram Garhwal, Yoshinori Sato, qemu-arm, qemu-riscv
On Mon, 24 Oct 2022 at 08:28, Bin Meng <bmeng@tinylab.org> wrote:
>
> %s/return ;/return;
>
> Signed-off-by: Bin Meng <bmeng@tinylab.org>
> ---
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
thanks
-- PMM
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] treewide: Remove the unnecessary space before semicolon
2022-10-24 7:28 Bin Meng
2022-10-24 8:17 ` Pavel Pisa
@ 2022-10-24 8:31 ` Michael S. Tsirkin
2022-10-24 10:17 ` Peter Maydell
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Michael S. Tsirkin @ 2022-10-24 8:31 UTC (permalink / raw)
To: Bin Meng
Cc: qemu-devel, qemu-trivial, Alistair Francis, Bin Meng,
Christian Schoenebeck, Gerd Hoffmann, Greg Kurz, Jason Wang,
Magnus Damm, Palmer Dabbelt, Pavel Pisa, Peter Maydell,
Vikram Garhwal, Yoshinori Sato, qemu-arm, qemu-riscv
On Mon, Oct 24, 2022 at 03:28:02PM +0800, Bin Meng wrote:
> %s/return ;/return;
>
> Signed-off-by: Bin Meng <bmeng@tinylab.org>
ack for virtio
trivial tree pls
> ---
>
> include/hw/elf_ops.h | 2 +-
> hw/9pfs/9p.c | 2 +-
> hw/dma/pl330.c | 2 +-
> hw/net/can/can_sja1000.c | 2 +-
> hw/timer/renesas_cmt.c | 2 +-
> hw/timer/renesas_tmr.c | 8 ++++----
> hw/virtio/virtio-pci.c | 2 +-
> target/riscv/vector_helper.c | 2 +-
> target/rx/op_helper.c | 4 ++--
> ui/vnc-jobs.c | 2 +-
> ui/vnc.c | 2 +-
> 11 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h
> index 7c3b1d0f6c..fbe0b1e956 100644
> --- a/include/hw/elf_ops.h
> +++ b/include/hw/elf_ops.h
> @@ -117,7 +117,7 @@ static void glue(load_symbols, SZ)(struct elfhdr *ehdr, int fd, int must_swab,
> shdr_table = load_at(fd, ehdr->e_shoff,
> sizeof(struct elf_shdr) * ehdr->e_shnum);
> if (!shdr_table) {
> - return ;
> + return;
> }
>
> if (must_swab) {
> diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> index aebadeaa03..76c591a01b 100644
> --- a/hw/9pfs/9p.c
> +++ b/hw/9pfs/9p.c
> @@ -1786,7 +1786,7 @@ static void coroutine_fn v9fs_walk(void *opaque)
> err = pdu_unmarshal(pdu, offset, "ddw", &fid, &newfid, &nwnames);
> if (err < 0) {
> pdu_complete(pdu, err);
> - return ;
> + return;
> }
> offset += err;
>
> diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
> index 08e5938ec7..e5d521c329 100644
> --- a/hw/dma/pl330.c
> +++ b/hw/dma/pl330.c
> @@ -1328,7 +1328,7 @@ static void pl330_debug_exec(PL330State *s)
> }
> if (!insn) {
> pl330_fault(ch, PL330_FAULT_UNDEF_INSTR | PL330_FAULT_DBG_INSTR);
> - return ;
> + return;
> }
> ch->stall = 0;
> insn->exec(ch, opcode, args, insn->size - 1);
> diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
> index e0f76d3eb3..73201f9139 100644
> --- a/hw/net/can/can_sja1000.c
> +++ b/hw/net/can/can_sja1000.c
> @@ -431,7 +431,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
> (unsigned long long)val, (unsigned int)addr);
>
> if (addr > CAN_SJA_MEM_SIZE) {
> - return ;
> + return;
> }
>
> if (s->clock & 0x80) { /* PeliCAN Mode */
> diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c
> index 2e0fd21a36..69eabc678a 100644
> --- a/hw/timer/renesas_cmt.c
> +++ b/hw/timer/renesas_cmt.c
> @@ -57,7 +57,7 @@ static void update_events(RCMTState *cmt, int ch)
>
> if ((cmt->cmstr & (1 << ch)) == 0) {
> /* count disable, so not happened next event. */
> - return ;
> + return;
> }
> next_time = cmt->cmcor[ch] - cmt->cmcnt[ch];
> next_time *= NANOSECONDS_PER_SECOND;
> diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c
> index d96002e1ee..c15f654738 100644
> --- a/hw/timer/renesas_tmr.c
> +++ b/hw/timer/renesas_tmr.c
> @@ -67,18 +67,18 @@ static void update_events(RTMRState *tmr, int ch)
> int i, event;
>
> if (tmr->tccr[ch] == 0) {
> - return ;
> + return;
> }
> if (FIELD_EX8(tmr->tccr[ch], TCCR, CSS) == 0) {
> /* external clock mode */
> /* event not happened */
> - return ;
> + return;
> }
> if (FIELD_EX8(tmr->tccr[0], TCCR, CSS) == CSS_CASCADING) {
> /* cascading mode */
> if (ch == 1) {
> tmr->next[ch] = none;
> - return ;
> + return;
> }
> diff[cmia] = concat_reg(tmr->tcora) - concat_reg(tmr->tcnt);
> diff[cmib] = concat_reg(tmr->tcorb) - concat_reg(tmr->tcnt);
> @@ -384,7 +384,7 @@ static void timer_events(RTMRState *tmr, int ch)
> tmr->tcorb[ch]) & 0xff;
> } else {
> if (ch == 1) {
> - return ;
> + return;
> }
> tcnt = issue_event(tmr, ch, 16,
> concat_reg(tmr->tcnt),
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index e7d80242b7..34db51e241 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -1675,7 +1675,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
> if (virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) {
> error_setg(errp, "VIRTIO_F_IOMMU_PLATFORM was supported by"
> " neither legacy nor transitional device");
> - return ;
> + return;
> }
> /*
> * Legacy and transitional devices use specific subsystem IDs.
> diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
> index b94f809eb3..0020b9a95d 100644
> --- a/target/riscv/vector_helper.c
> +++ b/target/riscv/vector_helper.c
> @@ -211,7 +211,7 @@ static void vext_set_elems_1s(void *base, uint32_t is_agnostic, uint32_t cnt,
> return;
> }
> if (tot - cnt == 0) {
> - return ;
> + return;
> }
> memset(base + cnt, -1, tot - cnt);
> }
> diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c
> index 9ca32dcc82..acce650185 100644
> --- a/target/rx/op_helper.c
> +++ b/target/rx/op_helper.c
> @@ -286,7 +286,7 @@ void helper_suntil(CPURXState *env, uint32_t sz)
> uint32_t tmp;
> tcg_debug_assert(sz < 3);
> if (env->regs[3] == 0) {
> - return ;
> + return;
> }
> do {
> tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
> @@ -305,7 +305,7 @@ void helper_swhile(CPURXState *env, uint32_t sz)
> uint32_t tmp;
> tcg_debug_assert(sz < 3);
> if (env->regs[3] == 0) {
> - return ;
> + return;
> }
> do {
> tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
> diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
> index 4562bf8928..886f9bf611 100644
> --- a/ui/vnc-jobs.c
> +++ b/ui/vnc-jobs.c
> @@ -373,7 +373,7 @@ void vnc_start_worker_thread(void)
> VncJobQueue *q;
>
> if (vnc_worker_thread_running())
> - return ;
> + return;
>
> q = vnc_queue_init();
> qemu_thread_create(&q->thread, "vnc_worker", vnc_worker_thread, q,
> diff --git a/ui/vnc.c b/ui/vnc.c
> index acb3629cd8..88f55cbf3c 100644
> --- a/ui/vnc.c
> +++ b/ui/vnc.c
> @@ -3085,7 +3085,7 @@ static void vnc_rect_updated(VncDisplay *vd, int x, int y, struct timeval * tv)
>
> rect = vnc_stat_rect(vd, x, y);
> if (rect->updated) {
> - return ;
> + return;
> }
> rect->times[rect->idx] = *tv;
> rect->idx = (rect->idx + 1) % ARRAY_SIZE(rect->times);
> --
> 2.25.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] treewide: Remove the unnecessary space before semicolon
2022-10-24 7:28 Bin Meng
@ 2022-10-24 8:17 ` Pavel Pisa
2022-10-24 8:31 ` Michael S. Tsirkin
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Pavel Pisa @ 2022-10-24 8:17 UTC (permalink / raw)
To: Bin Meng
Cc: qemu-devel, qemu-trivial, Alistair Francis, Bin Meng,
Christian Schoenebeck, Gerd Hoffmann, Greg Kurz, Jason Wang,
Magnus Damm, Michael S. Tsirkin, Palmer Dabbelt, Peter Maydell,
Vikram Garhwal, Yoshinori Sato, qemu-arm, qemu-riscv
Hllo Bin Meng,
I ACK the change for SJA1000.
On Monday 24 of October 2022 09:28:02 Bin Meng wrote:
> %s/return ;/return;
>
> Signed-off-by: Bin Meng <bmeng@tinylab.org>
> ---
>
> include/hw/elf_ops.h | 2 +-
> hw/9pfs/9p.c | 2 +-
> hw/dma/pl330.c | 2 +-
> hw/net/can/can_sja1000.c | 2 +-
Acked-by: Pave Pisa <pisa@cmp.felk.cvut.cz>
> hw/timer/renesas_cmt.c | 2 +-
> hw/timer/renesas_tmr.c | 8 ++++----
> hw/virtio/virtio-pci.c | 2 +-
> target/riscv/vector_helper.c | 2 +-
> target/rx/op_helper.c | 4 ++--
> ui/vnc-jobs.c | 2 +-
> ui/vnc.c | 2 +-
> 11 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
> index e0f76d3eb3..73201f9139 100644
> --- a/hw/net/can/can_sja1000.c
> +++ b/hw/net/can/can_sja1000.c
> @@ -431,7 +431,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr,
> uint64_t val, (unsigned long long)val, (unsigned int)addr);
>
> if (addr > CAN_SJA_MEM_SIZE) {
> - return ;
> + return;
> }
>
> if (s->clock & 0x80) { /* PeliCAN Mode */
--
Pavel Pisa
phone: +420 603531357
e-mail: pisa@cmp.felk.cvut.cz
Department of Control Engineering FEE CVUT
Karlovo namesti 13, 121 35, Prague 2
university: http://control.fel.cvut.cz/
personal: http://cmp.felk.cvut.cz/~pisa
projects: https://www.openhub.net/accounts/ppisa
CAN related:http://canbus.pages.fel.cvut.cz/
RISC-V education: https://comparch.edu.cvut.cz/
Open Technologies Research Education and Exchange Services
https://gitlab.fel.cvut.cz/otrees/org/-/wikis/home
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] treewide: Remove the unnecessary space before semicolon
@ 2022-10-24 7:28 Bin Meng
2022-10-24 8:17 ` Pavel Pisa
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Bin Meng @ 2022-10-24 7:28 UTC (permalink / raw)
To: qemu-devel, qemu-trivial
Cc: Alistair Francis, Bin Meng, Christian Schoenebeck, Gerd Hoffmann,
Greg Kurz, Jason Wang, Magnus Damm, Michael S. Tsirkin,
Palmer Dabbelt, Pavel Pisa, Peter Maydell, Vikram Garhwal,
Yoshinori Sato, qemu-arm, qemu-riscv
%s/return ;/return;
Signed-off-by: Bin Meng <bmeng@tinylab.org>
---
include/hw/elf_ops.h | 2 +-
hw/9pfs/9p.c | 2 +-
hw/dma/pl330.c | 2 +-
hw/net/can/can_sja1000.c | 2 +-
hw/timer/renesas_cmt.c | 2 +-
hw/timer/renesas_tmr.c | 8 ++++----
hw/virtio/virtio-pci.c | 2 +-
target/riscv/vector_helper.c | 2 +-
target/rx/op_helper.c | 4 ++--
ui/vnc-jobs.c | 2 +-
ui/vnc.c | 2 +-
11 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h
index 7c3b1d0f6c..fbe0b1e956 100644
--- a/include/hw/elf_ops.h
+++ b/include/hw/elf_ops.h
@@ -117,7 +117,7 @@ static void glue(load_symbols, SZ)(struct elfhdr *ehdr, int fd, int must_swab,
shdr_table = load_at(fd, ehdr->e_shoff,
sizeof(struct elf_shdr) * ehdr->e_shnum);
if (!shdr_table) {
- return ;
+ return;
}
if (must_swab) {
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index aebadeaa03..76c591a01b 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -1786,7 +1786,7 @@ static void coroutine_fn v9fs_walk(void *opaque)
err = pdu_unmarshal(pdu, offset, "ddw", &fid, &newfid, &nwnames);
if (err < 0) {
pdu_complete(pdu, err);
- return ;
+ return;
}
offset += err;
diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index 08e5938ec7..e5d521c329 100644
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -1328,7 +1328,7 @@ static void pl330_debug_exec(PL330State *s)
}
if (!insn) {
pl330_fault(ch, PL330_FAULT_UNDEF_INSTR | PL330_FAULT_DBG_INSTR);
- return ;
+ return;
}
ch->stall = 0;
insn->exec(ch, opcode, args, insn->size - 1);
diff --git a/hw/net/can/can_sja1000.c b/hw/net/can/can_sja1000.c
index e0f76d3eb3..73201f9139 100644
--- a/hw/net/can/can_sja1000.c
+++ b/hw/net/can/can_sja1000.c
@@ -431,7 +431,7 @@ void can_sja_mem_write(CanSJA1000State *s, hwaddr addr, uint64_t val,
(unsigned long long)val, (unsigned int)addr);
if (addr > CAN_SJA_MEM_SIZE) {
- return ;
+ return;
}
if (s->clock & 0x80) { /* PeliCAN Mode */
diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c
index 2e0fd21a36..69eabc678a 100644
--- a/hw/timer/renesas_cmt.c
+++ b/hw/timer/renesas_cmt.c
@@ -57,7 +57,7 @@ static void update_events(RCMTState *cmt, int ch)
if ((cmt->cmstr & (1 << ch)) == 0) {
/* count disable, so not happened next event. */
- return ;
+ return;
}
next_time = cmt->cmcor[ch] - cmt->cmcnt[ch];
next_time *= NANOSECONDS_PER_SECOND;
diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c
index d96002e1ee..c15f654738 100644
--- a/hw/timer/renesas_tmr.c
+++ b/hw/timer/renesas_tmr.c
@@ -67,18 +67,18 @@ static void update_events(RTMRState *tmr, int ch)
int i, event;
if (tmr->tccr[ch] == 0) {
- return ;
+ return;
}
if (FIELD_EX8(tmr->tccr[ch], TCCR, CSS) == 0) {
/* external clock mode */
/* event not happened */
- return ;
+ return;
}
if (FIELD_EX8(tmr->tccr[0], TCCR, CSS) == CSS_CASCADING) {
/* cascading mode */
if (ch == 1) {
tmr->next[ch] = none;
- return ;
+ return;
}
diff[cmia] = concat_reg(tmr->tcora) - concat_reg(tmr->tcnt);
diff[cmib] = concat_reg(tmr->tcorb) - concat_reg(tmr->tcnt);
@@ -384,7 +384,7 @@ static void timer_events(RTMRState *tmr, int ch)
tmr->tcorb[ch]) & 0xff;
} else {
if (ch == 1) {
- return ;
+ return;
}
tcnt = issue_event(tmr, ch, 16,
concat_reg(tmr->tcnt),
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index e7d80242b7..34db51e241 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1675,7 +1675,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
if (virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) {
error_setg(errp, "VIRTIO_F_IOMMU_PLATFORM was supported by"
" neither legacy nor transitional device");
- return ;
+ return;
}
/*
* Legacy and transitional devices use specific subsystem IDs.
diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
index b94f809eb3..0020b9a95d 100644
--- a/target/riscv/vector_helper.c
+++ b/target/riscv/vector_helper.c
@@ -211,7 +211,7 @@ static void vext_set_elems_1s(void *base, uint32_t is_agnostic, uint32_t cnt,
return;
}
if (tot - cnt == 0) {
- return ;
+ return;
}
memset(base + cnt, -1, tot - cnt);
}
diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c
index 9ca32dcc82..acce650185 100644
--- a/target/rx/op_helper.c
+++ b/target/rx/op_helper.c
@@ -286,7 +286,7 @@ void helper_suntil(CPURXState *env, uint32_t sz)
uint32_t tmp;
tcg_debug_assert(sz < 3);
if (env->regs[3] == 0) {
- return ;
+ return;
}
do {
tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
@@ -305,7 +305,7 @@ void helper_swhile(CPURXState *env, uint32_t sz)
uint32_t tmp;
tcg_debug_assert(sz < 3);
if (env->regs[3] == 0) {
- return ;
+ return;
}
do {
tmp = cpu_ldufn[sz](env, env->regs[1], GETPC());
diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
index 4562bf8928..886f9bf611 100644
--- a/ui/vnc-jobs.c
+++ b/ui/vnc-jobs.c
@@ -373,7 +373,7 @@ void vnc_start_worker_thread(void)
VncJobQueue *q;
if (vnc_worker_thread_running())
- return ;
+ return;
q = vnc_queue_init();
qemu_thread_create(&q->thread, "vnc_worker", vnc_worker_thread, q,
diff --git a/ui/vnc.c b/ui/vnc.c
index acb3629cd8..88f55cbf3c 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3085,7 +3085,7 @@ static void vnc_rect_updated(VncDisplay *vd, int x, int y, struct timeval * tv)
rect = vnc_stat_rect(vd, x, y);
if (rect->updated) {
- return ;
+ return;
}
rect->times[rect->idx] = *tv;
rect->idx = (rect->idx + 1) % ARRAY_SIZE(rect->times);
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-11-03 17:01 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-26 4:40 [PATCH] treewide: Remove the unnecessary space before semicolon Bin Meng
2022-10-26 4:54 ` Stefan Roese
2022-11-03 16:58 ` Tom Rini
-- strict thread matches above, loose matches on Subject: below --
2022-10-24 7:28 Bin Meng
2022-10-24 8:17 ` Pavel Pisa
2022-10-24 8:31 ` Michael S. Tsirkin
2022-10-24 10:17 ` Peter Maydell
2022-10-24 11:25 ` Christian Schoenebeck
2022-10-24 11:42 ` Laurent Vivier
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.