Date: Thu, 23 Feb 2017 19:23:36 -0500 From: Pedro Giffuni <pfg@FreeBSD.org> To: Ian Lepore <ian@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314186 - head/sys/arm/at91 Message-ID: <66C0031D-1C8C-4922-B452-4E5874D75156@FreeBSD.org> In-Reply-To: <1487894717.25520.18.camel@freebsd.org> References: <201702232348.v1NNmiED031217@repo.freebsd.org> <1487894717.25520.18.camel@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi; > Il giorno 23 feb 2017, alle ore 19:05, Ian Lepore <ian@freebsd.org> ha = scritto: >=20 > On Thu, 2017-02-23 at 23:48 +0000, Pedro F. Giffuni wrote: >> Author: pfg >> Date: Thu Feb 23 23:48:44 2017 >> New Revision: 314186 >> URL: https://svnweb.freebsd.org/changeset/base/314186 >>=20 >> Log: >> at91: double assignment. >> =20 >> Found with: coccinelle (da.cocci) >> Suggested by: cognet >>=20 >> Modified: >> head/sys/arm/at91/at91sam9260.c >>=20 >> Modified: head/sys/arm/at91/at91sam9260.c >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> =3D=3D=3D=3D=3D=3D=3D=3D=3D >> --- head/sys/arm/at91/at91sam9260.c Thu Feb 23 22:46:01 2017=09 >> (r314185) >> +++ head/sys/arm/at91/at91sam9260.c Thu Feb 23 23:48:44 2017=09 >> (r314186) >> @@ -193,7 +193,6 @@ at91_clock_init(void) >> */ >> clk =3D at91_pmc_clock_ref("pllb"); >> clk->pll_min_in =3D SAM9260_PLL_B_MIN_IN_FREQ; =09 >> /* 1 MHz */ >> - clk->pll_max_in =3D SAM9260_PLL_B_MAX_IN_FREQ; =09 >> /* 5 MHz */ >> clk->pll_max_in =3D 2999999; =09 >> /* ~3 MHz */ >> clk->pll_min_out =3D SAM9260_PLL_B_MIN_OUT_FREQ; /* =20 >> 70 MHz */ >> clk->pll_max_out =3D SAM9260_PLL_B_MAX_OUT_FREQ; /* >> 130 MHz */ >>=20 >=20 > Just looking at this by eye (but without digging out the at91 manuals) > I'd say this looks like fallout from a mismerge and the correct line = to > keep would be the named constant. Keeping the one that has actually > been in effect all this time isn't the same as keeping the right one, > and this deletion may remove the only clue someone might find when = they > eventually get around to debugging this (if ever, the sam9260 is a > pretty old chip). >=20 > -- ian >=20 >=20 According to SVN annotations it is not a mismerge:. The first line looks = more technical but cognet@ stated from the second one is correct and = matches the (long) initial comment. It=E2=80=99s also what is in effective use now, so I wouldn=E2=80=99t = change it unless someone with the hardware confirms first. Pedro.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?66C0031D-1C8C-4922-B452-4E5874D75156>