diff options
Diffstat (limited to 'drivers/media/platform/soc_camera/mx2_camera.c')
-rw-r--r-- | drivers/media/platform/soc_camera/mx2_camera.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c index 791cd1d54a76..8bda2c908aba 100644 --- a/drivers/media/platform/soc_camera/mx2_camera.c +++ b/drivers/media/platform/soc_camera/mx2_camera.c | |||
@@ -1692,7 +1692,7 @@ static irqreturn_t mx27_camera_emma_irq(int irq_emma, void *data) | |||
1692 | return IRQ_HANDLED; | 1692 | return IRQ_HANDLED; |
1693 | } | 1693 | } |
1694 | 1694 | ||
1695 | static int __devinit mx27_camera_emma_init(struct platform_device *pdev) | 1695 | static int mx27_camera_emma_init(struct platform_device *pdev) |
1696 | { | 1696 | { |
1697 | struct mx2_camera_dev *pcdev = platform_get_drvdata(pdev); | 1697 | struct mx2_camera_dev *pcdev = platform_get_drvdata(pdev); |
1698 | struct resource *res_emma; | 1698 | struct resource *res_emma; |
@@ -1750,7 +1750,7 @@ out: | |||
1750 | return err; | 1750 | return err; |
1751 | } | 1751 | } |
1752 | 1752 | ||
1753 | static int __devinit mx2_camera_probe(struct platform_device *pdev) | 1753 | static int mx2_camera_probe(struct platform_device *pdev) |
1754 | { | 1754 | { |
1755 | struct mx2_camera_dev *pcdev; | 1755 | struct mx2_camera_dev *pcdev; |
1756 | struct resource *res_csi; | 1756 | struct resource *res_csi; |
@@ -1887,7 +1887,7 @@ exit: | |||
1887 | return err; | 1887 | return err; |
1888 | } | 1888 | } |
1889 | 1889 | ||
1890 | static int __devexit mx2_camera_remove(struct platform_device *pdev) | 1890 | static int mx2_camera_remove(struct platform_device *pdev) |
1891 | { | 1891 | { |
1892 | struct soc_camera_host *soc_host = to_soc_camera_host(&pdev->dev); | 1892 | struct soc_camera_host *soc_host = to_soc_camera_host(&pdev->dev); |
1893 | struct mx2_camera_dev *pcdev = container_of(soc_host, | 1893 | struct mx2_camera_dev *pcdev = container_of(soc_host, |
@@ -1912,7 +1912,7 @@ static struct platform_driver mx2_camera_driver = { | |||
1912 | .name = MX2_CAM_DRV_NAME, | 1912 | .name = MX2_CAM_DRV_NAME, |
1913 | }, | 1913 | }, |
1914 | .id_table = mx2_camera_devtype, | 1914 | .id_table = mx2_camera_devtype, |
1915 | .remove = __devexit_p(mx2_camera_remove), | 1915 | .remove = mx2_camera_remove, |
1916 | }; | 1916 | }; |
1917 | 1917 | ||
1918 | 1918 | ||