From owner-svn-src-stable@FreeBSD.ORG Fri Oct 8 23:29:46 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51012106566B; Fri, 8 Oct 2010 23:29:46 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E311D8FC17; Fri, 8 Oct 2010 23:29:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o98NTjVm017723; Fri, 8 Oct 2010 23:29:45 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o98NTjTj017719; Fri, 8 Oct 2010 23:29:45 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201010082329.o98NTjTj017719@svn.freebsd.org> From: Pyun YongHyeon Date: Fri, 8 Oct 2010 23:29:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213638 - in stable/7/sys: dev/sis dev/tx pci X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Oct 2010 23:29:46 -0000 Author: yongari Date: Fri Oct 8 23:29:45 2010 New Revision: 213638 URL: http://svn.freebsd.org/changeset/base/213638 Log: MFC r188463: Fix shutdown prototypes. Modified: stable/7/sys/dev/sis/if_sis.c stable/7/sys/dev/tx/if_tx.c stable/7/sys/pci/if_tl.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/sis/if_sis.c ============================================================================== --- stable/7/sys/dev/sis/if_sis.c Fri Oct 8 23:16:02 2010 (r213637) +++ stable/7/sys/dev/sis/if_sis.c Fri Oct 8 23:29:45 2010 (r213638) @@ -2377,7 +2377,7 @@ sis_stop(struct sis_softc *sc) * Stop all chip I/O so that the kernel's probe routines don't * get confused by errant DMAs when rebooting. */ -static void +static int sis_shutdown(device_t dev) { struct sis_softc *sc; @@ -2386,6 +2386,7 @@ sis_shutdown(device_t dev) SIS_LOCK(sc); sis_stop(sc); SIS_UNLOCK(sc); + return (0); } static int Modified: stable/7/sys/dev/tx/if_tx.c ============================================================================== --- stable/7/sys/dev/tx/if_tx.c Fri Oct 8 23:16:02 2010 (r213637) +++ stable/7/sys/dev/tx/if_tx.c Fri Oct 8 23:29:45 2010 (r213638) @@ -120,7 +120,7 @@ static void epic_ifmedia_sts(struct ifne static int epic_probe(device_t); static int epic_attach(device_t); -static void epic_shutdown(device_t); +static int epic_shutdown(device_t); static int epic_detach(device_t); static void epic_release(epic_softc_t *); static struct epic_type *epic_devtype(device_t); @@ -508,7 +508,7 @@ epic_detach(device_t dev) * Stop all chip I/O so that the kernel's probe routines don't * get confused by errant DMAs when rebooting. */ -static void +static int epic_shutdown(device_t dev) { epic_softc_t *sc; @@ -516,6 +516,7 @@ epic_shutdown(device_t dev) sc = device_get_softc(dev); epic_stop(sc); + return (0); } /* Modified: stable/7/sys/pci/if_tl.c ============================================================================== --- stable/7/sys/pci/if_tl.c Fri Oct 8 23:16:02 2010 (r213637) +++ stable/7/sys/pci/if_tl.c Fri Oct 8 23:29:45 2010 (r213638) @@ -282,7 +282,7 @@ static void tl_init(void *); static void tl_init_locked(struct tl_softc *); static void tl_stop(struct tl_softc *); static void tl_watchdog(struct ifnet *); -static void tl_shutdown(device_t); +static int tl_shutdown(device_t); static int tl_ifmedia_upd(struct ifnet *); static void tl_ifmedia_sts(struct ifnet *, struct ifmediareq *); @@ -2347,7 +2347,7 @@ tl_stop(sc) * Stop all chip I/O so that the kernel's probe routines don't * get confused by errant DMAs when rebooting. */ -static void +static int tl_shutdown(dev) device_t dev; { @@ -2359,5 +2359,5 @@ tl_shutdown(dev) tl_stop(sc); TL_UNLOCK(sc); - return; + return (0); }