From patchwork Tue Apr 24 13:16:11 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: 10359721 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 CC2E8601BE for ; Tue, 24 Apr 2018 13:16:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B567C28DCA for ; Tue, 24 Apr 2018 13:16:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A7E5928DCC; Tue, 24 Apr 2018 13:16:35 +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 3FE9D28DCA for ; Tue, 24 Apr 2018 13:16:35 +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=K/qd7hUXtxP9Xmd017dcj18N1XmJb+K3DXOED3azRcE=; b=p9r odOTY3SukY52u6Reho1JXR9df8xPb4kkD+V0cKo4W+pn9lbhn3cAiWJcwudw7A/4CZdiqClLYl7mo E67NChIo3ZF0ESofeuDWOwroM5CQCx2TMPWL8ZrvByfpTCCOGJfVCijAWGdQGMUSX9bcceLNBrIv6 bnaVA03efFdIlLlgG9Lv60hTvPVsnyx3dWjfu2pVSwCtxuS4PZXGaODapMter5TElDmh5iiWh67/F gOcZ3zqK256NV6C+w3bo0SSKxMlAbz5Wqq6m+gAGuRDSOdbPEQRcQivEEebT9KIeDgDvJEbxTouVZ F1DzCcrm9oR2l24pINCI5J/pdMEbkEg==; 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 1fAxo5-0005We-TV; Tue, 24 Apr 2018 13:16:29 +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-0005TO-1r for linux-arm-kernel@lists.infradead.org; Tue, 24 Apr 2018 13:16:26 +0000 Received: by mail-wm0-x244.google.com with SMTP id i3so799050wmf.3 for ; Tue, 24 Apr 2018 06:16:14 -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=FfWOBDK8PxtUrHVonTAPaMkvEINgPUkomkuTzFzR1Iw=; b=lr1FfELANxYiTbg8wJSxOSB1pG3DsRXx8sQnYrV2Maq6GF7xHh4kPITW/l5A1gIAWR koawWiApScN+kJAvaqbBWbnybRdH9VfSHZzOOl5ssITIeAyO2w2Rkv24iAyOulzfXIGO TZ/pf4a0pavCo5bbRkxI22wXwvsrRcoRp01lTrpdMbsO4rr7AIzyPfWG0kQ434Ci5UZE 8ziWEcalxg6vgY3NJyGjGP9DYUnQhF/3e0G/38F/6yFOLhXDBw+oHwTnQaPc7Lyk/ov3 NqdfEA26tHf1YqR1WvZuNwbhC2umbKWYEKf3Uqq5kC9oR/kTtBGx7NFEAe4pJoYRTypz IFug== 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=FfWOBDK8PxtUrHVonTAPaMkvEINgPUkomkuTzFzR1Iw=; b=gc2AouqV926VgXvOJqjpEOxjGLr/mIbgzV4KbhuzmA2bNczqlfwNybq2S4+fEEhmZk S1vE50et/XFSSWx2dnmqTSIJNsqj/NCc+/FzvYSaOiNMB+o0lwu2zuDd8kNJP4HcbWYN 1r2pYDGDanw87Qo9bVD4dbo81aQ63vdZgOY34IbIYeWsQb53sC0oLXzzKwGky3FzGCjV Jc/M9XzZekc9wzBjGUqe1Yywgw/hYUF2VbAyLOLCVNODWAXSSq3PWQNZm/sY/m25yjAJ A8Ke40M+ZosOE+fRVZj3PdNBq11O+tUPcuyrq9CVFfSdK+UvHjQAIVAf8xcNYM9mUFnR YWkw== X-Gm-Message-State: ALQs6tD/r4USWiuhow3Bcyznh2My4b5686+bQV+tydaymEU6yLAD5xhy Jec/Q0v82VRtyuImupIvESU= X-Google-Smtp-Source: AIpwx4/4xM7kAb/zyrr3hqJIMuBrxWgwcB1c+N6WBvuXP7fj0MX0+z0vITptwSsU1lB5y2eFxDItpQ== X-Received: by 10.80.139.189 with SMTP id m58mr34535398edm.165.1524575773162; Tue, 24 Apr 2018 06:16:13 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id q6sm7357705edb.66.2018.04.24.06.16.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:16:12 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Subject: [PATCH] can: sun4i: fix sun4ican_start_xmit()'s return type Date: Tue, 24 Apr 2018 15:16:11 +0200 Message-Id: <20180424131611.3307-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_105735_95F16DC8 X-CRM114-Status: GOOD ( 12.87 ) 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, Maxime Ripard , netdev@vger.kernel.org, linux-can@vger.kernel.org, Chen-Yu Tsai , 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/sun4i_can.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c index 1ac2090a1..093fc9a52 100644 --- a/drivers/net/can/sun4i_can.c +++ b/drivers/net/can/sun4i_can.c @@ -409,7 +409,7 @@ static int sun4ican_set_mode(struct net_device *dev, enum can_mode mode) * xx xx xx xx ff ll 00 11 22 33 44 55 66 77 * [ can_id ] [flags] [len] [can data (up to 8 bytes] */ -static int sun4ican_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t sun4ican_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct sun4ican_priv *priv = netdev_priv(dev); struct can_frame *cf = (struct can_frame *)skb->data;