Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Feb 2009 20:26:28 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r188126 - head/sys/dev/ata
Message-ID:  <200902042026.n14KQSAN090227@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902042026.n14KQSAN090227>