From owner-svn-src-all@freebsd.org Fri Feb 24 00:23:41 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CAA28CEBD51 for ; Fri, 24 Feb 2017 00:23:41 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1.freebsd.org (Postfix) with SMTP id 90B6F16DD for ; Fri, 24 Feb 2017 00:23:41 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: (qmail 49406 invoked by uid 99); 24 Feb 2017 00:23:40 -0000 Received: from mail-relay.apache.org (HELO mail-relay.apache.org) (140.211.11.15) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Feb 2017 00:23:40 +0000 Received: from [192.168.0.104] (unknown [190.157.139.67]) by mail-relay.apache.org (ASF Mail Server at mail-relay.apache.org) with ESMTPSA id 6827E1A03A6; Fri, 24 Feb 2017 00:23:39 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 10.2 \(3259\)) Subject: Re: svn commit: r314186 - head/sys/arm/at91 From: Pedro Giffuni In-Reply-To: <1487894717.25520.18.camel@freebsd.org> Date: Thu, 23 Feb 2017 19:23:36 -0500 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <66C0031D-1C8C-4922-B452-4E5874D75156@FreeBSD.org> References: <201702232348.v1NNmiED031217@repo.freebsd.org> <1487894717.25520.18.camel@freebsd.org> To: Ian Lepore X-Mailer: Apple Mail (2.3259) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Feb 2017 00:23:41 -0000 Hi; > Il giorno 23 feb 2017, alle ore 19:05, Ian Lepore 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.