diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-11-03 00:06:08 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-11-03 00:06:08 +0100 |
| commit | c7c2f3d9e86c2f09a514247d1623f00850125636 (patch) | |
| tree | f4837969c294b99f2a5537eaad5cc2a8063ec3d3 /drivers/pcmcia/soc_common.c | |
| parent | kernel/time/Kconfig: Fix typo in comment (diff) | |
| parent | drivers/sgi-xp: Convert timers to use timer_setup() (diff) | |
| download | linux-c7c2f3d9e86c2f09a514247d1623f00850125636.tar.xz linux-c7c2f3d9e86c2f09a514247d1623f00850125636.zip | |
Merge tag 'timers-conversion-next3' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/core
Pull the 3rd batch of timer conversions from Kees Cook:
- various per-architecture conversions
- several driver conversions not picked up by a specific maintainer
- other Acked/Reviewed conversions to go through tip
Diffstat (limited to 'drivers/pcmcia/soc_common.c')
| -rw-r--r-- | drivers/pcmcia/soc_common.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index b6b316de055c..764650eb8897 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -456,9 +456,9 @@ static void soc_common_check_status(struct soc_pcmcia_socket *skt) } /* Let's poll for events in addition to IRQs since IRQ only is unreliable... */ -static void soc_common_pcmcia_poll_event(unsigned long dummy) +static void soc_common_pcmcia_poll_event(struct timer_list *t) { - struct soc_pcmcia_socket *skt = (struct soc_pcmcia_socket *)dummy; + struct soc_pcmcia_socket *skt = from_timer(skt, t, poll_timer); debug(skt, 4, "polling for events\n"); mod_timer(&skt->poll_timer, jiffies + SOC_PCMCIA_POLL_PERIOD); @@ -794,8 +794,7 @@ int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt) skt->cs_state = dead_socket; - setup_timer(&skt->poll_timer, soc_common_pcmcia_poll_event, - (unsigned long)skt); + timer_setup(&skt->poll_timer, soc_common_pcmcia_poll_event, 0); skt->poll_timer.expires = jiffies + SOC_PCMCIA_POLL_PERIOD; ret = request_resource(&iomem_resource, &skt->res_skt); |