Module Name: src
Committed By: dyoung
Date: Sun Sep 13 21:24:58 UTC 2009
Modified Files:
src/sys/dev/ic: mfi.c
Log Message:
Delete whitespace at ends of lines. No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/mfi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.29 src/sys/dev/ic/mfi.c:1.30
--- src/sys/dev/ic/mfi.c:1.29 Thu Aug 27 09:40:39 2009
+++ src/sys/dev/ic/mfi.c Sun Sep 13 21:24:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.29 2009/08/27 09:40:39 bouyer Exp $ */
+/* $NetBSD: mfi.c,v 1.30 2009/09/13 21:24:58 dyoung Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <ma...@peereboom.us>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.29 2009/08/27 09:40:39 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.30 2009/09/13 21:24:58 dyoung Exp $");
#include "bio.h"
@@ -114,7 +114,7 @@
static void mfi_xscale_intr_dis(struct mfi_softc *sc);
static int mfi_xscale_intr(struct mfi_softc *sc);
static void mfi_xscale_post(struct mfi_softc *sc, struct mfi_ccb *ccb);
-
+
static const struct mfi_iop_ops mfi_iop_xscale = {
mfi_xscale_fw_state,
mfi_xscale_intr_dis,
@@ -122,13 +122,13 @@
mfi_xscale_intr,
mfi_xscale_post
};
-
+
static uint32_t mfi_ppc_fw_state(struct mfi_softc *sc);
static void mfi_ppc_intr_ena(struct mfi_softc *sc);
static void mfi_ppc_intr_dis(struct mfi_softc *sc);
static int mfi_ppc_intr(struct mfi_softc *sc);
static void mfi_ppc_post(struct mfi_softc *sc, struct mfi_ccb *ccb);
-
+
static const struct mfi_iop_ops mfi_iop_ppc = {
mfi_ppc_fw_state,
mfi_ppc_intr_dis,
@@ -136,7 +136,7 @@
mfi_ppc_intr,
mfi_ppc_post
};
-
+
#define mfi_fw_state(_s) ((_s)->sc_iop->mio_fw_state(_s))
#define mfi_intr_enable(_s) ((_s)->sc_iop->mio_intr_ena(_s))
#define mfi_intr_disable(_s) ((_s)->sc_iop->mio_intr_dis(_s))
@@ -312,7 +312,7 @@
if (bus_dmamap_create(sc->sc_dmat, size, 1, size, 0,
BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &mm->am_map) != 0)
- goto amfree;
+ goto amfree;
if (bus_dmamem_alloc(sc->sc_dmat, size, PAGE_SIZE, 0, &mm->am_seg, 1,
&nsegs, BUS_DMA_NOWAIT) != 0)
@@ -882,7 +882,7 @@
ccb->ccb_flags |= MFI_CCB_F_ERR;
return 1;
}
-
+
return 0;
}
@@ -1402,7 +1402,7 @@
}
mfi_put_ccb(ccb);
scsipi_done(xs);
- } else
+ } else
wakeup(ccb);
}
@@ -2079,7 +2079,7 @@
{
return mfi_read(sc, MFI_OMSG0);
}
-
+
static void
mfi_xscale_intr_dis(struct mfi_softc *sc)
{
@@ -2091,7 +2091,7 @@
{
mfi_write(sc, MFI_OMSK, MFI_ENABLE_INTR);
}
-
+
static int
mfi_xscale_intr(struct mfi_softc *sc)
{
@@ -2105,7 +2105,7 @@
mfi_write(sc, MFI_OSTS, status);
return 1;
}
-
+
static void
mfi_xscale_post(struct mfi_softc *sc, struct mfi_ccb *ccb)
{
@@ -2119,13 +2119,13 @@
mfi_write(sc, MFI_IQP, (ccb->ccb_pframe >> 3) |
ccb->ccb_extra_frames);
}
-
+
static uint32_t
mfi_ppc_fw_state(struct mfi_softc *sc)
{
return mfi_read(sc, MFI_OSP);
}
-
+
static void
mfi_ppc_intr_dis(struct mfi_softc *sc)
{
@@ -2140,21 +2140,21 @@
mfi_write(sc, MFI_ODC, 0xffffffff);
mfi_write(sc, MFI_OMSK, ~0x80000004);
}
-
+
static int
mfi_ppc_intr(struct mfi_softc *sc)
{
uint32_t status;
-
+
status = mfi_read(sc, MFI_OSTS);
if (!ISSET(status, MFI_OSTS_PPC_INTR_VALID))
return 0;
-
+
/* write status back to acknowledge interrupt */
mfi_write(sc, MFI_ODC, status);
return 1;
}
-
+
static void
mfi_ppc_post(struct mfi_softc *sc, struct mfi_ccb *ccb)
{
