aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx88/cx88-video.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/pci/cx88/cx88-video.c')
-rw-r--r--drivers/media/pci/cx88/cx88-video.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index 05171457bf28..bc78354262ac 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -1696,8 +1696,8 @@ static void cx8800_unregister_video(struct cx8800_dev *dev)
1696 } 1696 }
1697} 1697}
1698 1698
1699static int __devinit cx8800_initdev(struct pci_dev *pci_dev, 1699static int cx8800_initdev(struct pci_dev *pci_dev,
1700 const struct pci_device_id *pci_id) 1700 const struct pci_device_id *pci_id)
1701{ 1701{
1702 struct cx8800_dev *dev; 1702 struct cx8800_dev *dev;
1703 struct cx88_core *core; 1703 struct cx88_core *core;
@@ -1923,7 +1923,7 @@ fail_free:
1923 return err; 1923 return err;
1924} 1924}
1925 1925
1926static void __devexit cx8800_finidev(struct pci_dev *pci_dev) 1926static void cx8800_finidev(struct pci_dev *pci_dev)
1927{ 1927{
1928 struct cx8800_dev *dev = pci_get_drvdata(pci_dev); 1928 struct cx8800_dev *dev = pci_get_drvdata(pci_dev);
1929 struct cx88_core *core = dev->core; 1929 struct cx88_core *core = dev->core;
@@ -2052,7 +2052,7 @@ static struct pci_driver cx8800_pci_driver = {
2052 .name = "cx8800", 2052 .name = "cx8800",
2053 .id_table = cx8800_pci_tbl, 2053 .id_table = cx8800_pci_tbl,
2054 .probe = cx8800_initdev, 2054 .probe = cx8800_initdev,
2055 .remove = __devexit_p(cx8800_finidev), 2055 .remove = cx8800_finidev,
2056#ifdef CONFIG_PM 2056#ifdef CONFIG_PM
2057 .suspend = cx8800_suspend, 2057 .suspend = cx8800_suspend,
2058 .resume = cx8800_resume, 2058 .resume = cx8800_resume,