From owner-svn-src-stable-10@freebsd.org Sun Apr 2 10:59:32 2017 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 190B5D1D96B; Sun, 2 Apr 2017 10:59:32 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA4B1175; Sun, 2 Apr 2017 10:59:31 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v32AxVGT042293; Sun, 2 Apr 2017 10:59:31 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v32AxUNM042291; Sun, 2 Apr 2017 10:59:30 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201704021059.v32AxUNM042291@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Sun, 2 Apr 2017 10:59:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r316409 - stable/10/sys/dev/isp X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Apr 2017 10:59:32 -0000 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;