diff options
| author | Kenneth Aafloy <devnull@localhost> | 2005-03-08 16:39:32 +0000 |
|---|---|---|
| committer | Kenneth Aafloy <devnull@localhost> | 2005-03-08 16:39:32 +0000 |
| commit | 50ad91793204ead74ea919534aa56f99313b04ae (patch) | |
| tree | 61c167ecb845832f1f5760d0af1a81089c2bd632 /linux | |
| parent | e9529e2ed224693daf464e5f35951cde873ec55d (diff) | |
| download | mediapointer-dvb-s2-50ad91793204ead74ea919534aa56f99313b04ae.tar.gz mediapointer-dvb-s2-50ad91793204ead74ea919534aa56f99313b04ae.tar.bz2 | |
- Remove duplicate setgpio
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/common/saa7146_core.c | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index 76cdc5481..9f6c19ac1 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -46,21 +46,15 @@ static void dump_registers(struct saa7146_dev* dev) * gpio and debi helper functions ****************************************************************************/ -/* write "data" to the gpio-pin "pin" -- unused */ -void saa7146_set_gpio(struct saa7146_dev *dev, u8 pin, u8 data) +void saa7146_setgpio(struct saa7146_dev *dev, int port, u32 data) { u32 value = 0; - /* sanity check */ - if(pin > 3) - return; - - /* read old register contents */ - value = saa7146_read(dev, GPIO_CTRL ); - - value &= ~(0xff << (8*pin)); - value |= (data << (8*pin)); + BUG_ON(port > 3); + value = saa7146_read(dev, GPIO_CTRL); + value &= ~(0xff << (8*port)); + value |= (data << (8*port)); saa7146_write(dev, GPIO_CTRL, value); } @@ -236,19 +230,6 @@ int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt } /********************************************************************************/ -/* gpio functions */ - -void saa7146_setgpio(struct saa7146_dev *dev, int port, u32 data) -{ - u32 val = 0; - - val=saa7146_read(dev,GPIO_CTRL); - val&=~(0xff << (8*(port))); - val|=(data)<<(8*(port)); - saa7146_write(dev, GPIO_CTRL, val); -} - -/********************************************************************************/ /* interrupt handler */ static irqreturn_t interrupt_hw(int irq, void *dev_id, struct pt_regs *regs) { |