From owner-svn-src-all@freebsd.org Tue Oct 20 19:20:26 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 6EAD9A186AE; Tue, 20 Oct 2015 19:20:26 +0000 (UTC) (envelope-from cem@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 1020CA77; Tue, 20 Oct 2015 19:20:25 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9KJKOoH037799; Tue, 20 Oct 2015 19:20:24 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9KJKO2K037798; Tue, 20 Oct 2015 19:20:24 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201510201920.t9KJKO2K037798@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: "Conrad E. Meyer" Date: Tue, 20 Oct 2015 19:20:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289649 - head/sys/dev/ntb/if_ntb 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: Tue, 20 Oct 2015 19:20:26 -0000 Author: cem Date: Tue Oct 20 19:20:24 2015 New Revision: 289649 URL: https://svnweb.freebsd.org/changeset/base/289649 Log: if_ntb: Use if_printf instead of device_printf Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/ntb/if_ntb/if_ntb.c Modified: head/sys/dev/ntb/if_ntb/if_ntb.c ============================================================================== --- head/sys/dev/ntb/if_ntb/if_ntb.c Tue Oct 20 19:20:15 2015 (r289648) +++ head/sys/dev/ntb/if_ntb/if_ntb.c Tue Oct 20 19:20:24 2015 (r289649) @@ -797,7 +797,7 @@ ntb_transport_link_up(struct ntb_transpo qp->client_ready = true; if (bootverbose) - device_printf(ntb_get_device(qp->ntb), "qp client ready\n"); + if_printf(qp->transport->ifp, "qp client ready\n"); if (qp->transport->link_is_up) callout_reset(&qp->link_work, 0, ntb_qp_link_work, qp); @@ -1166,11 +1166,11 @@ ntb_transport_event_callback(void *data) if (ntb_link_is_up(nt->ntb, NULL, NULL)) { if (bootverbose) - device_printf(ntb_get_device(nt->ntb), "HW link up\n"); + if_printf(nt->ifp, "HW link up\n"); callout_reset(&nt->link_work, 0, ntb_transport_link_work, nt); } else { if (bootverbose) - device_printf(ntb_get_device(nt->ntb), "HW link down\n"); + if_printf(nt->ifp, "HW link down\n"); ntb_transport_link_cleanup(nt); } } @@ -1233,7 +1233,7 @@ ntb_transport_link_work(void *arg) nt->link_is_up = true; if (bootverbose) - device_printf(ntb_get_device(ntb), "transport link up\n"); + if_printf(nt->ifp, "transport link up\n"); for (i = 0; i < nt->qp_count; i++) { qp = &nt->qp_vec[i]; @@ -1294,7 +1294,7 @@ ntb_set_mw(struct ntb_transport_ctx *nt, * with the Linux driver. */ if (mw->dma_addr % mw->xlat_align != 0) { - device_printf(ntb_get_device(nt->ntb), + if_printf(nt->ifp, "DMA memory 0x%jx not aligned to BAR size 0x%x\n", (uintmax_t)mw->dma_addr, size); ntb_free_mw(nt, num_mw); @@ -1304,8 +1304,7 @@ ntb_set_mw(struct ntb_transport_ctx *nt, /* Notify HW the memory location of the receive buffer */ rc = ntb_mw_set_trans(nt->ntb, num_mw, mw->dma_addr, mw->xlat_size); if (rc) { - device_printf(ntb_get_device(nt->ntb), - "Unable to set mw%d translation", num_mw); + if_printf(nt->ifp, "Unable to set mw%d translation", num_mw); ntb_free_mw(nt, num_mw); return (rc); } @@ -1397,7 +1396,7 @@ ntb_qp_link_work(void *arg) /* See if the remote side is up */ if ((val & (1ull << qp->qp_num)) != 0) { if (bootverbose) - device_printf(ntb_get_device(ntb), "qp link up\n"); + if_printf(nt->ifp, "qp link up\n"); qp->link_is_up = true; if (qp->event_handler != NULL)