Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[linux-2.6-microblaze.git] / drivers / staging / rdma / hfi1 / chip.c

diff --git a/drivers/staging/rdma/hfi1/chip.c b/drivers/staging/rdma/hfi1/chip.c
index c29860c..16eb653 100644 (file)
--- a/drivers/staging/rdma/hfi1/chip.c
+++ b/drivers/staging/rdma/hfi1/chip.c
@@ -1252,11 +1252,8 @@ CNTR_ELEM(#name, \
 
 u64 read_csr(const struct hfi1_devdata *dd, u32 offset)
 {
-       u64 val;
-
        if (dd->flags & HFI1_PRESENT) {
-               val = readq((void __iomem *)dd->kregbase + offset);
-               return val;
+               return readq((void __iomem *)dd->kregbase + offset);
        }
        return -1;
 }