From patchwork Tue Apr 24 13:16:13 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: 10359737 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 41C9760225 for ; Tue, 24 Apr 2018 13:17:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3248828DCB for ; Tue, 24 Apr 2018 13:17:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26EDD28DCF; Tue, 24 Apr 2018 13:17:29 +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 B0BF928DCB for ; Tue, 24 Apr 2018 13:17:28 +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: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:In-Reply-To: References:List-Owner; bh=R110y9tPvBQYdROew55WJ6wyVK93S4kSib+0o1WRSvA=; b=mvE uYSEyzR0cQx2/qcnGbZJsfehjowHdUTz3+IE8Eino6JULgxeRW/c9B3LFD5k+4Cz7/Z/CqcxcP7gZ ys5ynSVvBF1sLFM6pjJLyrKo1klhV/lqtbqt7ENx21GuBgo7fe9WQYkGrqK4Z4bHtYC+J/kb1lYM5 ErGE+XRsGJ1eU1CXW0yzkZTAXKtZYGnxza1qKKb6yHFBbd6gAyeHEvzKdchcZfSqynQvF3ewdw5UG crehkHUvmM4E4PFfSCNQC9jsJQSHtSeR+VJO9+Q8QyTsVsrlst/6whLfwgT9UKZWU6av3L166iooS pmn3dFmqYswMFfCEhfmg0oy5R/vHmPw==; 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 1fAxou-00062o-8d; Tue, 24 Apr 2018 13:17:20 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fAxo1-0005Tu-1p for linux-arm-kernel@lists.infradead.org; Tue, 24 Apr 2018 13:16:27 +0000 Received: by mail-wm0-x244.google.com with SMTP id 66so892909wmd.3 for ; Tue, 24 Apr 2018 06:16:16 -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; bh=z8sxuT/SURWt0NbMlXvT+ckxpwyNg6i12smirIkDOgs=; b=h1TSTMW3jmxhympuW/5F56M5waH24wg2SfGsXB8Vw4OqCo/5KmogmEG70yh4rBrh78 2T3WkSoJNOJ7ZLcNiWAbjSWi3nNcmbDRWn1rjD/apTO3a4Hjo3N7auw4xKJdO0ZfVr74 l4Sx95uchg/A6/8fgcgLSaRO+CCI6VIyKt9oTjsW8ILojBXC5Pp9qTRWUfmZ/suzkpS2 Frf2jq6TiwyQBb7X+fD0bkovRkRTlZG85iIF4m59g+5rqEmR72/tk2GNK4Nk3MLeArbh pojDpgOcOUbKnox71t366/dORUIr9az+rE+eOf6XXO3rzRJW5WEBq6V1uTcDxQDk5eGd O/GQ== 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; bh=z8sxuT/SURWt0NbMlXvT+ckxpwyNg6i12smirIkDOgs=; b=hjx+XbXub+nNuKd2Ih252lOk9JnNvhUvjRlidNd3DpwQeom6/FO2OzLFzkOnHDcsGG zJf1gs8VphQYzsoUel7ubNC0QyxWkCSxOC3DkhVAxhG6gEnIdv0UsU8LxcLyDbtlBFZW BeB7qdgdldjM1BGPCnf23VYVhK/mrTI7ZxK7y4j8E/EPAao9+PFt/cekxJ35NpElIb1Q E3F0/X/NTnMZEmxe1gXxZggYlhfHTLghBfAArAIEahG8glcv9IQ7gPq29Cxhi4v/Tbu/ EF3KgAIYC6NgtPUNsbJ/sKdHB82wA3kD5h+gm1uIesd+Ijow1DPIGlG/akpbuRzMK/p9 lIzw== X-Gm-Message-State: ALQs6tCz4WsM+frQiAveutyJxu+4RDixPtgqON3LTb0T5bg6LhVgWuon yGQZIT1Os79pMglhbmcii/wdT0sdJok= X-Google-Smtp-Source: AB8JxZouaMm/c8yHGdu8Gt+LNG6S/U+z5q9EXd/jm8zeLxvwoTohyl/XVbp9j5Mgo1LyLTv7933lTw== X-Received: by 10.80.180.133 with SMTP id w5mr4433775edd.100.1524575775436; Tue, 24 Apr 2018 06:16:15 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id j30sm8971356edc.38.2018.04.24.06.16.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:14 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Subject: [PATCH] can: xilinx: fix xcan_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:16:13 +0200 Message-Id: <20180424131614.3357-1-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.17.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180424_061625_104775_37C47B0D X-CRM114-Status: GOOD ( 12.90 ) 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: linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, Michal Simek , linux-can@vger.kernel.org, Marc Kleine-Budde , 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 --- 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;