Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[linux-2.6-microblaze.git] / drivers / pcmcia / electra_cf.c

diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index c6fe2a4..9671ded 100644 (file)
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -79,9 +79,9 @@ static int electra_cf_ss_init(struct pcmcia_socket *s)
 }
 
 /* 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);
 
        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)
 {
-       electra_cf_timer((unsigned long)_cf);
+       struct electra_cf_socket *cf = _cf;
+
+       electra_cf_timer(&cf->timer);
        return IRQ_HANDLED;
 }
 
@@ -206,7 +208,7 @@ static int electra_cf_probe(struct platform_device *ofdev)
        if (!cf)
                return -ENOMEM;
 
-       setup_timer(&cf->timer, electra_cf_timer, (unsigned long)cf);
+       timer_setup(&cf->timer, electra_cf_timer, 0);
        cf->irq = 0;
 
        cf->ofdev = ofdev;
@@ -305,7 +307,7 @@ static int electra_cf_probe(struct platform_device *ofdev)
                 cf->mem_phys, io.start, cf->irq);
 
        cf->active = 1;
-       electra_cf_timer((unsigned long)cf);
+       electra_cf_timer(&cf->timer);
        return 0;
 
 fail3: