All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hauke Mehrtens <hauke@hauke-m.de>
To: backports@vger.kernel.org
Cc: johannes@sipsolutions.net, Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH 03/14] patches: Use old parameter type for DEFINE_TIMER
Date: Sun,  4 Mar 2018 23:57:06 +0100	[thread overview]
Message-ID: <20180304225717.20890-4-hauke@hauke-m.de> (raw)
In-Reply-To: <20180304225717.20890-1-hauke@hauke-m.de>

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 <hauke@hauke-m.de>
---
 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;
+ 
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe backports" in

  parent reply	other threads:[~2018-03-04 22:57 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-04 22:57 [PATCH 00/14] backports: multiple fixes and Realtek drivers Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 01/14] patches: refresh on kernel v4.16-rc3 Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 02/14] compat: timer.h: Remove last parameters from DEFINE_TIMER Hauke Mehrtens
2018-03-04 22:57 ` Hauke Mehrtens [this message]
2018-03-21  7:59   ` [PATCH 03/14] patches: Use old parameter type for DEFINE_TIMER Johannes Berg
2018-03-04 22:57 ` [PATCH 04/14] backport: poll.h: add include linux/eventpoll.h Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 05/14] header: types.h: add __poll_t Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 06/14] header: kernel.h: include bug.h Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 07/14] header: debugfs.h: add DEFINE_DEBUGFS_ATTRIBUTE Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 08/14] header: nospec.h: provide dummy header file Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 09/14] header: timekeeping.h: Add ktime_get_real_seconds() Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 10/14] header: timekeeping.h: Add ktime_get_ts64() Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 11/14] header: netdevice.h: Fix netdev_upper_dev_link on 4.14 Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 12/14] header: inet_frag.h: Use old version of in sub_frag_mem_limit() for kernel 3.16 Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 13/14] dependencies: Make mt76 depend on kernel 4.1 Hauke Mehrtens
2018-03-04 22:57 ` [PATCH 14/14] backports: Add staging rtlwifi, rtl8188eu and rtl8723bs driver Hauke Mehrtens
2018-03-21  8:20 ` [PATCH 00/14] backports: multiple fixes and Realtek drivers Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180304225717.20890-4-hauke@hauke-m.de \
    --to=hauke@hauke-m.de \
    --cc=backports@vger.kernel.org \
    --cc=johannes@sipsolutions.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.