Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965411AbbDVAM6 (ORCPT ); Tue, 21 Apr 2015 20:12:58 -0400 Received: from mga11.intel.com ([192.55.52.93]:14785 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965230AbbDVAMy (ORCPT ); Tue, 21 Apr 2015 20:12:54 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,619,1422950400"; d="scan'208";a="698868670" Date: Tue, 21 Apr 2015 20:12:49 -0400 From: "ira.weiny" To: Michael Wang Cc: Roland Dreier , Sean Hefty , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, hal@dev.mellanox.co.il, Tom Tucker , Steve Wise , Hoang-Nam Nguyen , Christoph Raisch , Mike Marciniszyn , Eli Cohen , Faisal Latif , Jack Morgenstein , Or Gerlitz , Haggai Eran , Tom Talpey , Jason Gunthorpe , Doug Ledford Subject: Re: [PATCH v5 26/27] IB/Verbs: Clean up rdma_ib_or_iboe() Message-ID: <20150422001249.GZ15893@phlsvsds.ph.intel.com> References: <5534B8C9.506@profitbricks.com> <5534BC2E.40307@profitbricks.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5534BC2E.40307@profitbricks.com> User-Agent: Mutt/1.4.2.2i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3626 Lines: 97 On Mon, Apr 20, 2015 at 10:43:26AM +0200, Michael Wang wrote: > > We have finished introducing the cap_XX(), and raw helper rdma_ib_or_iboe() > is no longer necessary, thus clean it up. > > Cc: Hal Rosenstock > Cc: Steve Wise > Cc: Tom Talpey > Cc: Jason Gunthorpe > Cc: Doug Ledford > Cc: Ira Weiny > Cc: Sean Hefty > Signed-off-by: Michael Wang Reviewed-by: Ira Weiny > > --- > include/rdma/ib_verbs.h | 19 +++++++++---------- > net/sunrpc/xprtrdma/svc_rdma_transport.c | 6 ++++-- > 2 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h > index 45050cb..0c0a4f0 100644 > --- a/include/rdma/ib_verbs.h > +++ b/include/rdma/ib_verbs.h > @@ -1766,13 +1766,6 @@ static inline int rdma_tech_iwarp(struct ib_device *device, u8 port_num) > == RDMA_TRANSPORT_IWARP; > } > > -static inline int rdma_ib_or_iboe(struct ib_device *device, u8 port_num) > -{ > - enum rdma_transport_type tp = device->query_transport(device, port_num); > - > - return (tp == RDMA_TRANSPORT_IB || tp == RDMA_TRANSPORT_IBOE); > -} > - > /** > * cap_ib_mad - Check if the port of device has the capability Infiniband > * Management Datagrams. > @@ -1785,7 +1778,9 @@ static inline int rdma_ib_or_iboe(struct ib_device *device, u8 port_num) > */ > static inline int cap_ib_mad(struct ib_device *device, u8 port_num) > { > - return rdma_ib_or_iboe(device, port_num); > + enum rdma_transport_type tp = device->query_transport(device, port_num); > + > + return (tp == RDMA_TRANSPORT_IB || tp == RDMA_TRANSPORT_IBOE); > } > > /** > @@ -1815,7 +1810,9 @@ static inline int cap_ib_smi(struct ib_device *device, u8 port_num) > */ > static inline int cap_ib_cm(struct ib_device *device, u8 port_num) > { > - return rdma_ib_or_iboe(device, port_num); > + enum rdma_transport_type tp = device->query_transport(device, port_num); > + > + return (tp == RDMA_TRANSPORT_IB || tp == RDMA_TRANSPORT_IBOE); > } > > /** > @@ -1890,7 +1887,9 @@ static inline int cap_ipoib(struct ib_device *device, u8 port_num) > */ > static inline int cap_af_ib(struct ib_device *device, u8 port_num) > { > - return rdma_ib_or_iboe(device, port_num); > + enum rdma_transport_type tp = device->query_transport(device, port_num); > + > + return (tp == RDMA_TRANSPORT_IB || tp == RDMA_TRANSPORT_IBOE); > } > > /** > diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c > index a09b7a1..8af6f92 100644 > --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c > +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c > @@ -987,8 +987,10 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt) > */ > if (!rdma_tech_iwarp(newxprt->sc_cm_id->device, > newxprt->sc_cm_id->port_num) && > - !rdma_ib_or_iboe(newxprt->sc_cm_id->device, > - newxprt->sc_cm_id->port_num)) > + !rdma_tech_ib(newxprt->sc_cm_id->device, > + newxprt->sc_cm_id->port_num) && > + !rdma_tech_iboe(newxprt->sc_cm_id->device, > + newxprt->sc_cm_id->port_num)) > goto errout; > > if (!(newxprt->sc_dev_caps & SVCRDMA_DEVCAP_FAST_REG) || > -- > 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/