From owner-svn-src-all@FreeBSD.ORG Wed Feb 4 20:26:28 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7118E106566C; Wed, 4 Feb 2009 20:26:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 45C1E8FC1A; Wed, 4 Feb 2009 20:26:28 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n14KQSiF090231; Wed, 4 Feb 2009 20:26:28 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n14KQSAN090227; Wed, 4 Feb 2009 20:26:28 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200902042026.n14KQSAN090227@svn.freebsd.org> From: Warner Losh Date: Wed, 4 Feb 2009 20:26:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188126 - head/sys/dev/ata X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 04 Feb 2009 20:26:29 -0000 Author: imp Date: Wed Feb 4 20:26:27 2009 New Revision: 188126 URL: http://svn.freebsd.org/changeset/base/188126 Log: Fix shutdown routine to return 0 and change signature from void return to int. Modified: head/sys/dev/ata/ata-disk.c head/sys/dev/ata/atapi-cd.c head/sys/dev/ata/atapi-fd.c head/sys/dev/ata/atapi-tape.c Modified: head/sys/dev/ata/ata-disk.c ============================================================================== --- head/sys/dev/ata/ata-disk.c Wed Feb 4 20:23:42 2009 (r188125) +++ head/sys/dev/ata/ata-disk.c Wed Feb 4 20:26:27 2009 (r188126) @@ -182,13 +182,14 @@ ad_detach(device_t dev) return 0; } -static void +static int ad_shutdown(device_t dev) { struct ata_device *atadev = device_get_softc(dev); if (atadev->param.support.command2 & ATA_SUPPORT_FLUSHCACHE) ata_controlcmd(dev, ATA_FLUSHCACHE, 0, 0, 0); + return 0; } static int Modified: head/sys/dev/ata/atapi-cd.c ============================================================================== --- head/sys/dev/ata/atapi-cd.c Wed Feb 4 20:23:42 2009 (r188125) +++ head/sys/dev/ata/atapi-cd.c Wed Feb 4 20:26:27 2009 (r188126) @@ -143,13 +143,14 @@ acd_detach(device_t dev) return 0; } -static void +static int acd_shutdown(device_t dev) { struct ata_device *atadev = device_get_softc(dev); if (atadev->param.support.command2 & ATA_SUPPORT_FLUSHCACHE) ata_controlcmd(dev, ATA_FLUSHCACHE, 0, 0, 0); + return 0; } static int Modified: head/sys/dev/ata/atapi-fd.c ============================================================================== --- head/sys/dev/ata/atapi-fd.c Wed Feb 4 20:23:42 2009 (r188125) +++ head/sys/dev/ata/atapi-fd.c Wed Feb 4 20:26:27 2009 (r188126) @@ -132,13 +132,14 @@ afd_detach(device_t dev) return 0; } -static void +static int afd_shutdown(device_t dev) { struct ata_device *atadev = device_get_softc(dev); if (atadev->param.support.command2 & ATA_SUPPORT_FLUSHCACHE) ata_controlcmd(dev, ATA_FLUSHCACHE, 0, 0, 0); + return 0; } static int Modified: head/sys/dev/ata/atapi-tape.c ============================================================================== --- head/sys/dev/ata/atapi-tape.c Wed Feb 4 20:23:42 2009 (r188125) +++ head/sys/dev/ata/atapi-tape.c Wed Feb 4 20:26:27 2009 (r188126) @@ -175,13 +175,14 @@ ast_detach(device_t dev) return 0; } -static void +static int ast_shutdown(device_t dev) { struct ata_device *atadev = device_get_softc(dev); if (atadev->param.support.command2 & ATA_SUPPORT_FLUSHCACHE) ata_controlcmd(dev, ATA_FLUSHCACHE, 0, 0, 0); + return 0; } static int