iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V4L/DVB (4499): CONFIG_PM=n slim: drivers/media/video/*

Browse Source 
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Alexey Dobriyan 2006-08-12 22:01:27 -03:00 committed by Mauro Carvalho Chehab
parent 4d98816be7
commit 17bc98a41a
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/bt8xx/bttv-driver.c
View File

@ -4194,6 +4194,7 @@ static void __devexit bttv_remove(struct pci_dev *pci_dev)
return; return;
} }
#ifdef CONFIG_PM
static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state) static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state)
{ {
struct bttv *btv = pci_get_drvdata(pci_dev); struct bttv *btv = pci_get_drvdata(pci_dev);
@ -4274,6 +4275,7 @@ static int bttv_resume(struct pci_dev *pci_dev)
spin_unlock_irqrestore(&btv->s_lock,flags); spin_unlock_irqrestore(&btv->s_lock,flags);
return 0; return 0;
} }
#endif
static struct pci_device_id bttv_pci_tbl[] = { static struct pci_device_id bttv_pci_tbl[] = {
{PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848, {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848,
@ -4294,8 +4296,10 @@ static struct pci_driver bttv_pci_driver = {
.id_table = bttv_pci_tbl, .id_table = bttv_pci_tbl,
.probe = bttv_probe, .probe = bttv_probe,
.remove = __devexit_p(bttv_remove), .remove = __devexit_p(bttv_remove),
#ifdef CONFIG_PM
.suspend = bttv_suspend, .suspend = bttv_suspend,
.resume = bttv_resume, .resume = bttv_resume,
#endif
}; };
static int bttv_init_module(void) static int bttv_init_module(void)

2
drivers/media/video/cx88/cx88-blackbird.c
View File

@ -1160,8 +1160,10 @@ static struct pci_driver blackbird_pci_driver = {
.id_table = cx8802_pci_tbl, .id_table = cx8802_pci_tbl,
.probe = blackbird_probe, .probe = blackbird_probe,
.remove = __devexit_p(blackbird_remove), .remove = __devexit_p(blackbird_remove),
#ifdef CONFIG_PM
.suspend = cx8802_suspend_common, .suspend = cx8802_suspend_common,
.resume = cx8802_resume_common, .resume = cx8802_resume_common,
#endif
}; };
static int blackbird_init(void) static int blackbird_init(void)

2
drivers/media/video/cx88/cx88-dvb.c
View File

@ -870,8 +870,10 @@ static struct pci_driver dvb_pci_driver = {
.id_table = cx8802_pci_tbl, .id_table = cx8802_pci_tbl,
.probe = dvb_probe, .probe = dvb_probe,
.remove = __devexit_p(dvb_remove), .remove = __devexit_p(dvb_remove),
#ifdef CONFIG_PM
.suspend = cx8802_suspend_common, .suspend = cx8802_suspend_common,
.resume = cx8802_resume_common, .resume = cx8802_resume_common,
#endif
}; };
static int dvb_init(void) static int dvb_init(void)

7
drivers/media/video/cx88/cx88-video.c
View File

@ -497,6 +497,7 @@ static int start_video_dma(struct cx8800_dev *dev,
return 0; return 0;
} }
#ifdef CONFIG_PM
static int stop_video_dma(struct cx8800_dev *dev) static int stop_video_dma(struct cx8800_dev *dev)
{ {
struct cx88_core *core = dev->core; struct cx88_core *core = dev->core;
@ -512,6 +513,7 @@ static int stop_video_dma(struct cx8800_dev *dev)
cx_clear(MO_VID_INTMSK, 0x0f0011); cx_clear(MO_VID_INTMSK, 0x0f0011);
return 0; return 0;
} }
#endif
static int restart_video_queue(struct cx8800_dev *dev, static int restart_video_queue(struct cx8800_dev *dev,
struct cx88_dmaqueue *q) struct cx88_dmaqueue *q)
@ -2017,6 +2019,7 @@ static void __devexit cx8800_finidev(struct pci_dev *pci_dev)
kfree(dev); kfree(dev);
} }
#ifdef CONFIG_PM
static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state) static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state)
{ {
struct cx8800_dev *dev = pci_get_drvdata(pci_dev); struct cx8800_dev *dev = pci_get_drvdata(pci_dev);
@ -2092,6 +2095,7 @@ static int cx8800_resume(struct pci_dev *pci_dev)
return 0; return 0;
} }
#endif
/* ----------------------------------------------------------- */ /* ----------------------------------------------------------- */
@ -2112,9 +2116,10 @@ static struct pci_driver cx8800_pci_driver = {
.id_table = cx8800_pci_tbl, .id_table = cx8800_pci_tbl,
.probe = cx8800_initdev, .probe = cx8800_initdev,
.remove = __devexit_p(cx8800_finidev), .remove = __devexit_p(cx8800_finidev),
#ifdef CONFIG_PM
.suspend = cx8800_suspend, .suspend = cx8800_suspend,
.resume = cx8800_resume, .resume = cx8800_resume,
#endif
}; };
static int cx8800_init(void) static int cx8800_init(void)