Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp1250862pxa; Thu, 20 Aug 2020 06:47:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/JqoA833nLAtqSYIb1inP1YuCZNOMvZ0Th1pHY34aD8QhMeMeXarzIGnyEXgFQ2CWx9br X-Received: by 2002:a05:6402:3088:: with SMTP id de8mr2983467edb.88.1597931241847; Thu, 20 Aug 2020 06:47:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597931241; cv=none; d=google.com; s=arc-20160816; b=q/JMnDArWa7Ozq2FFCXk5PfpZeKZ+z9GqiUUnBJhNcVfcjQQ2OU1emb88hdIBWFlRu gjQdouMttfzmwSiDSfeLACrUgYaW3z6w76MZ8gEF6lwm62ozrK6ljLpTbGCrK1PvBZUl 7TBR6SPCYU3YSRR7yEJSbfkI2cm3MMfX2LDLpz2FbgiOteahjfRP53u0BCi5LujbfGqa 1CRW+JBi0lv9u6u0mbSKlkrJrXEFFKYfwHV/SzhmVKJkPFWKqR2tANxV3ejB3R7AYSGv a9tWtZFw0iyEo/zMUVP8YCWyTrap7vpFgyF9d90aNu+qp0WxFkgQp6nl0tDljCgtZhid 7y5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=A5zQp0tPQmLOq9vzeSyLxF08vmw04+pnVGx/5y9ZYYc=; b=NK8mC5aIZR9jOAJvqPJRvNx1h+2JITuOTJDFfT20K/nIfiTn9Hhm6+o/0JPHDHyw6L +snrk6abgwFSJDAuWAI29pI2dQkzubqfDARwse+OKLVhBjGthBY6G7xXJz0cOrmOk/xD ceb8yIapx455leb3pGIf1tzSDgSDNYzBSmTbDspA/hdkFt9SRCJh/BOjeR5mUV/N1IdF QKio/h2PUsqM+POdj3iuSiWeb8OK+qqfIoEwheReKFt6IZKoEUI6n58s6D5PlOkxuryA dismlvFB8vws3Xs/Fvgl+ZGIyE8RcP4j5zdTVVV2XxXIV9pCjkJcQL4U50JUrSPDZgre 08hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HsmBtBqG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id yd22si1494717ejb.33.2020.08.20.06.46.57; Thu, 20 Aug 2020 06:47:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HsmBtBqG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729846AbgHTNn5 (ORCPT + 99 others); Thu, 20 Aug 2020 09:43:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:39618 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728055AbgHTJ3O (ORCPT ); Thu, 20 Aug 2020 05:29:14 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4FD2B22CA1; Thu, 20 Aug 2020 09:29:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597915753; bh=zpt2YetnxzLR/R4oNSBiaF+8lbYDDHmsyitJF7wm9mA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HsmBtBqGE4sPi35/4CVgdWDom3b2cHqR4w4uMi+o/48DOqB5kqXmSCIXgYaAPn5D3 8a0axh+UdJ4ABS3AxBNeQKo1ViVNhXd0GRtM034UIaX2kGiAUXve1qOaMxF43C3fKp zs5yrn2/4JxrC/wK1EGQOYoLOde3UNj2bfX1X5JA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kamal Heib , Jason Gunthorpe , Sasha Levin Subject: [PATCH 5.8 121/232] RDMA/ipoib: Return void from ipoib_ib_dev_stop() Date: Thu, 20 Aug 2020 11:19:32 +0200 Message-Id: <20200820091618.677764561@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091612.692383444@linuxfoundation.org> References: <20200820091612.692383444@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kamal Heib [ Upstream commit 95a5631f6c9f3045f26245e6045244652204dfdb ] The return value from ipoib_ib_dev_stop() is always 0 - change it to be void. Link: https://lore.kernel.org/r/20200623105236.18683-1-kamalheib1@gmail.com Signed-off-by: Kamal Heib Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/ulp/ipoib/ipoib.h | 2 +- drivers/infiniband/ulp/ipoib/ipoib_ib.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index 9a3379c49541f..9ce6a36fe48ed 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h @@ -515,7 +515,7 @@ void ipoib_ib_dev_cleanup(struct net_device *dev); int ipoib_ib_dev_open_default(struct net_device *dev); int ipoib_ib_dev_open(struct net_device *dev); -int ipoib_ib_dev_stop(struct net_device *dev); +void ipoib_ib_dev_stop(struct net_device *dev); void ipoib_ib_dev_up(struct net_device *dev); void ipoib_ib_dev_down(struct net_device *dev); int ipoib_ib_dev_stop_default(struct net_device *dev); diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c index da3c5315bbb51..6ee64c25aaff4 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c @@ -846,7 +846,7 @@ int ipoib_ib_dev_stop_default(struct net_device *dev) return 0; } -int ipoib_ib_dev_stop(struct net_device *dev) +void ipoib_ib_dev_stop(struct net_device *dev) { struct ipoib_dev_priv *priv = ipoib_priv(dev); @@ -854,8 +854,6 @@ int ipoib_ib_dev_stop(struct net_device *dev) clear_bit(IPOIB_FLAG_INITIALIZED, &priv->flags); ipoib_flush_ah(dev); - - return 0; } int ipoib_ib_dev_open_default(struct net_device *dev) -- 2.25.1