Author: mav
Date: Sun Apr 2 10:59:30 2017
New Revision: 316409
URL: https://svnweb.freebsd.org/changeset/base/316409
Log:
MFC r315682, r315683: Remove some dead code left after r246713.
Modified:
stable/10/sys/dev/isp/isp_pci.c
stable/10/sys/dev/isp/isp_sbus.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/isp/isp_pci.c
==============================================================================
--- stable/10/sys/dev/isp/isp_pci.c Sun Apr 2 10:58:55 2017
(r316408)
+++ stable/10/sys/dev/isp/isp_pci.c Sun Apr 2 10:59:30 2017
(r316409)
@@ -1835,24 +1835,11 @@ typedef struct {
void *cmd_token;
void *rq; /* original request */
int error;
- bus_size_t mapsize;
} mush_t;
#define MUSHERR_NOQENTRIES -2
#ifdef ISP_TARGET_MODE
-static void tdma2_2(void *, bus_dma_segment_t *, int, bus_size_t, int);
-static void tdma2(void *, bus_dma_segment_t *, int, int);
-
-static void
-tdma2_2(void *arg, bus_dma_segment_t *dm_segs, int nseg, bus_size_t mapsize,
int error)
-{
- mush_t *mp;
- mp = (mush_t *)arg;
- mp->mapsize = mapsize;
- tdma2(arg, dm_segs, nseg, error);
-}
-
static void
tdma2(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
{
@@ -1916,18 +1903,6 @@ tdma2(void *arg, bus_dma_segment_t *dm_s
}
#endif
-static void dma2_2(void *, bus_dma_segment_t *, int, bus_size_t, int);
-static void dma2(void *, bus_dma_segment_t *, int, int);
-
-static void
-dma2_2(void *arg, bus_dma_segment_t *dm_segs, int nseg, bus_size_t mapsize,
int error)
-{
- mush_t *mp;
- mp = (mush_t *)arg;
- mp->mapsize = mapsize;
- dma2(arg, dm_segs, nseg, error);
-}
-
static void
dma2(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
{
@@ -1997,7 +1972,6 @@ isp_pci_dmasetup(ispsoftc_t *isp, struct
{
mush_t mush, *mp;
void (*eptr)(void *, bus_dma_segment_t *, int, int);
- void (*eptr2)(void *, bus_dma_segment_t *, int, bus_size_t, int);
int error;
mp = &mush;
@@ -2005,19 +1979,13 @@ isp_pci_dmasetup(ispsoftc_t *isp, struct
mp->cmd_token = csio;
mp->rq = ff;
mp->error = 0;
- mp->mapsize = 0;
#ifdef ISP_TARGET_MODE
- if (csio->ccb_h.func_code == XPT_CONT_TARGET_IO) {
+ if (csio->ccb_h.func_code == XPT_CONT_TARGET_IO)
eptr = tdma2;
- eptr2 = tdma2_2;
- } else
+ else
#endif
- {
eptr = dma2;
- eptr2 = dma2_2;
- }
-
error = bus_dmamap_load_ccb(isp->isp_osinfo.dmat, PISP_PCMD(csio)->dmap,
(union ccb *)csio, eptr, mp, 0);
Modified: stable/10/sys/dev/isp/isp_sbus.c
==============================================================================
--- stable/10/sys/dev/isp/isp_sbus.c Sun Apr 2 10:58:55 2017
(r316408)
+++ stable/10/sys/dev/isp/isp_sbus.c Sun Apr 2 10:59:30 2017
(r316409)
@@ -585,13 +585,10 @@ typedef struct {
void *cmd_token;
void *rq; /* original request */
int error;
- bus_size_t mapsize;
} mush_t;
#define MUSHERR_NOQENTRIES -2
-static void dma2(void *, bus_dma_segment_t *, int, int);
-
static void
dma2(void *arg, bus_dma_segment_t *dm_segs, int nseg, int error)
{
@@ -634,7 +631,6 @@ static int
isp_sbus_dmasetup(ispsoftc_t *isp, struct ccb_scsiio *csio, void *ff)
{
mush_t mush, *mp;
- void (*eptr)(void *, bus_dma_segment_t *, int, int);
int error;
mp = &mush;
@@ -642,12 +638,9 @@ isp_sbus_dmasetup(ispsoftc_t *isp, struc
mp->cmd_token = csio;
mp->rq = ff;
mp->error = 0;
- mp->mapsize = 0;
-
- eptr = dma2;
error = bus_dmamap_load_ccb(isp->isp_osinfo.dmat,
- PISP_PCMD(csio)->dmap, (union ccb *)csio, eptr, mp, 0);
+ PISP_PCMD(csio)->dmap, (union ccb *)csio, dma2, mp, 0);
if (error == EINPROGRESS) {
bus_dmamap_unload(isp->isp_osinfo.dmat, PISP_PCMD(csio)->dmap);
mp->error = EINVAL;
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
