Merge branch 'v4l_for_linus' into staging/for_v3.9

* v4l_for_linus: (464 commits)
  [media] uvcvideo: Set error_idx properly for S_EXT_CTRLS failures
  [media] uvcvideo: Cleanup leftovers of partial revert
  [media] uvcvideo: Return -EACCES when trying to set a read-only control
  Linux 3.8-rc3
  mm: reinstante dropped pmd_trans_splitting() check
  cred: Remove tgcred pointer from struct cred
  drm/ttm: fix fence locking in ttm_buffer_object_transfer
  ARM: clps711x: Fix bad merge of clockevents setup
  ARM: highbank: save and restore L2 cache and GIC on suspend
  ARM: highbank: add a power request clear
  ARM: highbank: fix secondary boot and hotplug
  ARM: highbank: fix typos with hignbank in power request functions
  ARM: dts: fix highbank cpu mpidr values
  ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
  drm/prime: drop reference on imported dma-buf come from gem
  xen/netfront: improve truesize tracking
  ARM: mx5: Fix MX53 flexcan2 clock
  ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
  sctp: fix Kconfig bug in default cookie hmac selection
  EDAC: Cleanup device deregistering path
  ...

Conflicts:
	drivers/media/pci/dm1105/dm1105.c
	drivers/media/platform/soc_camera/mx2_camera.c

38 files changed, 150 insertions, 168 deletions

diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
index aa9f846a667e..12e0faf53403 100644
--- a/drivers/media/platform/blackfin/bfin_capture.c
+++ b/drivers/media/platform/blackfin/bfin_capture.c
@@ -946,7 +946,7 @@ static struct v4l2_file_operations bcap_fops = {
         .poll = bcap_poll
 };
 
-static int __devinit bcap_probe(struct platform_device *pdev)
+static int bcap_probe(struct platform_device *pdev)
 {
         struct bcap_device *bcap_dev;
         struct video_device *vfd;
@@ -1144,7 +1144,7 @@ err_free_dev:
         return ret;
 }
 
-static int __devexit bcap_remove(struct platform_device *pdev)
+static int bcap_remove(struct platform_device *pdev)
 {
         struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev);
         struct bcap_device *bcap_dev = container_of(v4l2_dev,
@@ -1166,7 +1166,7 @@ static struct platform_driver bcap_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = bcap_probe,
-        .remove = __devexit_p(bcap_remove),
+        .remove = bcap_remove,
 };
 module_platform_driver(bcap_driver);
 
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index 2721f839852f..8d20b644bf2c 100644
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -1921,7 +1921,7 @@ static const struct of_device_id coda_dt_ids[] = {
 MODULE_DEVICE_TABLE(of, coda_dt_ids);
 #endif
 
-static int __devinit coda_probe(struct platform_device *pdev)
+static int coda_probe(struct platform_device *pdev)
 {
         const struct of_device_id *of_id =
                         of_match_device(of_match_ptr(coda_dt_ids), &pdev->dev);
@@ -2063,7 +2063,7 @@ static int coda_remove(struct platform_device *pdev)
 
 static struct platform_driver coda_driver = {
         .probe  = coda_probe,
-        .remove = __devexit_p(coda_remove),
+        .remove = coda_remove,
         .driver = {
                 .name   = CODA_NAME,
                 .owner  = THIS_MODULE,
diff --git a/drivers/media/platform/davinci/dm355_ccdc.c b/drivers/media/platform/davinci/dm355_ccdc.c
index 030950dcfb16..f263cabade7a 100644
--- a/drivers/media/platform/davinci/dm355_ccdc.c
+++ b/drivers/media/platform/davinci/dm355_ccdc.c
@@ -965,7 +965,7 @@ static struct ccdc_hw_device ccdc_hw_dev = {
         },
 };
 
-static int __devinit dm355_ccdc_probe(struct platform_device *pdev)
+static int dm355_ccdc_probe(struct platform_device *pdev)
 {
         void (*setup_pinmux)(void);
         struct resource *res;
@@ -1069,7 +1069,7 @@ static struct platform_driver dm355_ccdc_driver = {
                 .name   = "dm355_ccdc",
                 .owner = THIS_MODULE,
         },
-        .remove = __devexit_p(dm355_ccdc_remove),
+        .remove = dm355_ccdc_remove,
         .probe = dm355_ccdc_probe,
 };
 
diff --git a/drivers/media/platform/davinci/dm644x_ccdc.c b/drivers/media/platform/davinci/dm644x_ccdc.c
index 0215ab6ebc90..318e80512998 100644
--- a/drivers/media/platform/davinci/dm644x_ccdc.c
+++ b/drivers/media/platform/davinci/dm644x_ccdc.c
@@ -957,7 +957,7 @@ static struct ccdc_hw_device ccdc_hw_dev = {
         },
 };
 
-static int __devinit dm644x_ccdc_probe(struct platform_device *pdev)
+static int dm644x_ccdc_probe(struct platform_device *pdev)
 {
         struct resource *res;
         int status = 0;
@@ -1078,7 +1078,7 @@ static struct platform_driver dm644x_ccdc_driver = {
                 .owner = THIS_MODULE,
                 .pm = &dm644x_ccdc_pm_ops,
         },
-        .remove = __devexit_p(dm644x_ccdc_remove),
+        .remove = dm644x_ccdc_remove,
         .probe = dm644x_ccdc_probe,
 };
 
diff --git a/drivers/media/platform/davinci/isif.c b/drivers/media/platform/davinci/isif.c
index 2c26c3e1837e..5050f9265f48 100644
--- a/drivers/media/platform/davinci/isif.c
+++ b/drivers/media/platform/davinci/isif.c
@@ -1032,7 +1032,7 @@ static struct ccdc_hw_device isif_hw_dev = {
         },
 };
 
-static int __devinit isif_probe(struct platform_device *pdev)
+static int isif_probe(struct platform_device *pdev)
 {
         void (*setup_pinmux)(void);
         struct resource *res;
@@ -1156,7 +1156,7 @@ static struct platform_driver isif_driver = {
                 .name   = "isif",
                 .owner = THIS_MODULE,
         },
-        .remove = __devexit_p(isif_remove),
+        .remove = isif_remove,
         .probe = isif_probe,
 };
 
diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
index fe2b9ce0bce8..4d9469733fd9 100644
--- a/drivers/media/platform/davinci/vpbe.c
+++ b/drivers/media/platform/davinci/vpbe.c
@@ -805,7 +805,7 @@ static struct vpbe_device_ops vpbe_dev_ops = {
         .set_mode = vpbe_set_mode,
 };
 
-static __devinit int vpbe_probe(struct platform_device *pdev)
+static int vpbe_probe(struct platform_device *pdev)
 {
         struct vpbe_device *vpbe_dev;
         struct vpbe_config *cfg;
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index d078738b35d6..5e6b0cab514b 100644
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -1661,8 +1661,8 @@ static int vpbe_device_get(struct device *dev, void *data)
         return 0;
 }
 
-static __devinit int init_vpbe_layer(int i, struct vpbe_display *disp_dev,
-                                     struct platform_device *pdev)
+static int init_vpbe_layer(int i, struct vpbe_display *disp_dev,
+                           struct platform_device *pdev)
 {
         struct vpbe_layer *vpbe_display_layer = NULL;
         struct video_device *vbd = NULL;
@@ -1717,9 +1717,10 @@ static __devinit int init_vpbe_layer(int i, struct vpbe_display *disp_dev,
         return 0;
 }
 
-static __devinit int register_device(struct vpbe_layer *vpbe_display_layer,
-                                        struct vpbe_display *disp_dev,
-                                        struct platform_device *pdev) {
+static int register_device(struct vpbe_layer *vpbe_display_layer,
+                           struct vpbe_display *disp_dev,
+                           struct platform_device *pdev)
+{
         int err;
 
         v4l2_info(&disp_dev->vpbe_dev->v4l2_dev,
@@ -1751,7 +1752,7 @@ static __devinit int register_device(struct vpbe_layer *vpbe_display_layer,
  * This function creates device entries by register itself to the V4L2 driver
  * and initializes fields of each layer objects
  */
-static __devinit int vpbe_display_probe(struct platform_device *pdev)
+static int vpbe_display_probe(struct platform_device *pdev)
 {
         struct vpbe_layer *vpbe_display_layer;
         struct vpbe_display *disp_dev;
@@ -1885,7 +1886,7 @@ static struct platform_driver vpbe_display_driver = {
                 .bus = &platform_bus_type,
         },
         .probe = vpbe_display_probe,
-        .remove = __devexit_p(vpbe_display_remove),
+        .remove = vpbe_display_remove,
 };
 
 module_platform_driver(vpbe_display_driver);
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index 65f4264bd5b4..28d019da4c01 100644
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -1828,7 +1828,7 @@ static struct vpfe_device *vpfe_initialize(void)
  * itself to the V4L2 driver and initializes fields of each
  * device objects
  */
-static __devinit int vpfe_probe(struct platform_device *pdev)
+static int vpfe_probe(struct platform_device *pdev)
 {
         struct vpfe_subdev_info *sdinfo;
         struct vpfe_config *vpfe_cfg;
@@ -2035,7 +2035,7 @@ probe_free_dev_mem:
 /*
  * vpfe_remove : It un-register device from V4L2 driver
  */
-static int __devexit vpfe_remove(struct platform_device *pdev)
+static int vpfe_remove(struct platform_device *pdev)
 {
         struct vpfe_device *vpfe_dev = platform_get_drvdata(pdev);
 
@@ -2072,7 +2072,7 @@ static struct platform_driver vpfe_driver = {
                 .pm = &vpfe_dev_pm_ops,
         },
         .probe = vpfe_probe,
-        .remove = __devexit_p(vpfe_remove),
+        .remove = vpfe_remove,
 };
 
 module_platform_driver(vpfe_driver);
diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c
index 0d6cc8e4deb2..28638a86f129 100644
--- a/drivers/media/platform/davinci/vpif.c
+++ b/drivers/media/platform/davinci/vpif.c
@@ -419,7 +419,7 @@ int vpif_channel_getfid(u8 channel_id)
 }
 EXPORT_SYMBOL(vpif_channel_getfid);
 
-static int __devinit vpif_probe(struct platform_device *pdev)
+static int vpif_probe(struct platform_device *pdev)
 {
         int status = 0;
 
@@ -457,7 +457,7 @@ fail:
         return status;
 }
 
-static int __devexit vpif_remove(struct platform_device *pdev)
+static int vpif_remove(struct platform_device *pdev)
 {
         if (vpif_clk) {
                 clk_disable_unprepare(vpif_clk);
@@ -498,7 +498,7 @@ static struct platform_driver vpif_driver = {
                 .owner = THIS_MODULE,
                 .pm     = vpif_pm_ops,
         },
-        .remove = __devexit_p(vpif_remove),
+        .remove = vpif_remove,
         .probe = vpif_probe,
 };
 
diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c
index d945f94053a8..494d32231fb5 100644
--- a/drivers/media/platform/davinci/vpss.c
+++ b/drivers/media/platform/davinci/vpss.c
@@ -406,7 +406,7 @@ void dm365_vpss_set_pg_frame_size(struct vpss_pg_frame_size frame_size)
 }
 EXPORT_SYMBOL(dm365_vpss_set_pg_frame_size);
 
-static int __devinit vpss_probe(struct platform_device *pdev)
+static int vpss_probe(struct platform_device *pdev)
 {
         struct resource         *r1, *r2;
         char *platform_name;
@@ -504,7 +504,7 @@ fail1:
         return status;
 }
 
-static int __devexit vpss_remove(struct platform_device *pdev)
+static int vpss_remove(struct platform_device *pdev)
 {
         struct resource         *res;
 
@@ -524,7 +524,7 @@ static struct platform_driver vpss_driver = {
                 .name   = "vpss",
                 .owner = THIS_MODULE,
         },
-        .remove = __devexit_p(vpss_remove),
+        .remove = vpss_remove,
         .probe = vpss_probe,
 };
 
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index ae885c7ebc41..99b841d2f8fc 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -1152,7 +1152,7 @@ err_clk:
         return ret;
 }
 
-static int __devexit gsc_remove(struct platform_device *pdev)
+static int gsc_remove(struct platform_device *pdev)
 {
         struct gsc_dev *gsc = platform_get_drvdata(pdev);
 
@@ -1239,7 +1239,7 @@ static const struct dev_pm_ops gsc_pm_ops = {
 
 static struct platform_driver gsc_driver = {
         .probe          = gsc_probe,
-        .remove = __devexit_p(gsc_remove),
+        .remove         = gsc_remove,
         .id_table       = gsc_driver_ids,
         .driver = {
                 .name   = GSC_MODULE_NAME,
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index d464509d0f0e..5f7db3f1f6f5 100644
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -1478,7 +1478,7 @@ static struct video_device viu_template = {
         .current_norm   = V4L2_STD_NTSC_M,
 };
 
-static int __devinit viu_of_probe(struct platform_device *op)
+static int viu_of_probe(struct platform_device *op)
 {
         struct viu_dev *viu_dev;
         struct video_device *vdev;
@@ -1615,7 +1615,7 @@ err:
         return ret;
 }
 
-static int __devexit viu_of_remove(struct platform_device *op)
+static int viu_of_remove(struct platform_device *op)
 {
         struct v4l2_device *v4l2_dev = dev_get_drvdata(&op->dev);
         struct viu_dev *dev = container_of(v4l2_dev, struct viu_dev, v4l2_dev);
@@ -1668,7 +1668,7 @@ MODULE_DEVICE_TABLE(of, mpc512x_viu_of_match);
 
 static struct platform_driver viu_of_platform_driver = {
         .probe = viu_of_probe,
-        .remove = __devexit_p(viu_of_remove),
+        .remove = viu_of_remove,
 #ifdef CONFIG_PM
         .suspend = viu_suspend,
         .resume = viu_resume,
diff --git a/drivers/media/platform/omap24xxcam.c b/drivers/media/platform/omap24xxcam.c
index eda3274abf8e..debb44ceb185 100644
--- a/drivers/media/platform/omap24xxcam.c
+++ b/drivers/media/platform/omap24xxcam.c
@@ -1736,7 +1736,7 @@ static struct v4l2_int_device omap24xxcam = {
  *
  */
 
-static int __devinit omap24xxcam_probe(struct platform_device *pdev)
+static int omap24xxcam_probe(struct platform_device *pdev)
 {
         struct omap24xxcam_device *cam;
         struct resource *mem;
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index a9f6de5b69d8..e4aaee91201d 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -71,8 +71,6 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-device.h>
 
-#include <plat/cpu.h>
-
 #include "isp.h"
 #include "ispreg.h"
 #include "ispccdc.h"
@@ -1992,7 +1990,7 @@ error_csiphy:
  *
  * Always returns 0.
  */
-static int __devexit isp_remove(struct platform_device *pdev)
+static int isp_remove(struct platform_device *pdev)
 {
         struct isp_device *isp = platform_get_drvdata(pdev);
         int i;
@@ -2073,7 +2071,7 @@ static int isp_map_mem_resource(struct platform_device *pdev,
  *   -EINVAL if couldn't install ISR,
  *   or clk_get return error value.
  */
-static int __devinit isp_probe(struct platform_device *pdev)
+static int isp_probe(struct platform_device *pdev)
 {
         struct isp_platform_data *pdata = pdev->dev.platform_data;
         struct isp_device *isp;
@@ -2252,7 +2250,7 @@ MODULE_DEVICE_TABLE(platform, omap3isp_id_table);
 
 static struct platform_driver omap3isp_driver = {
         .probe = isp_probe,
-        .remove = __devexit_p(isp_remove),
+        .remove = isp_remove,
         .id_table = omap3isp_id_table,
         .driver = {
                 .owner = THIS_MODULE,
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index e0d73a642186..8dac17511e61 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -35,9 +35,6 @@
 #include <linux/vmalloc.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-ioctl.h>
-#include <plat/iommu.h>
-#include <plat/iovmm.h>
-#include <plat/omap-pm.h>
 
 #include "ispvideo.h"
 #include "isp.h"
diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/s3c-camif/camif-core.c
index 37c9b6faae26..8f0ca02c29a9 100644
--- a/drivers/media/platform/s3c-camif/camif-core.c
+++ b/drivers/media/platform/s3c-camif/camif-core.c
@@ -532,7 +532,7 @@ err_sd:
         return ret;
 }
 
-static int __devexit s3c_camif_remove(struct platform_device *pdev)
+static int s3c_camif_remove(struct platform_device *pdev)
 {
         struct camif_dev *camif = platform_get_drvdata(pdev);
         struct s3c_camif_plat_data *pdata = &camif->pdata;
@@ -646,7 +646,7 @@ static const struct dev_pm_ops s3c_camif_pm_ops = {
 
 static struct platform_driver s3c_camif_driver = {
         .probe          = s3c_camif_probe,
-        .remove         = __devexit_p(s3c_camif_remove),
+        .remove         = s3c_camif_remove,
         .id_table       = s3c_camif_driver_ids,
         .driver = {
                 .name   = S3C_CAMIF_DRIVER_NAME,
diff --git a/drivers/media/platform/s5p-fimc/fimc-core.c b/drivers/media/platform/s5p-fimc/fimc-core.c
index 2a1558a37a41..2e86f44edd23 100644
--- a/drivers/media/platform/s5p-fimc/fimc-core.c
+++ b/drivers/media/platform/s5p-fimc/fimc-core.c
@@ -1035,7 +1035,7 @@ static int fimc_suspend(struct device *dev)
 }
 #endif /* CONFIG_PM_SLEEP */
 
-static int __devexit fimc_remove(struct platform_device *pdev)
+static int fimc_remove(struct platform_device *pdev)
 {
         struct fimc_dev *fimc = platform_get_drvdata(pdev);
 
@@ -1278,7 +1278,7 @@ static const struct dev_pm_ops fimc_pm_ops = {
 
 static struct platform_driver fimc_driver = {
         .probe          = fimc_probe,
-        .remove         = __devexit_p(fimc_remove),
+        .remove         = fimc_remove,
         .id_table       = fimc_driver_ids,
         .driver = {
                 .name   = FIMC_MODULE_NAME,
diff --git a/drivers/media/platform/s5p-fimc/fimc-lite.c b/drivers/media/platform/s5p-fimc/fimc-lite.c
index ef31c3919fe9..c67dd2ebcff5 100644
--- a/drivers/media/platform/s5p-fimc/fimc-lite.c
+++ b/drivers/media/platform/s5p-fimc/fimc-lite.c
@@ -1490,7 +1490,7 @@ static int fimc_lite_clk_get(struct fimc_lite *fimc)
         return ret;
 }
 
-static int __devinit fimc_lite_probe(struct platform_device *pdev)
+static int fimc_lite_probe(struct platform_device *pdev)
 {
         struct flite_drvdata *drv_data = fimc_lite_get_drvdata(pdev);
         struct fimc_lite *fimc;
@@ -1631,7 +1631,7 @@ static int fimc_lite_suspend(struct device *dev)
 }
 #endif /* CONFIG_PM_SLEEP */
 
-static int __devexit fimc_lite_remove(struct platform_device *pdev)
+static int fimc_lite_remove(struct platform_device *pdev)
 {
         struct fimc_lite *fimc = platform_get_drvdata(pdev);
         struct device *dev = &pdev->dev;
@@ -1679,7 +1679,7 @@ static const struct dev_pm_ops fimc_lite_pm_ops = {
 
 static struct platform_driver fimc_lite_driver = {
         .probe          = fimc_lite_probe,
-        .remove         = __devexit_p(fimc_lite_remove),
+        .remove         = fimc_lite_remove,
         .id_table       = fimc_lite_driver_ids,
         .driver = {
                 .name           = FIMC_LITE_DRV_NAME,
diff --git a/drivers/media/platform/s5p-fimc/fimc-mdevice.c b/drivers/media/platform/s5p-fimc/fimc-mdevice.c
index 62f3a71c4f6d..27d346195dbd 100644
--- a/drivers/media/platform/s5p-fimc/fimc-mdevice.c
+++ b/drivers/media/platform/s5p-fimc/fimc-mdevice.c
@@ -567,7 +567,7 @@ static int __fimc_md_create_flite_source_links(struct fimc_md *fmd)
 {
         struct media_entity *source, *sink;
         unsigned int flags = MEDIA_LNK_FL_ENABLED;
-        int i, ret;
+        int i, ret = 0;
 
         for (i = 0; i < FIMC_LITE_MAX_DEVS; i++) {
                 struct fimc_lite *fimc = fmd->fimc_lite[i];
@@ -974,7 +974,7 @@ err_md:
         return ret;
 }
 
-static int __devexit fimc_md_remove(struct platform_device *pdev)
+static int fimc_md_remove(struct platform_device *pdev)
 {
         struct fimc_md *fmd = platform_get_drvdata(pdev);
 
@@ -989,7 +989,7 @@ static int __devexit fimc_md_remove(struct platform_device *pdev)
 
 static struct platform_driver fimc_md_driver = {
         .probe          = fimc_md_probe,
-        .remove         = __devexit_p(fimc_md_remove),
+        .remove         = fimc_md_remove,
         .driver = {
                 .name   = "s5p-fimc-md",
                 .owner  = THIS_MODULE,
diff --git a/drivers/media/platform/s5p-fimc/mipi-csis.c b/drivers/media/platform/s5p-fimc/mipi-csis.c
index 076c29bd41c8..cde510f0eea6 100644
--- a/drivers/media/platform/s5p-fimc/mipi-csis.c
+++ b/drivers/media/platform/s5p-fimc/mipi-csis.c
@@ -696,7 +696,7 @@ static irqreturn_t s5pcsis_irq_handler(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static int __devinit s5pcsis_probe(struct platform_device *pdev)
+static int s5pcsis_probe(struct platform_device *pdev)
 {
         struct s5p_platform_mipi_csis *pdata;
         struct resource *mem_res;
@@ -893,7 +893,7 @@ static int s5pcsis_runtime_resume(struct device *dev)
 }
 #endif
 
-static int __devexit s5pcsis_remove(struct platform_device *pdev)
+static int s5pcsis_remove(struct platform_device *pdev)
 {
         struct v4l2_subdev *sd = platform_get_drvdata(pdev);
         struct csis_state *state = sd_to_csis_state(sd);
@@ -918,7 +918,7 @@ static const struct dev_pm_ops s5pcsis_pm_ops = {
 
 static struct platform_driver s5pcsis_driver = {
         .probe          = s5pcsis_probe,
-        .remove         = __devexit_p(s5pcsis_remove),
+        .remove         = s5pcsis_remove,
         .driver         = {
                 .name   = CSIS_DRIVER_NAME,
                 .owner  = THIS_MODULE,
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index b1d7f9a9b996..6347f09ca783 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -408,62 +408,48 @@ leave_handle_frame:
 }
 
 /* Error handling for interrupt */
-static void s5p_mfc_handle_error(struct s5p_mfc_ctx *ctx,
-                                 unsigned int reason, unsigned int err)
+static void s5p_mfc_handle_error(struct s5p_mfc_dev *dev,
+                struct s5p_mfc_ctx *ctx, unsigned int reason, unsigned int err)
 {
-        struct s5p_mfc_dev *dev;
         unsigned long flags;
 
-        /* If no context is available then all necessary
-         * processing has been done. */
-        if (ctx == NULL)
-                return;
-
-        dev = ctx->dev;
         mfc_err("Interrupt Error: %08x\n", err);
-        s5p_mfc_hw_call(dev->mfc_ops, clear_int_flags, dev);
-        wake_up_dev(dev, reason, err);
 
-        /* Error recovery is dependent on the state of context */
-        switch (ctx->state) {
-        case MFCINST_INIT:
-                /* This error had to happen while acquireing instance */
-        case MFCINST_GOT_INST:
-                /* This error had to happen while parsing the header */
-        case MFCINST_HEAD_PARSED:
-                /* This error had to happen while setting dst buffers */
-        case MFCINST_RETURN_INST:
-                /* This error had to happen while releasing instance */
-                clear_work_bit(ctx);
-                wake_up_ctx(ctx, reason, err);
-                if (test_and_clear_bit(0, &dev->hw_lock) == 0)
-                        BUG();
-                s5p_mfc_clock_off();
-                ctx->state = MFCINST_ERROR;
-                break;
-        case MFCINST_FINISHING:
-        case MFCINST_FINISHED:
-        case MFCINST_RUNNING:
-                /* It is higly probable that an error occured
-                 * while decoding a frame */
-                clear_work_bit(ctx);
-                ctx->state = MFCINST_ERROR;
-                /* Mark all dst buffers as having an error */
-                spin_lock_irqsave(&dev->irqlock, flags);
-                s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue, &ctx->dst_queue,
-                                &ctx->vq_dst);
-                /* Mark all src buffers as having an error */
-                s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue, &ctx->src_queue,
-                                &ctx->vq_src);
-                spin_unlock_irqrestore(&dev->irqlock, flags);
-                if (test_and_clear_bit(0, &dev->hw_lock) == 0)
-                        BUG();
-                s5p_mfc_clock_off();
-                break;
-        default:
-                mfc_err("Encountered an error interrupt which had not been handled\n");
-                break;
+        if (ctx != NULL) {
+                /* Error recovery is dependent on the state of context */
+                switch (ctx->state) {
+                case MFCINST_RES_CHANGE_INIT:
+                case MFCINST_RES_CHANGE_FLUSH:
+                case MFCINST_RES_CHANGE_END:
+                case MFCINST_FINISHING:
+                case MFCINST_FINISHED:
+                case MFCINST_RUNNING:
+                        /* It is higly probable that an error occured
+                         * while decoding a frame */
+                        clear_work_bit(ctx);
+                        ctx->state = MFCINST_ERROR;
+                        /* Mark all dst buffers as having an error */
+                        spin_lock_irqsave(&dev->irqlock, flags);
+                        s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue,
+                                                &ctx->dst_queue, &ctx->vq_dst);
+                        /* Mark all src buffers as having an error */
+                        s5p_mfc_hw_call(dev->mfc_ops, cleanup_queue,
+                                                &ctx->src_queue, &ctx->vq_src);
+                        spin_unlock_irqrestore(&dev->irqlock, flags);
+                        wake_up_ctx(ctx, reason, err);
+                        break;
+                default:
+                        clear_work_bit(ctx);
+                        ctx->state = MFCINST_ERROR;
+                        wake_up_ctx(ctx, reason, err);
+                        break;
+                }
         }
+        if (test_and_clear_bit(0, &dev->hw_lock) == 0)
+                BUG();
+        s5p_mfc_hw_call(dev->mfc_ops, clear_int_flags, dev);
+        s5p_mfc_clock_off();
+        wake_up_dev(dev, reason, err);
         return;
 }
 
@@ -628,7 +614,7 @@ static irqreturn_t s5p_mfc_irq(int irq, void *priv)
                                 dev->warn_start)
                         s5p_mfc_handle_frame(ctx, reason, err);
                 else
-                        s5p_mfc_handle_error(ctx, reason, err);
+                        s5p_mfc_handle_error(dev, ctx, reason, err);
                 clear_bit(0, &dev->enter_suspend);
                 break;
 
@@ -1246,7 +1232,7 @@ err_res:
 }
 
 /* Remove the driver */
-static int __devexit s5p_mfc_remove(struct platform_device *pdev)
+static int s5p_mfc_remove(struct platform_device *pdev)
 {
         struct s5p_mfc_dev *dev = platform_get_drvdata(pdev);
 
@@ -1441,7 +1427,7 @@ static void *mfc_get_drv_data(struct platform_device *pdev)
 
 static struct platform_driver s5p_mfc_driver = {
         .probe          = s5p_mfc_probe,
-        .remove         = __devexit_p(s5p_mfc_remove),
+        .remove         = s5p_mfc_remove,
         .id_table       = mfc_driver_ids,
         .driver = {
                 .name   = S5P_MFC_NAME,
diff --git a/drivers/media/platform/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c
index c0d0f84e5b86..8de1b3dce459 100644
--- a/drivers/media/platform/s5p-tv/hdmi_drv.c
+++ b/drivers/media/platform/s5p-tv/hdmi_drv.c
@@ -830,7 +830,7 @@ fail:
         return -ENODEV;
 }
 
-static int __devinit hdmi_probe(struct platform_device *pdev)
+static int hdmi_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct resource *res;
@@ -979,7 +979,7 @@ fail:
         return ret;
 }
 
-static int __devexit hdmi_remove(struct platform_device *pdev)
+static int hdmi_remove(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct v4l2_subdev *sd = dev_get_drvdata(dev);
@@ -997,7 +997,7 @@ static int __devexit hdmi_remove(struct platform_device *pdev)
 
 static struct platform_driver hdmi_driver __refdata = {
         .probe = hdmi_probe,
-        .remove = __devexit_p(hdmi_remove),
+        .remove = hdmi_remove,
         .id_table = hdmi_driver_types,
         .driver = {
                 .name = "s5p-hdmi",
diff --git a/drivers/media/platform/s5p-tv/hdmiphy_drv.c b/drivers/media/platform/s5p-tv/hdmiphy_drv.c
index 94c2a13c3b3a..80717cec76ae 100644
--- a/drivers/media/platform/s5p-tv/hdmiphy_drv.c
+++ b/drivers/media/platform/s5p-tv/hdmiphy_drv.c
@@ -279,8 +279,8 @@ static const struct v4l2_subdev_ops hdmiphy_ops = {
         .video = &hdmiphy_video_ops,
 };
 
-static int __devinit hdmiphy_probe(struct i2c_client *client,
-        const struct i2c_device_id *id)
+static int hdmiphy_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
 {
         struct hdmiphy_ctx *ctx;
 
@@ -295,7 +295,7 @@ static int __devinit hdmiphy_probe(struct i2c_client *client,
         return 0;
 }
 
-static int __devexit hdmiphy_remove(struct i2c_client *client)
+static int hdmiphy_remove(struct i2c_client *client)
 {
         struct v4l2_subdev *sd = i2c_get_clientdata(client);
         struct hdmiphy_ctx *ctx = sd_to_ctx(sd);
@@ -322,7 +322,7 @@ static struct i2c_driver hdmiphy_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = hdmiphy_probe,
-        .remove         = __devexit_p(hdmiphy_remove),
+        .remove         = hdmiphy_remove,
         .id_table = hdmiphy_id,
 };
 
diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
index ddb422e23550..b671e20e9318 100644
--- a/drivers/media/platform/s5p-tv/mixer.h
+++ b/drivers/media/platform/s5p-tv/mixer.h
@@ -290,7 +290,7 @@ static inline struct v4l2_subdev *to_outsd(struct mxr_device *mdev)
 struct mxr_platform_data;
 
 /** acquiring common video resources */
-int __devinit mxr_acquire_video(struct mxr_device *mdev,
+int mxr_acquire_video(struct mxr_device *mdev,
         struct mxr_output_conf *output_cont, int output_count);
 
 /** releasing common video resources */
diff --git a/drivers/media/platform/s5p-tv/mixer_drv.c b/drivers/media/platform/s5p-tv/mixer_drv.c
index d5cf603551b2..5733033a6ead 100644
--- a/drivers/media/platform/s5p-tv/mixer_drv.c
+++ b/drivers/media/platform/s5p-tv/mixer_drv.c
@@ -151,8 +151,8 @@ void mxr_power_put(struct mxr_device *mdev)
 
 /* --------- RESOURCE MANAGEMENT -------------*/
 
-static int __devinit mxr_acquire_plat_resources(struct mxr_device *mdev,
-        struct platform_device *pdev)
+static int mxr_acquire_plat_resources(struct mxr_device *mdev,
+                                      struct platform_device *pdev)
 {
         struct resource *res;
         int ret;
@@ -271,8 +271,8 @@ fail:
         return -ENODEV;
 }
 
-static int __devinit mxr_acquire_resources(struct mxr_device *mdev,
-        struct platform_device *pdev)
+static int mxr_acquire_resources(struct mxr_device *mdev,
+                                 struct platform_device *pdev)
 {
         int ret;
         ret = mxr_acquire_plat_resources(mdev, pdev);
@@ -310,8 +310,8 @@ static void mxr_release_layers(struct mxr_device *mdev)
                         mxr_layer_release(mdev->layer[i]);
 }
 
-static int __devinit mxr_acquire_layers(struct mxr_device *mdev,
-        struct mxr_platform_data *pdata)
+static int mxr_acquire_layers(struct mxr_device *mdev,
+                              struct mxr_platform_data *pdata)
 {
         mdev->layer[0] = mxr_graph_layer_create(mdev, 0);
         mdev->layer[1] = mxr_graph_layer_create(mdev, 1);
@@ -372,7 +372,7 @@ static const struct dev_pm_ops mxr_pm_ops = {
 
 /* --------- DRIVER INITIALIZATION ---------- */
 
-static int __devinit mxr_probe(struct platform_device *pdev)
+static int mxr_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct mxr_platform_data *pdata = dev->platform_data;
@@ -431,7 +431,7 @@ fail:
         return ret;
 }
 
-static int __devexit mxr_remove(struct platform_device *pdev)
+static int mxr_remove(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct mxr_device *mdev = to_mdev(dev);
@@ -450,7 +450,7 @@ static int __devexit mxr_remove(struct platform_device *pdev)
 
 static struct platform_driver mxr_driver __refdata = {
         .probe = mxr_probe,
-        .remove = __devexit_p(mxr_remove),
+        .remove = mxr_remove,
         .driver = {
                 .name = MXR_DRIVER_NAME,
                 .owner = THIS_MODULE,
diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
index 80ca14b7c4d3..c087b66099fd 100644
--- a/drivers/media/platform/s5p-tv/mixer_video.c
+++ b/drivers/media/platform/s5p-tv/mixer_video.c
@@ -62,8 +62,8 @@ done:
         return sd;
 }
 
-int __devinit mxr_acquire_video(struct mxr_device *mdev,
-        struct mxr_output_conf *output_conf, int output_count)
+int mxr_acquire_video(struct mxr_device *mdev,
+                      struct mxr_output_conf *output_conf, int output_count)
 {
         struct device *dev = mdev->dev;
         struct v4l2_device *v4l2_dev = &mdev->v4l2_dev;
diff --git a/drivers/media/platform/s5p-tv/sdo_drv.c b/drivers/media/platform/s5p-tv/sdo_drv.c
index 35320f08c399..ab6f9ef89423 100644
--- a/drivers/media/platform/s5p-tv/sdo_drv.c
+++ b/drivers/media/platform/s5p-tv/sdo_drv.c
@@ -292,7 +292,7 @@ static const struct dev_pm_ops sdo_pm_ops = {
         .runtime_resume  = sdo_runtime_resume,
 };
 
-static int __devinit sdo_probe(struct platform_device *pdev)
+static int sdo_probe(struct platform_device *pdev)
 {
         struct device *dev = &pdev->dev;
         struct sdo_device *sdev;
@@ -422,7 +422,7 @@ fail:
         return ret;
 }
 
-static int __devexit sdo_remove(struct platform_device *pdev)
+static int sdo_remove(struct platform_device *pdev)
 {
         struct v4l2_subdev *sd = dev_get_drvdata(&pdev->dev);
         struct sdo_device *sdev = sd_to_sdev(sd);
@@ -440,7 +440,7 @@ static int __devexit sdo_remove(struct platform_device *pdev)
 
 static struct platform_driver sdo_driver __refdata = {
         .probe = sdo_probe,
-        .remove = __devexit_p(sdo_remove),
+        .remove = sdo_remove,
         .driver = {
                 .name = "s5p-sdo",
                 .owner = THIS_MODULE,
diff --git a/drivers/media/platform/s5p-tv/sii9234_drv.c b/drivers/media/platform/s5p-tv/sii9234_drv.c
index 4597342cdfbe..d90d2286090b 100644
--- a/drivers/media/platform/s5p-tv/sii9234_drv.c
+++ b/drivers/media/platform/s5p-tv/sii9234_drv.c
@@ -315,8 +315,8 @@ static const struct v4l2_subdev_ops sii9234_ops = {
         .video = &sii9234_video_ops,
 };
 
-static int __devinit sii9234_probe(struct i2c_client *client,
-        const struct i2c_device_id *id)
+static int sii9234_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
 {
         struct device *dev = &client->dev;
         struct sii9234_platform_data *pdata = dev->platform_data;
@@ -377,7 +377,7 @@ fail:
         return ret;
 }
 
-static int __devexit sii9234_remove(struct i2c_client *client)
+static int sii9234_remove(struct i2c_client *client)
 {
         struct device *dev = &client->dev;
 
@@ -402,7 +402,7 @@ static struct i2c_driver sii9234_driver = {
                 .pm = &sii9234_pm_ops,
         },
         .probe          = sii9234_probe,
-        .remove         = __devexit_p(sii9234_remove),
+        .remove         = sii9234_remove,
         .id_table = sii9234_id,
 };
 
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index 1039ae82401b..ab5bca40a5b3 100644
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -1327,7 +1327,7 @@ static const struct video_device sh_vou_video_template = {
         .vfl_dir        = VFL_DIR_TX,
 };
 
-static int __devinit sh_vou_probe(struct platform_device *pdev)
+static int sh_vou_probe(struct platform_device *pdev)
 {
         struct sh_vou_pdata *vou_pdata = pdev->dev.platform_data;
         struct v4l2_rect *rect;
@@ -1462,7 +1462,7 @@ ereqmemreg:
         return ret;
 }
 
-static int __devexit sh_vou_remove(struct platform_device *pdev)
+static int sh_vou_remove(struct platform_device *pdev)
 {
         int irq = platform_get_irq(pdev, 0);
         struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev);
@@ -1488,7 +1488,7 @@ static int __devexit sh_vou_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver __refdata sh_vou = {
-        .remove  = __devexit_p(sh_vou_remove),
+        .remove  = sh_vou_remove,
         .driver  = {
                 .name   = "sh-vou",
                 .owner  = THIS_MODULE,
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index eba1f6b2b0fb..82dbf99d347c 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -897,7 +897,7 @@ static struct soc_camera_host_ops isi_soc_camera_host_ops = {
 };
 
 /* -----------------------------------------------------------------------*/
-static int __devexit atmel_isi_remove(struct platform_device *pdev)
+static int atmel_isi_remove(struct platform_device *pdev)
 {
         struct soc_camera_host *soc_host = to_soc_camera_host(&pdev->dev);
         struct atmel_isi *isi = container_of(soc_host,
@@ -921,7 +921,7 @@ static int __devexit atmel_isi_remove(struct platform_device *pdev)
         return 0;
 }
 
-static int __devinit atmel_isi_probe(struct platform_device *pdev)
+static int atmel_isi_probe(struct platform_device *pdev)
 {
         unsigned int irq;
         struct atmel_isi *isi;
@@ -1074,7 +1074,7 @@ err_clk_prepare_pclk:
 
 static struct platform_driver atmel_isi_driver = {
         .probe          = atmel_isi_probe,
-        .remove         = __devexit_p(atmel_isi_remove),
+        .remove         = atmel_isi_remove,
         .driver         = {
                 .name = "atmel_isi",
                 .owner = THIS_MODULE,
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 168e062164e9..27b2e96f27a6 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -1429,7 +1429,7 @@ static irqreturn_t mx27_camera_emma_irq(int irq_emma, void *data)
         return IRQ_HANDLED;
 }
 
-static int __devinit mx27_camera_emma_init(struct platform_device *pdev)
+static int mx27_camera_emma_init(struct platform_device *pdev)
 {
         struct mx2_camera_dev *pcdev = platform_get_drvdata(pdev);
         struct resource *res_emma;
@@ -1487,7 +1487,7 @@ out:
         return err;
 }
 
-static int __devinit mx2_camera_probe(struct platform_device *pdev)
+static int mx2_camera_probe(struct platform_device *pdev)
 {
         struct mx2_camera_dev *pcdev;
         struct resource *res_csi;
@@ -1595,7 +1595,7 @@ exit:
         return err;
 }
 
-static int __devexit mx2_camera_remove(struct platform_device *pdev)
+static int mx2_camera_remove(struct platform_device *pdev)
 {
         struct soc_camera_host *soc_host = to_soc_camera_host(&pdev->dev);
         struct mx2_camera_dev *pcdev = container_of(soc_host,
@@ -1618,7 +1618,7 @@ static struct platform_driver mx2_camera_driver = {
                 .name   = MX2_CAM_DRV_NAME,
         },
         .id_table       = mx2_camera_devtype,
-        .remove         = __devexit_p(mx2_camera_remove),
+        .remove         = mx2_camera_remove,
         .probe          = mx2_camera_probe,
 };
 
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
index 37d0d0ef8adf..f5cbb92db545 100644
--- a/drivers/media/platform/soc_camera/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -1143,7 +1143,7 @@ static struct soc_camera_host_ops mx3_soc_camera_host_ops = {
         .set_bus_param  = mx3_camera_set_bus_param,
 };
 
-static int __devinit mx3_camera_probe(struct platform_device *pdev)
+static int mx3_camera_probe(struct platform_device *pdev)
 {
         struct mx3_camera_dev *mx3_cam;
         struct resource *res;
@@ -1246,7 +1246,7 @@ egetres:
         return err;
 }
 
-static int __devexit mx3_camera_remove(struct platform_device *pdev)
+static int mx3_camera_remove(struct platform_device *pdev)
 {
         struct soc_camera_host *soc_host = to_soc_camera_host(&pdev->dev);
         struct mx3_camera_dev *mx3_cam = container_of(soc_host,
@@ -1279,7 +1279,7 @@ static struct platform_driver mx3_camera_driver = {
                 .name   = MX3_CAM_DRV_NAME,
         },
         .probe          = mx3_camera_probe,
-        .remove         = __devexit_p(mx3_camera_remove),
+        .remove         = mx3_camera_remove,
 };
 
 module_platform_driver(mx3_camera_driver);
diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
index f3c1b6202425..1fbec5202e4f 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/soc_camera/pxa_camera.c
@@ -1651,7 +1651,7 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = {
         .set_bus_param  = pxa_camera_set_bus_param,
 };
 
-static int __devinit pxa_camera_probe(struct platform_device *pdev)
+static int pxa_camera_probe(struct platform_device *pdev)
 {
         struct pxa_camera_dev *pcdev;
         struct resource *res;
@@ -1801,7 +1801,7 @@ exit:
         return err;
 }
 
-static int __devexit pxa_camera_remove(struct platform_device *pdev)
+static int pxa_camera_remove(struct platform_device *pdev)
 {
         struct soc_camera_host *soc_host = to_soc_camera_host(&pdev->dev);
         struct pxa_camera_dev *pcdev = container_of(soc_host,
@@ -1840,7 +1840,7 @@ static struct platform_driver pxa_camera_driver = {
                 .pm     = &pxa_camera_pm,
         },
         .probe          = pxa_camera_probe,
-        .remove         = __devexit_p(pxa_camera_remove),
+        .remove         = pxa_camera_remove,
 };
 
 module_platform_driver(pxa_camera_driver);
diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
index cdf173bbcc93..602584dc9330 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
@@ -2071,7 +2071,7 @@ static int bus_notify(struct notifier_block *nb,
         return NOTIFY_DONE;
 }
 
-static int __devinit sh_mobile_ceu_probe(struct platform_device *pdev)
+static int sh_mobile_ceu_probe(struct platform_device *pdev)
 {
         struct sh_mobile_ceu_dev *pcdev;
         struct resource *res;
@@ -2247,7 +2247,7 @@ exit_release_mem:
         return err;
 }
 
-static int __devexit sh_mobile_ceu_remove(struct platform_device *pdev)
+static int sh_mobile_ceu_remove(struct platform_device *pdev)
 {
         struct soc_camera_host *soc_host = to_soc_camera_host(&pdev->dev);
         struct sh_mobile_ceu_dev *pcdev = container_of(soc_host,
@@ -2293,7 +2293,7 @@ static struct platform_driver sh_mobile_ceu_driver = {
                 .pm     = &sh_mobile_ceu_dev_pm_ops,
         },
         .probe          = sh_mobile_ceu_probe,
-        .remove         = __devexit_p(sh_mobile_ceu_remove),
+        .remove         = sh_mobile_ceu_remove,
 };
 
 static int __init sh_mobile_ceu_init(void)
diff --git a/drivers/media/platform/soc_camera/sh_mobile_csi2.c b/drivers/media/platform/soc_camera/sh_mobile_csi2.c
index c573be702641..42c559eb4937 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_csi2.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_csi2.c
@@ -294,7 +294,7 @@ static struct v4l2_subdev_ops sh_csi2_subdev_ops = {
         .video  = &sh_csi2_subdev_video_ops,
 };
 
-static __devinit int sh_csi2_probe(struct platform_device *pdev)
+static int sh_csi2_probe(struct platform_device *pdev)
 {
         struct resource *res;
         unsigned int irq;
@@ -355,7 +355,7 @@ esdreg:
         return ret;
 }
 
-static __devexit int sh_csi2_remove(struct platform_device *pdev)
+static int sh_csi2_remove(struct platform_device *pdev)
 {
         struct sh_csi2 *priv = platform_get_drvdata(pdev);
 
@@ -367,7 +367,7 @@ static __devexit int sh_csi2_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver __refdata sh_csi2_pdrv = {
-        .remove = __devexit_p(sh_csi2_remove),
+        .remove = sh_csi2_remove,
         .probe  = sh_csi2_probe,
         .driver = {
                 .name   = "sh-mobile-csi2",
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index dd057f19dbc3..8ec98051ea73 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -1535,7 +1535,7 @@ static int soc_camera_video_start(struct soc_camera_device *icd)
         return 0;
 }
 
-static int __devinit soc_camera_pdrv_probe(struct platform_device *pdev)
+static int soc_camera_pdrv_probe(struct platform_device *pdev)
 {
         struct soc_camera_desc *sdesc = pdev->dev.platform_data;
         struct soc_camera_subdev_desc *ssdd = &sdesc->subdev_desc;
@@ -1570,7 +1570,7 @@ static int __devinit soc_camera_pdrv_probe(struct platform_device *pdev)
  * hot-pluggable. Now we know, that all our users - hosts and devices have
  * been unloaded already
  */
-static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev)
+static int soc_camera_pdrv_remove(struct platform_device *pdev)
 {
         struct soc_camera_device *icd = platform_get_drvdata(pdev);
 
@@ -1584,7 +1584,7 @@ static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev)
 
 static struct platform_driver __refdata soc_camera_pdrv = {
         .probe = soc_camera_pdrv_probe,
-        .remove  = __devexit_p(soc_camera_pdrv_remove),
+        .remove  = soc_camera_pdrv_remove,
         .driver  = {
                 .name   = "soc-camera-pdrv",
                 .owner  = THIS_MODULE,
diff --git a/drivers/media/platform/timblogiw.c b/drivers/media/platform/timblogiw.c
index 9de014100a0f..c3a2a4484401 100644
--- a/drivers/media/platform/timblogiw.c
+++ b/drivers/media/platform/timblogiw.c
@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
 
 /* Platform device functions */
 
-static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
+static struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
         .vidioc_querycap                = timblogiw_querycap,
         .vidioc_enum_fmt_vid_cap        = timblogiw_enum_fmt,
         .vidioc_g_fmt_vid_cap           = timblogiw_g_fmt,
@@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
         .vidioc_enum_framesizes         = timblogiw_enum_framesizes,
 };
 
-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
+static struct v4l2_file_operations timblogiw_fops = {
         .owner          = THIS_MODULE,
         .open           = timblogiw_open,
         .release        = timblogiw_close,
@@ -777,7 +777,7 @@ static __devinitconst struct v4l2_file_operations timblogiw_fops = {
         .poll           = timblogiw_poll,
 };
 
-static __devinitconst struct video_device timblogiw_template = {
+static struct video_device timblogiw_template = {
         .name           = TIMBLOGIWIN_NAME,
         .fops           = &timblogiw_fops,
         .ioctl_ops      = &timblogiw_ioctl_ops,
@@ -786,7 +786,7 @@ static __devinitconst struct video_device timblogiw_template = {
         .tvnorms        = V4L2_STD_PAL | V4L2_STD_NTSC
 };
 
-static int __devinit timblogiw_probe(struct platform_device *pdev)
+static int timblogiw_probe(struct platform_device *pdev)
 {
         int err;
         struct timblogiw *lw = NULL;
@@ -848,7 +848,7 @@ err:
         return err;
 }
 
-static int __devexit timblogiw_remove(struct platform_device *pdev)
+static int timblogiw_remove(struct platform_device *pdev)
 {
         struct timblogiw *lw = platform_get_drvdata(pdev);
 
@@ -869,7 +869,7 @@ static struct platform_driver timblogiw_platform_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = timblogiw_probe,
-        .remove         = __devexit_p(timblogiw_remove),
+        .remove         = timblogiw_remove,
 };
 
 module_platform_driver(timblogiw_platform_driver);
diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via-camera.c
index eb404c2ce270..63e8c3461239 100644
--- a/drivers/media/platform/via-camera.c
+++ b/drivers/media/platform/via-camera.c
@@ -1324,7 +1324,7 @@ static struct video_device viacam_v4l_template = {
 #define VIACAM_SERIAL_CREG 0x46
 #define VIACAM_SERIAL_BIT 0x40
 
-static __devinit bool viacam_serial_is_enabled(void)
+static bool viacam_serial_is_enabled(void)
 {
         struct pci_bus *pbus = pci_find_bus(0, 0);
         u8 cbyte;
@@ -1353,7 +1353,7 @@ static struct ov7670_config sensor_cfg = {
         .clock_speed = 90,
 };
 
-static __devinit int viacam_probe(struct platform_device *pdev)
+static int viacam_probe(struct platform_device *pdev)
 {
         int ret;
         struct i2c_adapter *sensor_adapter;
@@ -1490,7 +1490,7 @@ out_unregister:
         return ret;
 }
 
-static __devexit int viacam_remove(struct platform_device *pdev)
+static int viacam_remove(struct platform_device *pdev)
 {
         struct via_camera *cam = via_cam_info;
         struct viafb_dev *viadev = pdev->dev.platform_data;