From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEB58C43603 for ; Wed, 11 Dec 2019 15:21:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E76622527 for ; Wed, 11 Dec 2019 15:21:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077689; bh=e5Qqv5i5bfqv3rMEEajILf48eFNYMkElgLOHDwmN5zE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=O2+ApbT3EFnOXaWm6AGw0cYcnnbQTfLQt6x11LKL9exfalIRsrp0+VXQhVls6VYeg r2lUnUyeRZsvXQyeM3JRpXBonTE6v8E6VhcN6n90ekx6sjx/U0ju9FfX4XgSVv6t4j l5KOgx4BtKa8/KVHNcHAytuQYdKCsIGPZZfQtkMI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731683AbfLKPV2 (ORCPT ); Wed, 11 Dec 2019 10:21:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:51698 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729663AbfLKPVY (ORCPT ); Wed, 11 Dec 2019 10:21:24 -0500 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 A69362465B; Wed, 11 Dec 2019 15:21:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077684; bh=e5Qqv5i5bfqv3rMEEajILf48eFNYMkElgLOHDwmN5zE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AdYl+sDuTyZNhtpr1wmcj/Qa92xRyUsP3fGpQPVlC/Wuj1K8vPRNVb1ub+Y1Zv1vt 2T5TCGUfE5/Lbx4GdII36Lsijy1BNcWDV5xT/XNfu3UiLN1AIHLq+nJ253c+/ausSi UDS0f87OxrK695OTBkxhSsCszmceDAz7EhDHo/tg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, YueHaibing , Marc Kleine-Budde , Sasha Levin Subject: [PATCH 4.19 131/243] can: xilinx: fix return type of ndo_start_xmit function Date: Wed, 11 Dec 2019 16:04:53 +0100 Message-Id: <20191211150347.972455063@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@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: YueHaibing [ Upstream commit 81de0cd60fd492575b24d97667f38b8b833fb058 ] The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, so make sure the implementation in this driver has returns 'netdev_tx_t' value, and change the function return type to netdev_tx_t. Found by coccinelle. Signed-off-by: YueHaibing Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- drivers/net/can/xilinx_can.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c index 3df23487487f7..b01c6da4dd814 100644 --- a/drivers/net/can/xilinx_can.c +++ b/drivers/net/can/xilinx_can.c @@ -612,7 +612,7 @@ static int xcan_start_xmit_mailbox(struct sk_buff *skb, struct net_device *ndev) * * Return: NETDEV_TX_OK on success and NETDEV_TX_BUSY when the tx queue is full */ -static int xcan_start_xmit(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t xcan_start_xmit(struct sk_buff *skb, struct net_device *ndev) { struct xcan_priv *priv = netdev_priv(ndev); int ret; -- 2.20.1