[PATCH 1/3] Staging: lustre: Replace comma with a semicolon

[PATCH 1/3] Staging: lustre: Replace comma with a semicolon

[Shraddha Barke]

Replace comma between expression statements by a semicolon.
The semantic patch used is as follows:

@@
expression e1,e2;
@@
e1
- ,
+ ;
e2;
---
 drivers/staging/lustre/lustre/libcfs/libcfs_string.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
index 4dde8e0..efe5e66 100644
--- a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
+++ b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
@@ -400,7 +400,7 @@ cfs_expr_list_free(struct cfs_expr_list *expr_list)
 		struct cfs_range_expr *expr;
 
 		expr = list_entry(expr_list->el_exprs.next,
-				      struct cfs_range_expr, re_link),
+				      struct cfs_range_expr, re_link);
 		list_del(&expr->re_link);
 		LIBCFS_FREE(expr, sizeof(*expr));
 	}
-- 
2.1.0

[PATCH 2/3] Staging: lustre: Replace comma with a semicolon.

[Shraddha Barke]

Replace comma between expression statements by a semicolon.
The semantic patch used is as follows:

@@
expression e1,e2;
@@
e1
- ,
+ ;
e2;
---
 drivers/staging/lustre/lustre/mgc/mgc_request.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lustre/mgc/mgc_request.c b/drivers/staging/lustre/lustre/mgc/mgc_request.c
index 562bd95..019ee2f 100644
--- a/drivers/staging/lustre/lustre/mgc/mgc_request.c
+++ b/drivers/staging/lustre/lustre/mgc/mgc_request.c
@@ -1232,7 +1232,7 @@ static int mgc_apply_recover_logs(struct obd_device *mgc,
 		pos += sprintf(obdname + pos, "-%s%04x",
 				  is_ost ? "OST" : "MDT", entry->mne_index);
 
-		cname = is_ost ? "osc" : "mdc",
+		cname = is_ost ? "osc" : "mdc";
 		pos += sprintf(obdname + pos, "-%s-%s", cname, inst);
 		lustre_cfg_bufs_reset(&bufs, obdname);
 
-- 
2.1.0

[PATCH 3/3] Staging: netlogic: Replace comma with a semicolon

[Shraddha Barke]

Replace comma between expression statements by a semicolon.
The semantic patch used is as follows:

@@
expression e1,e2;
@@
e1
- ,
+ ;
e2;
---
 drivers/staging/netlogic/platform_net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/netlogic/platform_net.c b/drivers/staging/netlogic/platform_net.c
index 77c3c35..e914147 100644
--- a/drivers/staging/netlogic/platform_net.c
+++ b/drivers/staging/netlogic/platform_net.c
@@ -163,7 +163,7 @@ static void xls_gmac_init(void)
 	switch (nlm_prom_info.board_major_version) {
 	case 12:
 		/* first block RGMII or XAUI, use RGMII */
-		ndata0.phy_interface = PHY_INTERFACE_MODE_RGMII,
+		ndata0.phy_interface = PHY_INTERFACE_MODE_RGMII;
 		ndata0.tx_stnid[0] = FMN_STNID_GMAC0_TX0;
 		ndata0.phy_addr[0] = 0;
 
-- 
2.1.0

Re: [PATCH 1/3] Staging: lustre: Replace comma with a semicolon

[Julia Lawall]

1 and 2 need to have different subjects (the [PATCH] part is not enough,
because it will go away).

julia

On Tue, 4 Aug 2015, Shraddha Barke wrote:

> Replace comma between expression statements by a semicolon.
> The semantic patch used is as follows:
>
> @@
> expression e1,e2;
> @@
> e1
> - ,
> + ;
> e2;
> ---
>  drivers/staging/lustre/lustre/libcfs/libcfs_string.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
> index 4dde8e0..efe5e66 100644
> --- a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
> +++ b/drivers/staging/lustre/lustre/libcfs/libcfs_string.c
> @@ -400,7 +400,7 @@ cfs_expr_list_free(struct cfs_expr_list *expr_list)
>  		struct cfs_range_expr *expr;
>
>  		expr = list_entry(expr_list->el_exprs.next,
> -				      struct cfs_range_expr, re_link),
> +				      struct cfs_range_expr, re_link);
>  		list_del(&expr->re_link);
>  		LIBCFS_FREE(expr, sizeof(*expr));
>  	}
> --
> 2.1.0
>
>

Re: [PATCH 1/3] Staging: lustre: Replace comma with a semicolon

[Julia Lawall]

On Tue, 4 Aug 2015, Shraddha Barke wrote:

>
> Should I resend the entire patch series as v2 ? Or only the first two
> patches?

The entire series.  You can say under the --- that there is no change in
the cases where there is no change.

julia