PCI: cpqphp: Convert timers to use timer_setup()

[mirror_ubuntu-bionic-kernel.git] / drivers / pci / hotplug / cpqphp_core.c

diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index 4d06b84612559218233749d772d4c53dc1f0aaec..70967ac75265471dacc098abebd319b2699ecef4 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -661,9 +661,8 @@ static int ctrl_slot_setup(struct controller *ctrl,
 
                slot->p_sm_slot = slot_entry;
 
-               init_timer(&slot->task_event);
+               timer_setup(&slot->task_event, cpqhp_pushbutton_thread, 0);
                slot->task_event.expires = jiffies + 5 * HZ;
-               slot->task_event.function = cpqhp_pushbutton_thread;
 
                /*FIXME: these capabilities aren't used but if they are
                 *       they need to be correctly implemented