summaryrefslogtreecommitdiff
path: root/drivers/infiniband/hw/amso1100/c2_qp.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-01-19 15:27:30 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-01-19 15:27:30 +0000
commit210b1847b32951f52d19df229972399e5b987de2 (patch)
treebe6eeb3ba76b4f4331c98d5ba47aa233bea8f22d /drivers/infiniband/hw/amso1100/c2_qp.c
parent93d5bf073a1e01035be66dc41860b9ae9aa9ccfa (diff)
parentd01723479e6a6c70c83295f7847477a016d5e14a (diff)
downloadlinux-3.10-210b1847b32951f52d19df229972399e5b987de2.tar.gz
linux-3.10-210b1847b32951f52d19df229972399e5b987de2.tar.bz2
linux-3.10-210b1847b32951f52d19df229972399e5b987de2.zip
Merge branch 'for-rmk/virt/hyp-boot/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes
Diffstat (limited to 'drivers/infiniband/hw/amso1100/c2_qp.c')
-rw-r--r--drivers/infiniband/hw/amso1100/c2_qp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c
index 0d7b6f23caf..28cd5cb5185 100644
--- a/drivers/infiniband/hw/amso1100/c2_qp.c
+++ b/drivers/infiniband/hw/amso1100/c2_qp.c
@@ -1010,13 +1010,13 @@ out:
return err;
}
-void __devinit c2_init_qp_table(struct c2_dev *c2dev)
+void c2_init_qp_table(struct c2_dev *c2dev)
{
spin_lock_init(&c2dev->qp_table.lock);
idr_init(&c2dev->qp_table.idr);
}
-void __devexit c2_cleanup_qp_table(struct c2_dev *c2dev)
+void c2_cleanup_qp_table(struct c2_dev *c2dev)
{
idr_destroy(&c2dev->qp_table.idr);
}