From owner-svn-src-head@FreeBSD.ORG  Thu Nov 19 19:19:38 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 526ED1065672;
	Thu, 19 Nov 2009 19:19:38 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 2405E8FC08;
	Thu, 19 Nov 2009 19:19:38 +0000 (UTC)
Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net
	[66.111.2.69])
	by cyrus.watson.org (Postfix) with ESMTPSA id 9D1FF46B2C;
	Thu, 19 Nov 2009 14:19:37 -0500 (EST)
Received: from jhbbsd.hudson-trading.com (unknown [209.249.190.8])
	by bigwig.baldwin.cx (Postfix) with ESMTPA id DEBC18A020;
	Thu, 19 Nov 2009 14:19:36 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Julian Elischer <julian@elischer.org>
Date: Thu, 19 Nov 2009 14:19:29 -0500
User-Agent: KMail/1.9.7
References: <200911191821.nAJILpZ6014634@svn.freebsd.org>
	<4B0590B2.1010007@elischer.org>
In-Reply-To: <4B0590B2.1010007@elischer.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200911191419.30432.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1
	(bigwig.baldwin.cx); Thu, 19 Nov 2009 14:19:36 -0500 (EST)
X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx
X-Virus-Status: Clean
X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00,RDNS_NONE
	autolearn=no version=3.2.5
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r199538 - head/sys/dev/lmc
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Nov 2009 19:19:38 -0000

On Thursday 19 November 2009 1:38:42 pm Julian Elischer wrote:
> John Baldwin wrote:
> > Author: jhb
> > Date: Thu Nov 19 18:21:51 2009
> 
> > +#  if (__FreeBSD_version >= 500000)
> > +  callout_init(&sc->callout, 0);
> > +#  else  /* FreeBSD-4 */
> > +  callout_init(&sc->callout);
> > +#  endif
> > +
> 
> 
> I think the OpenBSD and _FreeBSD_version >= 500000
> conditions can probably be removed..
> 
> 
> >  
> >  #ifdef __FreeBSD__
> > +  struct callout callout;	/* watchdog needs this                  */
> >    struct device	*dev;		/* base device pointer                     */
> >    bus_space_tag_t csr_tag;	/* bus_space needs this                    */
> >    bus_space_handle_t csr_handle;/* bus_space_needs this                    
*/
> 
> along with #ifdef __FreeBSD__

Go for it. :)  I was just removing if_watchdog use in this sweep.  No one 
stepped up to test this since I posted it almost 2 weeks ago though, so I'm 
not sure if there are any users of this.

-- 
John Baldwin