mirror of
https://github.com/freebsd/freebsd-src.git
synced 2026-10-28 11:25:21 +01:00
mthca: apply upstream changes to convert to timer_setup() LinuxKPI
Apply upstream changes b9eaf18722221 init_timer() -> setup_timer(), and 86cb30ec07cdc7 setup_timer() -> timer_setup() to get us out of Linux version 4.15 (and earlier) KPIs. Also apply 41cb08555c416 from_timer -> timer_container_of. MFC after: 3 days Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D59677
This commit is contained in:
1 parent
bcd0d76d48
commit
9d467dfa31
1 file changed
+3
-5
@@ -132,9 +132,9 @@ static void handle_catas(struct mthca_dev *dev)
|
||||
spin_unlock_irqrestore(&catas_lock, flags);
|
||||
}
|
||||
|
||||
static void poll_catas(unsigned long dev_ptr)
|
||||
static void poll_catas(struct timer_list *t)
|
||||
{
|
||||
struct mthca_dev *dev = (struct mthca_dev *) dev_ptr;
|
||||
struct mthca_dev *dev = timer_container_of(dev, t, catas_err.timer);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < dev->catas_err.size; ++i)
|
||||
@@ -151,7 +151,7 @@ void mthca_start_catas_poll(struct mthca_dev *dev)
|
||||
{
|
||||
phys_addr_t addr;
|
||||
|
||||
init_timer(&dev->catas_err.timer);
|
||||
timer_setup(&dev->catas_err.timer, poll_catas, 0);
|
||||
dev->catas_err.map = NULL;
|
||||
|
||||
addr = pci_resource_start(dev->pdev, 0) +
|
||||
@@ -166,8 +166,6 @@ void mthca_start_catas_poll(struct mthca_dev *dev)
|
||||
return;
|
||||
}
|
||||
|
||||
dev->catas_err.timer.data = (unsigned long) dev;
|
||||
dev->catas_err.timer.function = poll_catas;
|
||||
dev->catas_err.timer.expires = jiffies + MTHCA_CATAS_POLL_INTERVAL;
|
||||
INIT_LIST_HEAD(&dev->catas_err.list);
|
||||
add_timer(&dev->catas_err.timer);
|
||||
|
||||
Reference in new issue
Block a user