projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mlx4_core: Add link type autosensing
[cascardo/linux.git]
/
drivers
/
net
/
mlx4
/
catas.c
diff --git
a/drivers/net/mlx4/catas.c
b/drivers/net/mlx4/catas.c
index
f094ee0
..
aa9674b
100644
(file)
--- a/
drivers/net/mlx4/catas.c
+++ b/
drivers/net/mlx4/catas.c
@@
-42,7
+42,6
@@
enum {
static DEFINE_SPINLOCK(catas_lock);
static LIST_HEAD(catas_list);
static DEFINE_SPINLOCK(catas_lock);
static LIST_HEAD(catas_list);
-static struct workqueue_struct *catas_wq;
static struct work_struct catas_work;
static int internal_err_reset = 1;
static struct work_struct catas_work;
static int internal_err_reset = 1;
@@
-77,7
+76,7
@@
static void poll_catas(unsigned long dev_ptr)
list_add(&priv->catas_err.list, &catas_list);
spin_unlock(&catas_lock);
list_add(&priv->catas_err.list, &catas_list);
spin_unlock(&catas_lock);
- queue_work(
catas
_wq, &catas_work);
+ queue_work(
mlx4
_wq, &catas_work);
}
} else
mod_timer(&priv->catas_err.timer,
}
} else
mod_timer(&priv->catas_err.timer,
@@
-146,18
+145,7
@@
void mlx4_stop_catas_poll(struct mlx4_dev *dev)
spin_unlock_irq(&catas_lock);
}
spin_unlock_irq(&catas_lock);
}
-
int
__init mlx4_catas_init(void)
+
void
__init mlx4_catas_init(void)
{
INIT_WORK(&catas_work, catas_reset);
{
INIT_WORK(&catas_work, catas_reset);
-
- catas_wq = create_singlethread_workqueue("mlx4_err");
- if (!catas_wq)
- return -ENOMEM;
-
- return 0;
-}
-
-void mlx4_catas_cleanup(void)
-{
- destroy_workqueue(catas_wq);
}
}