From patchwork Thu Apr 26 21:13:37 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: 905381 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="FK+SeWeD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40X8wD3404z9rvt for ; Fri, 27 Apr 2018 07:14:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756876AbeDZVOk (ORCPT ); Thu, 26 Apr 2018 17:14:40 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36144 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755546AbeDZVNr (ORCPT ); Thu, 26 Apr 2018 17:13:47 -0400 Received: by mail-wm0-f66.google.com with SMTP id n10so196619wmc.1; Thu, 26 Apr 2018 14:13:46 -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=FfWOBDK8PxtUrHVonTAPaMkvEINgPUkomkuTzFzR1Iw=; b=FK+SeWeDloz3hb+FNWP9BGrISvg1KGVrgLhWRELx2KD3EczU/y87Vg78U8hcGntnQG izSwxMscIvjj3mP7S9Q49jmQOdV179bx66rdF96BIDnqq4nlUD1pmFOy1DZoPVfGB4cD fHGbjTPwfeguLnRH3rdnQbGwbJPFVMFVDzUB3LfwyF0P7VxMBkhT6/OLS/UXUf/JUaRj c1CzV7F6obygrZv4IwT4qm1XewtenhpiguGBZV6n3uDJYS+kQb22qQjPH5LQdomD04QG ClqW5rjuV1EOJ/MpBtOwhz4jiqCFzfnwsp89TPrayz2tdc57pkVf2AcHWXHFXWn0p8Hv rs8g== 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=FfWOBDK8PxtUrHVonTAPaMkvEINgPUkomkuTzFzR1Iw=; b=k7btoluLEuMe8li/MaF/L0xHFG9PvQs1JmLFb8gVGUjgS0nDWnB6rGYHHw+eo6FiQJ KTjBYYwVaFPaChbW8ldc/t87FE11/NqUZa4ZGIQ9dgZWOss9rnizxoQ7TwUUd7PeHPgf +qvEcsDjS6+MV11iW3BOqYddrbqULK4EjqfFJDGDcirc2xNDkekcJ1lcntjqvuYzoB8I yhZbZgVMbLAgxRT4xuPR2TyPacWOASj/Wug8756ra4oYoTyCqdaP2Cbbrw8rBaNlc5fb CQGFB7q+W2iIjeQISSnAEbEn6iQKnHI/fNHU+2mdNC5oWVtt7jM47djeBL2RqtXNscpX wqxQ== X-Gm-Message-State: ALQs6tByT6HADyiSDcQ+d+43B5oCONq4EldCtFwsqys7W7s3Y755kgcx 0ymJgivVJADJLJ9uIjQN+1c= X-Google-Smtp-Source: AB8JxZoko2mmLRO96Xs28k96J4etLULnPzHk7u1sXTZXHlQDZiYm1rxANVdDAiPii/aixNyl4EDc6A== X-Received: by 2002:a50:ba10:: with SMTP id g16-v6mr127136edc.85.1524777226336; Thu, 26 Apr 2018 14:13:46 -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.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Apr 2018 14:13:45 -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 2/3] can: sun4i: fix sun4ican_start_xmit()'s return type Date: Thu, 26 Apr 2018 23:13:37 +0200 Message-Id: <20180426211339.30821-3-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 --- 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;