From owner-svn-src-head@freebsd.org Fri Feb 24 00:05:33 2017 Return-Path: Delivered-To: svn-src-head@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 46A0CCEB77A for ; Fri, 24 Feb 2017 00:05:33 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1a.eu.mailhop.org (outbound1a.eu.mailhop.org [52.58.109.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D91ABBD9 for ; Fri, 24 Feb 2017 00:05:31 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: f1aa1e07-fa24-11e6-95b5-6dfd7dbb0ee5 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 73.78.92.27 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [73.78.92.27]) by outbound1.eu.mailhop.org (Halon) with ESMTPSA id f1aa1e07-fa24-11e6-95b5-6dfd7dbb0ee5; Fri, 24 Feb 2017 00:05:27 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.15.2) with ESMTP id v1O05HCN002052; Thu, 23 Feb 2017 17:05:17 -0700 (MST) (envelope-from ian@freebsd.org) Message-ID: <1487894717.25520.18.camel@freebsd.org> Subject: Re: svn commit: r314186 - head/sys/arm/at91 From: Ian Lepore To: "Pedro F. Giffuni" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Date: Thu, 23 Feb 2017 17:05:17 -0700 In-Reply-To: <201702232348.v1NNmiED031217@repo.freebsd.org> References: <201702232348.v1NNmiED031217@repo.freebsd.org> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Feb 2017 00:05:33 -0000 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 > > Log: >   at91: double assignment. >    >   Found with: coccinelle (da.cocci) >   Suggested by: cognet > > Modified: >   head/sys/arm/at91/at91sam9260.c > > Modified: head/sys/arm/at91/at91sam9260.c > ===================================================================== > ========= > --- head/sys/arm/at91/at91sam9260.c Thu Feb 23 22:46:01 2017 > (r314185) > +++ head/sys/arm/at91/at91sam9260.c Thu Feb 23 23:48:44 2017 > (r314186) > @@ -193,7 +193,6 @@ at91_clock_init(void) >    */ >   clk = at91_pmc_clock_ref("pllb"); >   clk->pll_min_in    = SAM9260_PLL_B_MIN_IN_FREQ; > /*   1 MHz */ > - clk->pll_max_in    = SAM9260_PLL_B_MAX_IN_FREQ; > /*   5 MHz */ >   clk->pll_max_in    = 2999999; > /*  ~3 MHz */ >   clk->pll_min_out   = SAM9260_PLL_B_MIN_OUT_FREQ; /*   > 70 MHz */ >   clk->pll_max_out   = SAM9260_PLL_B_MAX_OUT_FREQ; /* > 130 MHz */ > 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). -- ian