diff options
| author | Roland Dreier <rolandd@cisco.com> | 2008-04-16 21:01:08 -0700 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2008-04-16 21:01:08 -0700 |
| commit | 37608eea86a358ac6a18df0af55d4f77d08a1f30 (patch) | |
| tree | bb0d7c9a93763e6b3fda744a08b2a0c6ed80dfec /include/linux/mlx4 | |
| parent | 26c4fc26d0af9b16a6a234318d15ee0b3896a63d (diff) | |
| download | linux-3.10-37608eea86a358ac6a18df0af55d4f77d08a1f30.tar.gz linux-3.10-37608eea86a358ac6a18df0af55d4f77d08a1f30.tar.bz2 linux-3.10-37608eea86a358ac6a18df0af55d4f77d08a1f30.zip | |
mlx4_core: Fix confusion between mlx4_event and mlx4_dev_event enums
The struct mlx4_interface.event() method was supposed to get an enum
mlx4_dev_event, but the driver code was actually passing in the
hardware enum mlx4_event values. Fix up the callers of
mlx4_dispatch_event() so that they pass in the right type of value,
and fix up the event method in mlx4_ib so that it can handle the enum
mlx4_dev_event values.
This eliminates the need for the subtype parameter to the event
method, so remove it.
This also fixes the sparse warning
drivers/net/mlx4/intf.c:127:48: warning: mixing different enum types
drivers/net/mlx4/intf.c:127:48: int enum mlx4_event versus
drivers/net/mlx4/intf.c:127:48: int enum mlx4_dev_event
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'include/linux/mlx4')
| -rw-r--r-- | include/linux/mlx4/driver.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/mlx4/driver.h b/include/linux/mlx4/driver.h index 1b835ca49df..53c5fdb6eac 100644 --- a/include/linux/mlx4/driver.h +++ b/include/linux/mlx4/driver.h @@ -48,8 +48,7 @@ struct mlx4_interface { void * (*add) (struct mlx4_dev *dev); void (*remove)(struct mlx4_dev *dev, void *context); void (*event) (struct mlx4_dev *dev, void *context, - enum mlx4_dev_event event, int subtype, - int port); + enum mlx4_dev_event event, int port); struct list_head list; }; |