From owner-svn-src-all@FreeBSD.ORG Tue Jan 13 23:46:45 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A30E21065676; Tue, 13 Jan 2009 23:46:45 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8F2C98FC12; Tue, 13 Jan 2009 23:46:45 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DNkjpG019899; Tue, 13 Jan 2009 23:46:45 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0DNkj7Q019898; Tue, 13 Jan 2009 23:46:45 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <200901132346.n0DNkj7Q019898@svn.freebsd.org> From: Xin LI Date: Tue, 13 Jan 2009 23:46:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187204 - head/sys/dev/bce X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jan 2009 23:46:46 -0000 Author: delphij Date: Tue Jan 13 23:46:45 2009 New Revision: 187204 URL: http://svn.freebsd.org/changeset/base/187204 Log: Remove intermediate variable busaddr and have bus_* operate directly on softc members upon initialization. Reviewed by: davidch MFC after: 1 month Modified: head/sys/dev/bce/if_bce.c Modified: head/sys/dev/bce/if_bce.c ============================================================================== --- head/sys/dev/bce/if_bce.c Tue Jan 13 23:36:38 2009 (r187203) +++ head/sys/dev/bce/if_bce.c Tue Jan 13 23:46:45 2009 (r187204) @@ -2908,7 +2908,6 @@ bce_dma_alloc(device_t dev) { struct bce_softc *sc; int i, error, rc = 0; - bus_addr_t busaddr; bus_size_t max_size, max_seg_size; int max_segments; @@ -2977,7 +2976,7 @@ bce_dma_alloc(device_t dev) sc->status_block, BCE_STATUS_BLK_SZ, bce_dma_map_addr, - &busaddr, + &sc->status_block_paddr, BUS_DMA_NOWAIT); if (error) { @@ -2987,7 +2986,6 @@ bce_dma_alloc(device_t dev) goto bce_dma_alloc_exit; } - sc->status_block_paddr = busaddr; DBPRINT(sc, BCE_INFO, "%s(): status_block_paddr = 0x%jX\n", __FUNCTION__, (uintmax_t) sc->status_block_paddr); @@ -3031,7 +3029,7 @@ bce_dma_alloc(device_t dev) sc->stats_block, BCE_STATS_BLK_SZ, bce_dma_map_addr, - &busaddr, + &sc->stats_block_paddr, BUS_DMA_NOWAIT); if(error) { @@ -3041,7 +3039,6 @@ bce_dma_alloc(device_t dev) goto bce_dma_alloc_exit; } - sc->stats_block_paddr = busaddr; DBPRINT(sc, BCE_INFO, "%s(): stats_block_paddr = 0x%jX\n", __FUNCTION__, (uintmax_t) sc->stats_block_paddr); @@ -3099,7 +3096,7 @@ bce_dma_alloc(device_t dev) sc->ctx_block[i], BCM_PAGE_SIZE, bce_dma_map_addr, - &busaddr, + &sc->ctx_paddr[i], BUS_DMA_NOWAIT); if (error) { @@ -3109,7 +3106,6 @@ bce_dma_alloc(device_t dev) goto bce_dma_alloc_exit; } - sc->ctx_paddr[i] = busaddr; DBPRINT(sc, BCE_INFO, "%s(): ctx_paddr[%d] = 0x%jX\n", __FUNCTION__, i, (uintmax_t) sc->ctx_paddr[i]); } @@ -3155,7 +3151,7 @@ bce_dma_alloc(device_t dev) sc->tx_bd_chain[i], BCE_TX_CHAIN_PAGE_SZ, bce_dma_map_addr, - &busaddr, + &sc->tx_bd_chain_paddr[i], BUS_DMA_NOWAIT); if (error) { @@ -3165,7 +3161,6 @@ bce_dma_alloc(device_t dev) goto bce_dma_alloc_exit; } - sc->tx_bd_chain_paddr[i] = busaddr; DBPRINT(sc, BCE_INFO, "%s(): tx_bd_chain_paddr[%d] = 0x%jX\n", __FUNCTION__, i, (uintmax_t) sc->tx_bd_chain_paddr[i]); } @@ -3253,7 +3248,7 @@ bce_dma_alloc(device_t dev) sc->rx_bd_chain[i], BCE_RX_CHAIN_PAGE_SZ, bce_dma_map_addr, - &busaddr, + &sc->rx_bd_chain_paddr[i], BUS_DMA_NOWAIT); if (error) { @@ -3263,7 +3258,6 @@ bce_dma_alloc(device_t dev) goto bce_dma_alloc_exit; } - sc->rx_bd_chain_paddr[i] = busaddr; DBPRINT(sc, BCE_INFO, "%s(): rx_bd_chain_paddr[%d] = 0x%jX\n", __FUNCTION__, i, (uintmax_t) sc->rx_bd_chain_paddr[i]); } @@ -3350,7 +3344,7 @@ bce_dma_alloc(device_t dev) sc->pg_bd_chain[i], BCE_PG_CHAIN_PAGE_SZ, bce_dma_map_addr, - &busaddr, + &sc->pg_bd_chain_paddr[i], BUS_DMA_NOWAIT); if (error) { @@ -3360,7 +3354,6 @@ bce_dma_alloc(device_t dev) goto bce_dma_alloc_exit; } - sc->pg_bd_chain_paddr[i] = busaddr; DBPRINT(sc, BCE_INFO, "%s(): pg_bd_chain_paddr[%d] = 0x%jX\n", __FUNCTION__, i, (uintmax_t) sc->pg_bd_chain_paddr[i]); }