Skip to content

Commit

Permalink
mISDN: hfcpci: Convert timers to use timer_setup()
Browse files Browse the repository at this point in the history
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: Karsten Keil <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Arvind Yadav <[email protected]>
Cc: Geliang Tang <[email protected]>
Cc: [email protected]
Signed-off-by: Kees Cook <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
kees authored and davem330 committed Nov 3, 2017
1 parent 5212dfa commit c509a82
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/isdn/hardware/mISDN/hfcpci.c
Original file line number Diff line number Diff line change
Expand Up @@ -2265,7 +2265,7 @@ static struct pci_driver hfc_driver = {
};

static int
_hfcpci_softirq(struct device *dev, void *arg)
_hfcpci_softirq(struct device *dev, void *unused)
{
struct hfc_pci *hc = dev_get_drvdata(dev);
struct bchannel *bch;
Expand All @@ -2290,9 +2290,9 @@ _hfcpci_softirq(struct device *dev, void *arg)
}

static void
hfcpci_softirq(void *arg)
hfcpci_softirq(struct timer_list *unused)
{
WARN_ON_ONCE(driver_for_each_device(&hfc_driver.driver, NULL, arg,
WARN_ON_ONCE(driver_for_each_device(&hfc_driver.driver, NULL, NULL,
_hfcpci_softirq) != 0);

/* if next event would be in the past ... */
Expand Down Expand Up @@ -2327,9 +2327,7 @@ HFC_init(void)
if (poll != HFCPCI_BTRANS_THRESHOLD) {
printk(KERN_INFO "%s: Using alternative poll value of %d\n",
__func__, poll);
hfc_tl.function = (void *)hfcpci_softirq;
hfc_tl.data = 0;
init_timer(&hfc_tl);
timer_setup(&hfc_tl, hfcpci_softirq, 0);
hfc_tl.expires = jiffies + tics;
hfc_jiffies = hfc_tl.expires;
add_timer(&hfc_tl);
Expand Down

0 comments on commit c509a82

Please sign in to comment.