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: 903500 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lr1FfELA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vl8h4ZDVz9s02 for ; Tue, 24 Apr 2018 23:50:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758170AbeDXNu1 (ORCPT ); Tue, 24 Apr 2018 09:50:27 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36717 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933634AbeDXNQP (ORCPT ); Tue, 24 Apr 2018 09:16:15 -0400 Received: by mail-wm0-f66.google.com with SMTP id n10so794662wmc.1; 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=Ezxfxb5jIlFPHlOSnMPwx71G/gkXla/WgX6XVFRvysWCBVWLEqyFaprfmqmfKrMW9g ErNmDT+XRTg/BDhKCLa49EeEtkaaOf6lnEyLNLlTLg0eRY6PeHWbQPyPFqZosOKjoRRw pVojl7d39nS/lIiRiYXkG42nCzD6EjRdEKoWpdaG1haDyNc9YeOV0+wVVw9oRmvwvXW5 +5rhXp5yxFZrUVzSE9oXPjk8L+tqR5AZkF56M9scMp/BfV3jTFTG321jWFGTv4dqiLIg T/UaECMfOJA4kxo7AOqY5/8RqOpUopywhhQa1Gj/HOgVjfnZKWHxK7bz5PX7AGIXUxfP qVmw== X-Gm-Message-State: ALQs6tA9yHtJ/RLgFTiKZYrnuV8wro2G1HCmrCFzWU5fF+tN3MUkVMpE hT41TTmyo4CjqrszFBhCZC4plllidzw= 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 Cc: Luc Van Oostenryck , Wolfgang Grandegger , Marc Kleine-Budde , Maxime Ripard , Chen-Yu Tsai , linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.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 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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;