From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755532AbdKBLOZ (ORCPT ); Thu, 2 Nov 2017 07:14:25 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:62641 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752308AbdKBLOY (ORCPT ); Thu, 2 Nov 2017 07:14:24 -0400 From: Arnd Bergmann To: "David S . Miller" Cc: Arnd Bergmann , Russell King , Kees Cook , linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org 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== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 */ }; -- 2.9.0