diff options
| author | Michael Hunold <hunold@linuxtv.org> | 2004-12-07 00:20:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-07 00:20:46 -0800 |
| commit | 9edd313db9fdae9c1446d2df9e36e654ad76de4e (patch) | |
| tree | 3dd4a7687deda98598c05bbfe517263caf9fb87d /include/media | |
| parent | 780a9fc0b00375e2870e2f1837f78eee50d66326 (diff) | |
[PATCH] dvb: saa7146 changes
- [DVB] saa7146_core.c, saa7146_video.c: MODULE_PARM -> module_param, added
non-busy waiting option for saa7146_wait_for_debi_done(), make needlessly
global code static and remove unused code (thanks to Adrian Bunk
<bunk@stusta.de)
- [DVB] saa7146_core.c: dev is kmalloc'ed twice, add missing
pci_disable_device(), rename goto labels, propagate the error code from the
underlying layers when possible, pci_request_region replaces
request_mem_region, other minor cleanups (thanks to Francois Romieu)
- [DVB] saa7146_fops.c, saa7146_i2c.c, saa7146_hlp.c, saa7146_vbi.c: make
needlessly global code static, remove unused code (thanks to Adrian Bunk
<bunk@stusta.de>)
Signed-off-by: Michael Hunold <hunold@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/saa7146.h | 2 | ||||
| -rw-r--r-- | include/media/saa7146_vv.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/media/saa7146.h b/include/media/saa7146.h index 815964d52dd2..c02c923ecc6a 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h @@ -168,7 +168,7 @@ void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt); int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt, struct scatterlist *list, int length ); char *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa7146_pgtable *pt); void saa7146_setgpio(struct saa7146_dev *dev, int port, u32 data); -int saa7146_wait_for_debi_done(struct saa7146_dev *dev); +int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop); /* some memory sizes */ #define SAA7146_I2C_MEM ( 1*PAGE_SIZE) diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index 61a509eb1bc6..eddf16aa3e8e 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h @@ -219,8 +219,6 @@ extern struct saa7146_use_ops saa7146_vbi_uops; /* resource management functions */ int saa7146_res_get(struct saa7146_fh *fh, unsigned int bit); -int saa7146_res_check(struct saa7146_fh *fh, unsigned int bit); -int saa7146_res_locked(struct saa7146_dev *dev, unsigned int bit); void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits); #define RESOURCE_DMA1_HPS 0x1 |