update to 2.6.9-rc1

[linux-flexiantxendom0-3.2.10.git] / drivers / scsi / aic7xxx / aic79xx_osm.c

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 68b4539..5bbc4ad 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -513,9 +513,6 @@ static void ahd_linux_dv_su(struct ahd_softc *ahd,
                            struct scsi_cmnd *cmd,
                            struct ahd_devinfo *devinfo,
                            struct ahd_linux_target *targ);
-static __inline int
-          ahd_linux_dv_fallback(struct ahd_softc *ahd,
-                                struct ahd_devinfo *devinfo);
 static int ahd_linux_fallback(struct ahd_softc *ahd,
                              struct ahd_devinfo *devinfo);
 static __inline int ahd_linux_dv_fallback(struct ahd_softc *ahd,
@@ -2915,6 +2912,19 @@ out:
        ahd_unlock(ahd, &s);
 }
 
+static __inline int
+ahd_linux_dv_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
+{
+       u_long s;
+       int retval;
+
+       ahd_lock(ahd, &s);
+       retval = ahd_linux_fallback(ahd, devinfo);
+       ahd_unlock(ahd, &s);
+
+       return (retval);
+}
+
 static void
 ahd_linux_dv_transition(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
                        struct ahd_devinfo *devinfo,
@@ -3551,19 +3561,6 @@ ahd_linux_dv_su(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
        cmd->cmnd[4] = le | SSS_START;
 }
 
-static __inline int
-ahd_linux_dv_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
-{
-       u_long s;
-       int retval;
-
-       ahd_lock(ahd, &s);
-       retval = ahd_linux_fallback(ahd, devinfo);
-       ahd_unlock(ahd, &s);
-
-       return (retval);
-}
-
 static int
 ahd_linux_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
 {