From owner-svn-src-head@FreeBSD.ORG Thu Nov 19 21:50:54 2009 Return-Path: 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 645221065789 for ; Thu, 19 Nov 2009 21:50:54 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outJ.internet-mail-service.net (outj.internet-mail-service.net [216.240.47.233]) by mx1.freebsd.org (Postfix) with ESMTP id 4967B8FC16 for ; Thu, 19 Nov 2009 21:50:54 +0000 (UTC) Received: from idiom.com (mx0.idiom.com [216.240.32.160]) by out.internet-mail-service.net (Postfix) with ESMTP id 3362714DF1D; Thu, 19 Nov 2009 13:50:54 -0800 (PST) X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e Received: from julian-mac.elischer.org (h-67-100-89-137.snfccasy.static.covad.net [67.100.89.137]) by idiom.com (Postfix) with ESMTP id D1EA32D6013; Thu, 19 Nov 2009 13:50:52 -0800 (PST) Message-ID: <4B05BDBA.30602@elischer.org> Date: Thu, 19 Nov 2009 13:50:50 -0800 From: Julian Elischer User-Agent: Thunderbird 2.0.0.23 (Macintosh/20090812) MIME-Version: 1.0 To: John Baldwin References: <200911191821.nAJILpZ6014634@svn.freebsd.org> <4B0590B2.1010007@elischer.org> <200911191419.30432.jhb@freebsd.org> In-Reply-To: <200911191419.30432.jhb@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2009 21:50:54 -0000 John Baldwin wrote: > 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. > I didn't realize it was an externally maintained driver... stripping saves some space.. -rw-r--r-- 1 root wheel 212883 Nov 19 11:54 if_lmc.c -rw-r--r-- 1 root wheel 76600 Nov 19 11:54 if_lmc.h -rw-r--r-- 1 root wheel 142163 Nov 19 13:41 stripped.c -rw-r--r-- 1 root wheel 61537 Nov 19 13:47 stripped.h but I'll ask the author first..