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: 10366821 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ACF326032C for ; Thu, 26 Apr 2018 21:15:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 972CB2919E for ; Thu, 26 Apr 2018 21:15:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B8AE29206; Thu, 26 Apr 2018 21:15:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 118422919E for ; Thu, 26 Apr 2018 21:15:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=gPOWXCmkbzqIAljkEwVlUfbbkXMd6aWpvUrwDwJ1Jq4=; b=rFH+r4AMSWh7Hi+eE5IrV3n7qo itqPQjBkSGYShm9Z+bQLH/5pdaNa39TZVQpDOtC6XE8Uh7S44f2n28vRSfaSzBRrb85PJVVrvXUjh QII50of6V2yO7kfGqoQc1/lyfqO4kDVdoMzTQqKWvk9hdcwFnmBrwGMPNXN+XTJnADHZn9CqmpVv8 nKIxrtH4JLdpW9mLy4k0FQ4FsNJ1Jnlg6E35QmktnTW3FIFYSld7LFPenvFJlTKsyWS1l+IGBh6ws UQ3oLql3AfhpsUooOJyRa70kXrP2wtXgIcyxxqTuEmsg1XTAFGFm1Clp+z4CHcmP3J7fMfDYvS1o0 rdWcjh9Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBoEq-0005cm-6y; Thu, 26 Apr 2018 21:15:36 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBoDE-0004CO-Li for linux-arm-kernel@lists.infradead.org; Thu, 26 Apr 2018 21:13:58 +0000 Received: by mail-wm0-x242.google.com with SMTP id 66so160369wmd.3 for ; 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=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=f/vnbrR1CQKAUDtt5FjjdPnQP9chYMKWSefY4jYhMAeKRB/2WxmIfJDEfJM0yQ1TFR 9Cw4BfsonNBblgIty0iepFaYpY/mhwI1HbysAwe1/Hn721dQ9w3lEpsFpKiBk+Y5Gedq S9WO2K6/F0q1Y3pxTDFliC/LrtXh+bYZevF34Fm2PNaArQZZ6cH5Ocx+rCVeYnTOyfxu WNzuBSLZe/Emk0Pjf5Qx3KDCYZoGG2HBzFRPHLhqMLxp7vUzme+FH5ljAd4+yjj/ZMCC C0m2Pn7q/NX8bXLgVJlSPNgqcsQfWncqZSpfyiY3Y/g1UPVZ7Iu19/e/rkT7OrXWVS+4 HUXA== X-Gm-Message-State: ALQs6tBVKIRp4/D3/FG5aUqjv+T9to95IcKCaXEgMyQCKSW/JRXQqVJq unpUAd2TLC/Jsz11nWBoO9g= 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180426_141356_706591_EB1EA99D X-CRM114-Status: GOOD ( 14.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "moderated list:ARM/Allwinner sunXi SoC support" , open list , Maxime Ripard , "open list:NETWORKING DRIVERS" , Michal Simek , "open list:CAN NETWORK DRIVERS" , Chen-Yu Tsai , Luc Van Oostenryck , Wolfgang Grandegger MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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;