On Mon, 2013-01-21 at 14:02 +0100, Julia Lawall wrote: > From: Julia Lawall <Julia.Lawall@xxxxxxx> > > Delete successive tests to the same location. rc was previously tested and > not subsequently updated. efx_phc_adjtime can return an error code, so the > call is updated so that is tested instead. > > A simplified version of the semantic match that finds this problem is as > follows: (http://coccinelle.lip6.fr/) > > // <smpl> > @s exists@ > local idexpression y; > expression x,e; > @@ > > *if ( \(x == NULL\|IS_ERR(x)\|y != 0\) ) > { ... when forall > return ...; } > ... when != \(y = e\|y += e\|y -= e\|y |= e\|y &= e\|y++\|y--\|&y\) > when != \(XT_GETPAGE(...,y)\|WMI_CMD_BUF(...)\) > *if ( \(x == NULL\|IS_ERR(x)\|y != 0\) ) > { ... when forall > return ...; } > // </smpl> > > Signed-off-by: Julia Lawall <Julia.Lawall@xxxxxxx> Acked-by: Ben Hutchings <bhutchings@xxxxxxxxxxxxxx> > --- > Not tested. I'm not familiar with this function, so I don't know whether it > is desirable to test its result. Yes, the result should be tested. Thanks. Ben. > drivers/net/ethernet/sfc/ptp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c > index 0767043..3f93624 100644 > --- a/drivers/net/ethernet/sfc/ptp.c > +++ b/drivers/net/ethernet/sfc/ptp.c > @@ -1439,7 +1439,7 @@ static int efx_phc_settime(struct ptp_clock_info *ptp, > > delta = timespec_sub(*e_ts, time_now); > > - efx_phc_adjtime(ptp, timespec_to_ns(&delta)); > + rc = efx_phc_adjtime(ptp, timespec_to_ns(&delta)); > if (rc != 0) > return rc; > > -- Ben Hutchings, Staff Engineer, Solarflare Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked. -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
