From patchwork Thu Nov 2 11:13:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10038483 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 AAF9560291 for ; Thu, 2 Nov 2017 11:14:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A1DC28DF7 for ; Thu, 2 Nov 2017 11:14:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B4EF28F01; Thu, 2 Nov 2017 11:14:25 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 F069E28DF7 for ; Thu, 2 Nov 2017 11:14:24 +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: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:In-Reply-To: References:List-Owner; bh=SVvRWXRaXGK6juNMju/WrMhSubtZQcdPgoADb3t5z94=; b=G7h dSgZ+T0oaJ+8h27A8jI7PkSSND7Taa4H+JSGoBrQXEmxI+PkoicRda6167yRzmDxhTbYZJ4zGU0Px mY4KafG+87IWJ+QIxH/PRdBVRaYx1kHxq9vXwUKU/ZPfdH/nCsVRXPGHh5BRf6sgUax8qobbOc8eW ixsl/WHPmKW3GIOu7WA6qpgvcrGx+3ksAxiieq9vOTdOkHE028OD/inLDWirEN9/dFJ3yhZsFCj8U LVGv22qYSDG5ZmUItLe7oXocPgHQd5ySMKdXhAiL+xw7O+80VqCQyHmRm7gJ/rbC/Cn6tOfN5S6gx 9KKH5DS7KMWmpwBl9Uy/DMNsgVyKNpw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eADS4-0006O6-Bh; Thu, 02 Nov 2017 11:14:24 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eADS0-0006L4-OG for linux-arm-kernel@lists.infradead.org; Thu, 02 Nov 2017 11:14:22 +0000 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0M2dqH-1dKa870EMv-00sQjq; Thu, 02 Nov 2017 12:13:54 +0100 From: Arnd Bergmann To: "David S . Miller" Subject: [PATCH] [net-next] net: seeq: fix timer conversion Date: Thu, 2 Nov 2017 12:13:36 +0100 Message-Id: <20171102111350.3380744-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:qrDWzow80K9sawYJpQiWBzF4+t6AhRlrVbxi3SbJxzYcC2HKXWd HPaSFyjyaExFZxhArYWulANpPYypq1604/dMlqtAOzQ0QhHntN0pi5dZKNGT+t/frhFGSVT F/C+wbjwi+P0hXdlDa6BioC3Wyie6/6E9IsomzOxRLH1IzL7ZZQ3730VmTW6uc3KAFu2Ji6 GP2e2osHWWNkekI6+9oRA== X-UI-Out-Filterresults: notjunk:1; V01:K0:HKukd1khbcc=:LnVlvxZ7IHA0PP9I6vEfnK D8+sXFh0Ms8P3JU8Ty2Ppcna20yL9Ct2TiK9J1cSc4S7j/fkqwFzyuoiXnlpm9gk6x2sZIJdx rsRd4u5U+2k281ZPG8V73CQLG8OKo/jR4wtNgv5zviraCfDjz9wzPGqHkLxL6muATSbHJBhdm tUctfW6TAVXAI+OmKPfet6aiM9Tkb7MjC2HSaUDRN2R0YupkWivyBodli8ZcEr0YxQCJECzU6 B3MGB0mzYeyVey0g5lpmQTy2xONVoqFtdhE6PpZYxYNAHapsvM7xfvbAreBWFjlZ5u++m3JBe Zke2Z2JoP4KQW/IEfmWQntx0ZtH5MPscqaQ7I1yYPwK/XfGen8P5ziHhBAAXYLgJBezevNhAK qxz23DL3RxAH6KZ4xT2UaVIOM08xLZuTu32vyKY+AG+sqIbH/o2edGS0aRYXBFPvWWkpEEJbt GCozgduw0HETxogW7jYnsuGsYY3myO1Wk8xtUNhZKeZJDd8h1FfDfmJBOjzXj+WYH7GCfF9Kk QX7b4odLGit0+9YMltXIoNl+y5VYWufjOQr91xzRx63TZHAuLhkU10Dc7pVHGftgpPuJSNsvo 4t5a0DiLTH0DTF5LkcJ0PuHkz+DizYSWJosQywBBtae80V+hds7FEHKTuEydXC0qJo2BVIONH 2bFoxAnsUh2jcoOW5DaJP01aOnSSGwNuCPLRjBbKHsd6Wp7hPhEcGS1wc39lV+bfJ14Uc0Cr8 ZmLPm+84ps7JW9vmf6Rl5qDQ4hDCbmg4DRjPzA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171102_041421_142154_ADD7B35F X-CRM114-Status: GOOD ( 12.90 ) 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: Kees Cook , Arnd Bergmann , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Russell King , linux-arm-kernel@lists.infradead.org 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 One of the timer conversion patches evidently escaped build testing until I ran into in on ARM randconfig builds: drivers/net/ethernet/seeq/ether3.c: In function 'ether3_ledoff': drivers/net/ethernet/seeq/ether3.c:175:40: error: 'priv' undeclared (first use in this function); did you mean 'pid'? drivers/net/ethernet/seeq/ether3.c:176:27: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] This fixes the two small typos that caused the problems. Fixes: 6fd9c53f7186 ("net: seeq: Convert timers to use timer_setup()") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/seeq/ether3.c | 2 +- drivers/net/ethernet/seeq/ether3.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/seeq/ether3.c b/drivers/net/ethernet/seeq/ether3.c index da4807723a06..c5bc124b41a9 100644 --- a/drivers/net/ethernet/seeq/ether3.c +++ b/drivers/net/ethernet/seeq/ether3.c @@ -172,7 +172,7 @@ ether3_setbuffer(struct net_device *dev, buffer_rw_t read, int start) */ static void ether3_ledoff(struct timer_list *t) { - struct dev_priv *private = from_timer(priv, t, timer); + struct dev_priv *private = from_timer(private, t, timer); struct net_device *dev = private->dev; ether3_outw(priv(dev)->regs.config2 |= CFG2_CTRLO, REG_CONFIG2); diff --git a/drivers/net/ethernet/seeq/ether3.h b/drivers/net/ethernet/seeq/ether3.h index ea2ba286e665..be19e5fa5cf2 100644 --- a/drivers/net/ethernet/seeq/ether3.h +++ b/drivers/net/ethernet/seeq/ether3.h @@ -165,7 +165,7 @@ struct dev_priv { unsigned char tx_tail; /* buffer nr of transmitting packet */ unsigned int rx_head; /* address to fetch next packet from */ struct timer_list timer; - net_device *dev; + struct net_device *dev; int broken; /* 0 = ok, 1 = something went wrong */ };