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: 905378 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="aS7u0jUV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40X8vG6T2Nz9ry1 for ; Fri, 27 Apr 2018 07:14:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756476AbeDZVNx (ORCPT ); Thu, 26 Apr 2018 17:13:53 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:37616 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756187AbeDZVNt (ORCPT ); Thu, 26 Apr 2018 17:13:49 -0400 Received: by mail-wm0-f68.google.com with SMTP id l1so7172wmb.2; 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=hTCuoMR4SD88JZoWlnJZBHR3iOc3GlNLyBFECUwEfvcqDrD6kw0By6SA/V0gEwCGXr EaBHDwzsLYz0sNVL8VPS5Nj6M1tfi8nur293UR8XOaCdLpemHNOZ6zaNj0IMOG+EMjYh IK7T7cVHrsxV50ic2dc3TTXPg0Pj8JdbH4faDJ7Pm7JfDGyhhIsQuXS2j9ptJrL0cJCu +Ha34Uz+8CSNnwEDtBMD7JTANeRU1AGGbDx0H3lElo+1Z8JD7fwBYKckpXXMIr3lrnBx zivBA5RxZh58mImd1S1302YGuIU2QTbQe7ZiTrKRI29Eqn8Q0taKPT1qJ3dg8cXdP4Dx hNQw== X-Gm-Message-State: ALQs6tCjWQ6u67Rx5v4ilxcETx/BsOgZT/7jYXIChEe6uS++M+DFUYhe jwYduFMOuY+NyhBlDwLp254= 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 Cc: Luc Van Oostenryck , Wolfgang Grandegger , Maxime Ripard , Chen-Yu Tsai , Michal Simek , linux-can@vger.kernel.org (open list:CAN NETWORK DRIVERS), netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-kernel@vger.kernel.org (open list), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Allwinner sunXi SoC support) 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> 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 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;