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: 903499 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="h1TSTMW3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40Vl864wLjz9s02 for ; Tue, 24 Apr 2018 23:50:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758251AbeDXNt4 (ORCPT ); Tue, 24 Apr 2018 09:49:56 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:51881 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933648AbeDXNQR (ORCPT ); Tue, 24 Apr 2018 09:16:17 -0400 Received: by mail-wm0-f67.google.com with SMTP id j4so902527wme.1; 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=ltVJFD0o7Begwq9FO+z3bLG+C5FqlgMvhIpfQXde5HoNyWnoIgFSe8vs4iL8sxHr7q zMkA1bC6cABZjQk1jVt1elJCE/jS1xDpgQYLX9omXqnECVeMIY2bRZxlV3hh5au80BHW c/Nfkol7RHB0EWE7wttog06Hku+Jo1cN7uMcl7W31CfWw8YBhlMFFNURmF26/IKuPjJt X2uyaDr16yySP070rMN5GYMdZdwyq+UHx+ZNFzRWmFRlImZJ/t9sXHkZe0Wf4sexSjta 8GvjoyDjFNw9KU4cO0LSU04zNPZTn12qJffTlQAgi/6CVM3v9lVHT2w4lGTX4J3rt7Wp yUdw== X-Gm-Message-State: ALQs6tDcai1f9HNIzaDZ467yRUVZAG1POBlXxpDM4/oNtD++2e0fQrys yxqBPUK9L6ZZKjDpmFBR9UNQiXQYACM= 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 Cc: Luc Van Oostenryck , Wolfgang Grandegger , Marc Kleine-Budde , Michal Simek , linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.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 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/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;