From patchwork Thu Apr 26 21:13:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 10366819 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0FB2E6032C for ; Thu, 26 Apr 2018 21:14:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F052029194 for ; Thu, 26 Apr 2018 21:14:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E47992919E; Thu, 26 Apr 2018 21:14:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5366F29194 for ; Thu, 26 Apr 2018 21:14:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=R110y9tPvBQYdROew55WJ6wyVK93S4kSib+0o1WRSvA=; b=LiLsxzhFVJCNrwalEyDhgYx8AM iH/xz4qheGO/xMsHvXQetPe90oH01PD/Z+xHteLrrf4CCaQOBteE/wtn5bGCAgy9jLUPIQtIZWLp5 1CzgqgSBz8+hIJUWiRzrS2jmgG7Nlt+/D5ZPN64Jf4xMrcD6A/d+GNmmzDJvY0g5wHGtN1Xflk9tT QwhvfuO3FE/0XkJl5JQXAS7LEBHga5xyF+1A16pdRJZUJLhsvmvudmnLwGjR8Gc+ANiVdW+A1Mj9s Nl6SHQkaOLMGYVM3OQOWsFpUn7sPXZIAz1M61XMmFD0P/NmmyzPAuIySufB6T17iOKEc1v8sZNwjh CkgIZmQg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBoDu-0004TH-1o; Thu, 26 Apr 2018 21:14:38 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBoDD-0004CR-T8 for linux-arm-kernel@lists.infradead.org; Thu, 26 Apr 2018 21:13:57 +0000 Received: by mail-wm0-x241.google.com with SMTP id o78so205908wmg.0 for ; Thu, 26 Apr 2018 14:13:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z8sxuT/SURWt0NbMlXvT+ckxpwyNg6i12smirIkDOgs=; b=aS7u0jUV0ClHhECe6+bDxM5ytOvH89YLWVCHPfWNN0xVVN59/MF92+TQyU89YtJ0fL E+a8Lx8uIZYmK9mslfVjUQ0SM3yFUqqFw+7m8sYZI9AmnXw6BB3VlTAD79CmEXxs1X7F xDLZHLIKFGlbyQ2p2yOOoSM+dHlTdf5xuR3DYTh21EZtMObkHyJA8CPFy9AYvuOQsQb/ 62f46XKCutuLwoHBreSFVRBhOINU83Gxu/CG9W4y5u1WlB80sON9Itql2eIc1fN8E5GR APTtV9pfgQVqTEp1ZOSqe8bF8U9hGWsQbPWA9aUFy34vWyOSKT5K2QP7FEWvNYoUUhVe V3+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z8sxuT/SURWt0NbMlXvT+ckxpwyNg6i12smirIkDOgs=; b=TbGdkUTL0B+z64Ddb7EbrJh2V2wL/QYLk+Gj16Ax6ytNp0nqWafF3O8+8MKLcaI6pQ xICskVICkiFIeuX3r29Du2MZgbEZInLBDtsYBFI8mhkqKzKZz1RKlbifT7t368NCdmQv fCtuhrFc1xTxLIp1cSfRpHl5aHz0tg/uJTjY/pdDDEAdKvELbISgN23t7QLUDIAGNBWK bEJxHW7uygeTpamSmlCvAZdrDh5mg4MZ2Hb9u8BDDfoG+wbyFFpT2muz2tr3o+X7a6eO pDKZS5P0Ycc1u92EZXhtbEFEnQoPP8vJT3yVyEIR0vSdtyQqzGzI9tLdceCM9NMa7hWz S7sA== X-Gm-Message-State: ALQs6tBlxMhsdlnFdBEe8dPYCPpYyeYZhzvD6Im0S93V3GMXKkN/IVR+ m2f3NPxbDyrAFHz0dyV63/M= X-Google-Smtp-Source: AB8JxZrEIeef+hxuBmeZ+uO/ogVt8g3ACRqvWyX+H6M1Nwm4r3n9LxOTw19IE616/xi59OKDFSDBow== X-Received: by 2002:a50:b6ba:: with SMTP id d55-v6mr145127ede.250.1524777227855; Thu, 26 Apr 2018 14:13:47 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:c47a:3b0c:1c8:90dc]) by smtp.gmail.com with ESMTPSA id w9-v6sm34680edb.38.2018.04.26.14.13.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Apr 2018 14:13:47 -0700 (PDT) From: Luc Van Oostenryck To: Marc Kleine-Budde Subject: [PATCH 3/3] can: xilinx: fix xcan_start_xmit()'s return type Date: Thu, 26 Apr 2018 23:13:38 +0200 Message-Id: <20180426211339.30821-4-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180426211339.30821-1-luc.vanoostenryck@gmail.com> References: <20180426211339.30821-1-luc.vanoostenryck@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180426_141355_955322_2A677ACC X-CRM114-Status: GOOD ( 15.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "moderated list:ARM/Allwinner sunXi SoC support" , open list , Maxime Ripard , "open list:NETWORKING DRIVERS" , Michal Simek , "open list:CAN NETWORK DRIVERS" , Chen-Yu Tsai , Luc Van Oostenryck , Wolfgang Grandegger MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The method ndo_start_xmit() is defined as returning an 'netdev_tx_t', which is a typedef for an enum type, but the implementation in this driver returns an 'int'. Fix this by returning 'netdev_tx_t' in this driver too. Signed-off-by: Luc Van Oostenryck Acked-by: Michal Simek --- 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 89aec07c2..a19648606 100644 --- a/drivers/net/can/xilinx_can.c +++ b/drivers/net/can/xilinx_can.c @@ -386,7 +386,7 @@ static int xcan_do_set_mode(struct net_device *ndev, enum can_mode mode) * * Return: 0 on success and failure value on error */ -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); struct net_device_stats *stats = &ndev->stats;