From patchwork Thu Apr 26 21:13:36 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: 905380 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="cqmv8ecW"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40X8vv4SPMz9rvt for ; Fri, 27 Apr 2018 07:14:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755981AbeDZVNs (ORCPT ); Thu, 26 Apr 2018 17:13:48 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:52734 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754345AbeDZVNq (ORCPT ); Thu, 26 Apr 2018 17:13:46 -0400 Received: by mail-wm0-f67.google.com with SMTP id w195so170301wmw.2; Thu, 26 Apr 2018 14:13:45 -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=eWwCBQ82pXf/9RG5NjSPQhdJldJgenlVNQeiKq1jlfc=; b=cqmv8ecW8VZZP+Ok5ekrLM+LsdF/cos8wVIafxw3AniGbPCNGcSGfK1EJ3V+siauTr TiN4pSJebcbFPGpd9ILdxuuM0gDpmnr3ymDVvuyuA8Ha+0sK4BOlk2HaeYn8or2bFHIl 3xBJcDVaJLDBGyR31b7G1Nj7BUy2wREf2Myk0yWiD8+0foBq+zdlj9SgCHopBLENapW6 OLgjrOTfHiERMNvQB4LqRQOICnSHRi8UC9G9poTkC70NJRfma7z62VwjaLLl48IgLvjt V3O/dzCqbant2I87hMYneh7QHfjLRzpnQuxW+h4Ac0pCEWoWBbCM8GNnEubBcHf7ObNZ /P9g== 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=eWwCBQ82pXf/9RG5NjSPQhdJldJgenlVNQeiKq1jlfc=; b=ULEA8809clAJX7Upo5T53LvSW0rDD2baN7J/7Q+5UdmVZqHiovUKidiZIUB9bVybnz PXJzj1eCyRFR0vZ20DU44gAVj6B0uiFz0IzYFo7zjLncEu2cWuJqOeHD8QlIpP0ez/19 AwP0+HH8LRI/MwL9qC2szS/4XxoawJp2MpZbQrRMtkEy6Kv60HuQMBdBeSWX1xqcL5Lj 2IlS+4IyTK3Spfs+YxGkqT2Vv4p2tFfAYNmgfrMS563XcEkO+I3euTCWYj+WZjP2hOZV d5r6IcwrGA/DnwKRJ3NK1EPd+BO90W2Q9utPvs0LnWPCXMxy4WWeOY1bQ8uk1siytEdK 6C8g== X-Gm-Message-State: ALQs6tA2ceCNEiO9krtIWiDJ7aIB14C264JHcw5k9AOHWId3d8WoMfuc x2JQSU7BWdn7yQMpJovoeNo= X-Google-Smtp-Source: AB8JxZrHSs5cPkfEcxAMlgHeScPFBpUEm5odkanjKY/G2WAy96C9R5la+mfxMx1SbDIcVq4ckLYW2A== X-Received: by 2002:a50:f4ca:: with SMTP id v10-v6mr156800edm.162.1524777224935; Thu, 26 Apr 2018 14:13:44 -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.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Apr 2018 14:13:44 -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 1/3] can: janz-ican3: fix ican3_xmit()'s return type Date: Thu, 26 Apr 2018 23:13:36 +0200 Message-Id: <20180426211339.30821-2-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/janz-ican3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c index adfdb66a4..02042cb09 100644 --- a/drivers/net/can/janz-ican3.c +++ b/drivers/net/can/janz-ican3.c @@ -1684,7 +1684,7 @@ static int ican3_stop(struct net_device *ndev) return 0; } -static int ican3_xmit(struct sk_buff *skb, struct net_device *ndev) +static netdev_tx_t ican3_xmit(struct sk_buff *skb, struct net_device *ndev) { struct ican3_dev *mod = netdev_priv(ndev); struct can_frame *cf = (struct can_frame *)skb->data;