Merge tag 'dt-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...

[karo-tx-linux.git] / block / blk-iopoll.c

diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
index c11d24e379e2a4b89caf1936d4433773caef1bdc..d828b44a404b4f5abc35d7760346870a3902a911 100644 (file)
--- a/block/blk-iopoll.c
+++ b/block/blk-iopoll.c
@@ -64,12 +64,12 @@ EXPORT_SYMBOL(__blk_iopoll_complete);
  *     iopoll handler will not be invoked again before blk_iopoll_sched_prep()
  *     is called.
  **/
-void blk_iopoll_complete(struct blk_iopoll *iopoll)
+void blk_iopoll_complete(struct blk_iopoll *iop)
 {
        unsigned long flags;
 
        local_irq_save(flags);
-       __blk_iopoll_complete(iopoll);
+       __blk_iopoll_complete(iop);
        local_irq_restore(flags);
 }
 EXPORT_SYMBOL(blk_iopoll_complete);