Merge tag 'v3.8-rc1' into staging/for_v3.9

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / staging / media / dt3155v4l / dt3155v4l.c

diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 0af8917ebc57385352c9699dcc92903d6950bca0..e33b7f55d84e2a9aa8232c28463e622b0785c53c 100644 (file)
--- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -720,7 +720,7 @@ static const struct v4l2_ioctl_ops dt3155_ioctl_ops = {
 */
 };
 
-static int __devinit
+static int
 dt3155_init_board(struct pci_dev *pdev)
 {
        struct dt3155_priv *pd = pci_get_drvdata(pdev);
@@ -838,7 +838,7 @@ struct dma_coherent_mem {
        unsigned long   *bitmap;
 };
 
-static int __devinit
+static int
 dt3155_alloc_coherent(struct device *dev, size_t size, int flags)
 {
        struct dma_coherent_mem *mem;
@@ -879,7 +879,7 @@ out:
        return 0;
 }
 
-static void __devexit
+static void
 dt3155_free_coherent(struct device *dev)
 {
        struct dma_coherent_mem *mem = dev->dma_mem;
@@ -893,7 +893,7 @@ dt3155_free_coherent(struct device *dev)
        kfree(mem);
 }
 
-static int __devinit
+static int
 dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
        int err;
@@ -958,7 +958,7 @@ err_video_device_alloc:
        return err;
 }
 
-static void __devexit
+static void
 dt3155_remove(struct pci_dev *pdev)
 {
        struct dt3155_priv *pd = pci_get_drvdata(pdev);
@@ -985,7 +985,7 @@ static struct pci_driver pci_driver = {
        .name = DT3155_NAME,
        .id_table = pci_ids,
        .probe = dt3155_probe,
-       .remove = __devexit_p(dt3155_remove),
+       .remove = dt3155_remove,
 };
 
 module_pci_driver(pci_driver);