diff options
| author | Doug Ledford | 2017-08-25 02:25:15 +0200 |
|---|---|---|
| committer | Doug Ledford | 2017-08-25 02:25:15 +0200 |
| commit | a1139697adac394ce1fb06410b914f070b314f64 (patch) | |
| tree | 34beeb4d2030ac0c6accadedadde2b8b6fb23002 /drivers/infiniband/core/device.c | |
| parent | RDMA/i40iw: Remove unused argument (diff) | |
| parent | IB/mlx5: Report mlx5 enhanced multi packet WQE capability (diff) | |
| download | kernel-qcow2-linux-a1139697adac394ce1fb06410b914f070b314f64.tar.gz kernel-qcow2-linux-a1139697adac394ce1fb06410b914f070b314f64.tar.xz kernel-qcow2-linux-a1139697adac394ce1fb06410b914f070b314f64.zip | |
Merge branch 'mellanox' into k.o/for-next
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/core/device.c')
| -rw-r--r-- | drivers/infiniband/core/device.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index 2466ffc6362d..84fc32a2c8b3 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -747,7 +747,7 @@ EXPORT_SYMBOL(ib_set_client_data); * chapter 11 of the InfiniBand Architecture Specification). This * callback may occur in interrupt context. */ -int ib_register_event_handler (struct ib_event_handler *event_handler) +void ib_register_event_handler(struct ib_event_handler *event_handler) { unsigned long flags; @@ -755,8 +755,6 @@ int ib_register_event_handler (struct ib_event_handler *event_handler) list_add_tail(&event_handler->list, &event_handler->device->event_handler_list); spin_unlock_irqrestore(&event_handler->device->event_handler_lock, flags); - - return 0; } EXPORT_SYMBOL(ib_register_event_handler); @@ -767,15 +765,13 @@ EXPORT_SYMBOL(ib_register_event_handler); * Unregister an event handler registered with * ib_register_event_handler(). */ -int ib_unregister_event_handler(struct ib_event_handler *event_handler) +void ib_unregister_event_handler(struct ib_event_handler *event_handler) { unsigned long flags; spin_lock_irqsave(&event_handler->device->event_handler_lock, flags); list_del(&event_handler->list); spin_unlock_irqrestore(&event_handler->device->event_handler_lock, flags); - - return 0; } EXPORT_SYMBOL(ib_unregister_event_handler); |