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: 10366823 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 59CB7601BE for ; Thu, 26 Apr 2018 21:16:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 472B62919E for ; Thu, 26 Apr 2018 21:16:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B8AF29206; Thu, 26 Apr 2018 21:16:41 +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 A7A9A2919E for ; Thu, 26 Apr 2018 21:16:40 +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=K/qd7hUXtxP9Xmd017dcj18N1XmJb+K3DXOED3azRcE=; b=YeGr5uv0iQPnzfMAvpvSj9VAvi iYXkAimDmioTsh+1PbqEBOPD9k3+FBIE/3Ad5XcpI4SP1mNQF1Ko6M5GgzCB7TomAWpcZqejHaWnR YBzfYEIoPg459vZqk7DFUe6MgLG0hd0hqPlgsoFVBbdWcSOQU/oBCLeAAyAFqBU+HUD3++hYUhuBd ba394m69gUEae6FAmHfK9klguPPu8k88FC+pH4jBZFwicp29v3p0JwEBIBqKPfpk1giRzSr/62HEV dbjBfVzMfBFKjUmLpVp7wIgdfZXMomweLCMQYjUr3EpJ+Jkai3J3QpbqXqsvVpuO8DzDE3Cvi3y2n 8RmW8R/g==; 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 1fBoFl-0006SW-1V; Thu, 26 Apr 2018 21:16:33 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fBoDG-0004CP-1M for linux-arm-kernel@lists.infradead.org; Thu, 26 Apr 2018 21:13:59 +0000 Received: by mail-wm0-x244.google.com with SMTP id i3so177680wmf.3 for ; Thu, 26 Apr 2018 14:13:47 -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=NLAmFYhVij3w5SgrUAahNKObznpCgY10ovdYMjHdOCHXzAd+OrGfbgPGFGyVtH7UYx ITR9EKVa2FEpVKagTyvm6Mlw79nLVyomZhJ2+YmJ8cQWuWQBXwMPERfS6Djwsl7ba2uh qp+k62nN/cZmqF63i7o+PH+QX6p0W1D2It6PvI1WcGNou66ECRob2KPgWbi4VHnNbFQd wMWsoowHgrUYCHA3q3on0kPM1pxVBoo3wInsJLdaRX0znNfDOYtWdK41f5/dHbR/LNmF QkEvuFVOIa1QIBL2vD9UvseN1Ku81kWxbtulTU21ry0OjAKkwlEADcea5+COKnix21GV CxQQ== X-Gm-Message-State: ALQs6tAe1o5GbAKfxahEXgzyIW2zjELPAiwSdstfiwrxQqMBnQCTsxQ9 SvmyeWb7w68Y993bxoso4uc= 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180426_141358_109788_95374500 X-CRM114-Status: GOOD ( 13.84 ) 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/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;