Merge branch 'poll' into staging/for_v3.4

* poll: (5970 commits)
  poll: add poll_requested_events() and poll_does_not_wait() functions
  crc32: select an algorithm via Kconfig
  crc32: add self-test code for crc32c
  crypto: crc32c should use library implementation
  crc32: bolt on crc32c
  crc32: add note about this patchset to crc32.c
  crc32: optimize loop counter for x86
  crc32: add slice-by-8 algorithm to existing code
  crc32: make CRC_*_BITS definition correspond to actual bit counts
  crc32: fix mixing of endian-specific types
  crc32: miscellaneous cleanups
  crc32: simplify unit test code
  crc32: move long comment about crc32 fundamentals to Documentation/
  crc32: remove two instances of trailing whitespaces
  checkpatch: check for quoted strings broken across lines
  checkpatch: whitespace - add/remove blank lines
  checkpatch: warn on use of yield()
  checkpatch: add --strict tests for braces, comments and casts
  checkpatch: add [] to type extensions
  checkpatch: high precedence operators do not require additional parentheses in #defines
  ...

5 files changed, 3 insertions, 10 deletions

diff --git a/drivers/media/video/cx18/cx18-alsa-main.c b/drivers/media/video/cx18/cx18-alsa-main.c
index a1e6c2a32478..e118361c2e7b 100644
--- a/drivers/media/video/cx18/cx18-alsa-main.c
+++ b/drivers/media/video/cx18/cx18-alsa-main.c
@@ -285,7 +285,6 @@ static void __exit cx18_alsa_exit(void)
 
         drv = driver_find("cx18", &pci_bus_type);
         ret = driver_for_each_device(drv, NULL, NULL, cx18_alsa_exit_callback);
-        put_driver(drv);
 
         cx18_ext_init = NULL;
         printk(KERN_INFO "cx18-alsa: module unload complete\n");
diff --git a/drivers/media/video/ivtv/ivtv-udma.c b/drivers/media/video/ivtv/ivtv-udma.c
index 69cc8166b20b..7338cb2d0a38 100644
--- a/drivers/media/video/ivtv/ivtv-udma.c
+++ b/drivers/media/video/ivtv/ivtv-udma.c
@@ -57,9 +57,9 @@ int ivtv_udma_fill_sg_list (struct ivtv_user_dma *dma, struct ivtv_dma_page_info
                         if (dma->bouncemap[map_offset] == NULL)
                                 return -1;
                         local_irq_save(flags);
-                        src = kmap_atomic(dma->map[map_offset], KM_BOUNCE_READ) + offset;
+                        src = kmap_atomic(dma->map[map_offset]) + offset;
                         memcpy(page_address(dma->bouncemap[map_offset]) + offset, src, len);
-                        kunmap_atomic(src, KM_BOUNCE_READ);
+                        kunmap_atomic(src);
                         local_irq_restore(flags);
                         sg_set_page(&dma->SGlist[map_offset], dma->bouncemap[map_offset], len, offset);
                 }
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c
index d0fbfcf7133d..e5e7fa9e737b 100644
--- a/drivers/media/video/ivtv/ivtvfb.c
+++ b/drivers/media/video/ivtv/ivtvfb.c
@@ -1293,7 +1293,6 @@ static int __init ivtvfb_init(void)
 
         drv = driver_find("ivtv", &pci_bus_type);
         err = driver_for_each_device(drv, NULL, &registered, ivtvfb_callback_init);
-        put_driver(drv);
         if (!registered) {
                 printk(KERN_ERR "ivtvfb:  no cards found\n");
                 return -ENODEV;
@@ -1310,7 +1309,6 @@ static void ivtvfb_cleanup(void)
 
         drv = driver_find("ivtv", &pci_bus_type);
         err = driver_for_each_device(drv, NULL, NULL, ivtvfb_callback_cleanup);
-        put_driver(drv);
 }
 
 module_init(ivtvfb_init);
diff --git a/drivers/media/video/s5p-fimc/fimc-mdevice.c b/drivers/media/video/s5p-fimc/fimc-mdevice.c
index 087ea098ea29..62ed37e40149 100644
--- a/drivers/media/video/s5p-fimc/fimc-mdevice.c
+++ b/drivers/media/video/s5p-fimc/fimc-mdevice.c
@@ -344,16 +344,13 @@ static int fimc_md_register_platform_entities(struct fimc_md *fmd)
                 return -ENODEV;
         ret = driver_for_each_device(driver, NULL, fmd,
                                      fimc_register_callback);
-        put_driver(driver);
         if (ret)
                 return ret;
 
         driver = driver_find(CSIS_DRIVER_NAME, &platform_bus_type);
-        if (driver) {
+        if (driver)
                 ret = driver_for_each_device(driver, NULL, fmd,
                                              csis_register_callback);
-                put_driver(driver);
-        }
         return ret;
 }
 
diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c
index 7884baeff76a..f7ca5cc143c6 100644
--- a/drivers/media/video/s5p-tv/mixer_video.c
+++ b/drivers/media/video/s5p-tv/mixer_video.c
@@ -58,7 +58,6 @@ static struct v4l2_subdev *find_and_register_subdev(
         }
 
 done:
-        put_driver(drv);
         return sd;
 }