From patchwork Sun Mar 4 22:57:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 10257891 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 2F3DF60467 for ; Sun, 4 Mar 2018 22:57:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24A62237F1 for ; Sun, 4 Mar 2018 22:57:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1932326E4A; Sun, 4 Mar 2018 22:57:54 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A049A25EF7 for ; Sun, 4 Mar 2018 22:57:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932509AbeCDW5v (ORCPT ); Sun, 4 Mar 2018 17:57:51 -0500 Received: from mx2.mailbox.org ([80.241.60.215]:52096 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932491AbeCDW5q (ORCPT ); Sun, 4 Mar 2018 17:57:46 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 400E640EED; Sun, 4 Mar 2018 23:57:45 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id iG_H2REgeYk1; Sun, 4 Mar 2018 23:57:44 +0100 (CET) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 03/14] patches: Use old parameter type for DEFINE_TIMER Date: Sun, 4 Mar 2018 23:57:06 +0100 Message-Id: <20180304225717.20890-4-hauke@hauke-m.de> In-Reply-To: <20180304225717.20890-1-hauke@hauke-m.de> References: <20180304225717.20890-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use the unsigned long parameters on kernel versions < 4.15 for the DEFINE_TIMER callback. This was changed in Linux mainline commit 24ed960abf1d ("treewide: Switch DEFINE_TIMER callbacks to struct timer_list *") Signed-off-by: Hauke Mehrtens --- patches/0083-timer_list.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 patches/0083-timer_list.patch diff --git a/patches/0083-timer_list.patch b/patches/0083-timer_list.patch new file mode 100644 index 00000000..dca3b948 --- /dev/null +++ b/patches/0083-timer_list.patch @@ -0,0 +1,22 @@ +--- a/drivers/net/wireless/atmel/at76c50x-usb.c ++++ b/drivers/net/wireless/atmel/at76c50x-usb.c +@@ -518,11 +518,19 @@ exit: + + /* LED trigger */ + static int tx_activity; ++#if LINUX_VERSION_IS_LESS(4,15,0) ++static void at76_ledtrig_tx_timerfunc(unsigned long data); ++#else + static void at76_ledtrig_tx_timerfunc(struct timer_list *unused); ++#endif + static DEFINE_TIMER(ledtrig_tx_timer, at76_ledtrig_tx_timerfunc); + DEFINE_LED_TRIGGER(ledtrig_tx); + ++#if LINUX_VERSION_IS_LESS(4,15,0) ++static void at76_ledtrig_tx_timerfunc(unsigned long data) ++#else + static void at76_ledtrig_tx_timerfunc(struct timer_list *unused) ++#endif + { + static int tx_lastactivity; +