RDMA/ocrdma: Code clean-up

Clean up code.  Also modifying GSI QP to error during ocrdma_close is fixed.

Signed-off-by: Devesh Sharma <devesh.sharma@emulex.com>
Signed-off-by: Selvin Xavier <selvin.xavier@emulex.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --cc drivers/infiniband/hw/ocrdma/ocrdma.h
Simple merge

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_abi.h
Simple merge

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_ah.c
Simple merge

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_hw.c
Simple merge

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_main.c
Simple merge

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_sli.h
Simple merge

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
Simple merge