Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pcmcia/electra_cf: Convert timers to use timer_setup()

Browse source 
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: linux-pcmcia@lists.infradead.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kees Cook 2017-10-16 17:28:59 -07:00 • committed by David S. Miller
parent 41fce7034b
commit 80c5a20b53
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/pcmcia/electra_cf.c
View file

@ -79,9 +79,9 @@ static int electra_cf_ss_init(struct pcmcia_socket *s)
} }
/* the timer is primarily to kick this socket's pccardd */ /* the timer is primarily to kick this socket's pccardd */
static void electra_cf_timer(unsigned long _cf) static void electra_cf_timer(struct timer_list *t)
{ {
struct electra_cf_socket *cf = (void *) _cf; struct electra_cf_socket *cf = from_timer(cf, t, timer);
int present = electra_cf_present(cf); int present = electra_cf_present(cf);
if (present != cf->present) { if (present != cf->present) {
@ -95,7 +95,9 @@ static void electra_cf_timer(unsigned long _cf)
static irqreturn_t electra_cf_irq(int irq, void *_cf) static irqreturn_t electra_cf_irq(int irq, void *_cf)
{ {
electra_cf_timer((unsigned long)_cf); struct electra_cf_socket *cf = _cf;
electra_cf_timer(&cf->timer);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -206,7 +208,7 @@ static int electra_cf_probe(struct platform_device *ofdev)
if (!cf) if (!cf)
return -ENOMEM; return -ENOMEM;
setup_timer(&cf->timer, electra_cf_timer, (unsigned long)cf); timer_setup(&cf->timer, electra_cf_timer, 0);
cf->irq = 0; cf->irq = 0;
cf->ofdev = ofdev; cf->ofdev = ofdev;
@ -305,7 +307,7 @@ static int electra_cf_probe(struct platform_device *ofdev)
cf->mem_phys, io.start, cf->irq); cf->mem_phys, io.start, cf->irq);
cf->active = 1; cf->active = 1;
electra_cf_timer((unsigned long)cf); electra_cf_timer(&cf->timer);
return 0; return 0;
fail3: fail3: