From owner-svn-src-all@freebsd.org Thu Dec 3 14:17:30 2015 Return-Path: Delivered-To: svn-src-all@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 1BFA8A3F9AC; Thu, 3 Dec 2015 14:17:30 +0000 (UTC) (envelope-from avos@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 C35F214CE; Thu, 3 Dec 2015 14:17:29 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB3EHS6v019182; Thu, 3 Dec 2015 14:17:28 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB3EHSZB019181; Thu, 3 Dec 2015 14:17:28 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201512031417.tB3EHSZB019181@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Thu, 3 Dec 2015 14:17:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291695 - head/sys/dev/usb/wlan X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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: Thu, 03 Dec 2015 14:17:30 -0000 Author: avos Date: Thu Dec 3 14:17:28 2015 New Revision: 291695 URL: https://svnweb.freebsd.org/changeset/base/291695 Log: urtwn(4): move duplicate code from urtwn_(r92c/r88e)_dma_init() to urtwn_dma_init() (noop). Reviewed by: kevlo Approved by: adrian (mentor, implicit) Differential Revision: https://reviews.freebsd.org/D4271 Modified: head/sys/dev/usb/wlan/if_urtwn.c Modified: head/sys/dev/usb/wlan/if_urtwn.c ============================================================================== --- head/sys/dev/usb/wlan/if_urtwn.c Thu Dec 3 13:29:20 2015 (r291694) +++ head/sys/dev/usb/wlan/if_urtwn.c Thu Dec 3 14:17:28 2015 (r291695) @@ -2748,8 +2748,23 @@ fail: static __inline int urtwn_dma_init(struct urtwn_softc *sc) { + int error; + + /* Initialize LLT table. */ + error = urtwn_llt_init(sc); + if (error != 0) + return (error); + + error = sc->sc_dma_init(sc); + if (error != 0) + return (error); - return sc->sc_dma_init(sc); + /* Set Tx/Rx transfer page size. */ + urtwn_write_1(sc, R92C_PBP, + SM(R92C_PBP_PSRX, R92C_PBP_128) | + SM(R92C_PBP_PSTX, R92C_PBP_128)); + + return (0); } static int @@ -2757,12 +2772,6 @@ urtwn_r92c_dma_init(struct urtwn_softc * { int hashq, hasnq, haslq, nqueues, nqpages, nrempages; uint32_t reg; - int error; - - /* Initialize LLT table. */ - error = urtwn_llt_init(sc); - if (error != 0) - return (error); /* Get Tx queues to USB endpoints mapping. */ hashq = hasnq = haslq = 0; @@ -2825,10 +2834,6 @@ urtwn_r92c_dma_init(struct urtwn_softc * /* Set Tx/Rx transfer page boundary. */ urtwn_write_2(sc, R92C_TRXFF_BNDY + 2, 0x27ff); - /* Set Tx/Rx transfer page size. */ - urtwn_write_1(sc, R92C_PBP, - SM(R92C_PBP_PSRX, R92C_PBP_128) | - SM(R92C_PBP_PSTX, R92C_PBP_128)); return (0); } @@ -2838,12 +2843,6 @@ urtwn_r88e_dma_init(struct urtwn_softc * struct usb_interface *iface; uint32_t reg; int nqueues; - int error; - - /* Initialize LLT table. */ - error = urtwn_llt_init(sc); - if (error != 0) - return (error); /* Get Tx queues to USB endpoints mapping. */ iface = usbd_get_iface(sc->sc_udev, 0); @@ -2875,11 +2874,6 @@ urtwn_r88e_dma_init(struct urtwn_softc * /* Set Tx/Rx transfer page boundary. */ urtwn_write_2(sc, R92C_TRXFF_BNDY + 2, 0x23ff); - /* Set Tx/Rx transfer page size. */ - urtwn_write_1(sc, R92C_PBP, - SM(R92C_PBP_PSRX, R92C_PBP_128) | - SM(R92C_PBP_PSTX, R92C_PBP_128)); - return (0); }