OSS: remove unused functions
PATCH 1/1 OSS: remove unused functions
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
The patch below removes someunused functions from OSS.
diffstat output:
sound/oss/ad1889.c | 14 -------------- sound/oss/cmpci.c | 9 --------- sound/oss/cs46xx.c | 25 ------------------------- sound/oss/ymfpci.c | 5 ----- 4 files changed, 53 deletions(-)
- --- linux-2.6.10-rc1-mm1-full/sound/oss/ad1889.c.old 2004-10-28 23:45:24.000000000 +0200
+++ linux-2.6.10-rc1-mm1-full/sound/oss/ad1889.c 2004-10-28 23:44:59.000000000 +0200
@@ -82,20 +82,6 @@
ac97_codec->codec_write(dev->ac97_codec, AC97_POWER_CONTROL, 0);
}
- -static inline void ad1889_set_adc_rate(ad1889_dev_t *dev, int rate)
- -{
- - struct ac97_codec *ac97_codec = dev->ac97_codec;
- -
- - DBG("Setting ADC rate to %d\n", rate);
- - dev->state[AD_ADC_STATE].dmabuf.rate = rate;
- - AD1889_WRITEW(dev, AD_DSRES, rate);
- -
- - /* Cycle the ADC to enable the new rate */
- - ac97_codec->codec_write(dev->ac97_codec, AC97_POWER_CONTROL, 0x0100);
- - WAIT_10MS();
- - ac97_codec->codec_write(dev->ac97_codec, AC97_POWER_CONTROL, 0);
- -}
- -
static inline void ad1889_set_wav_fmt(ad1889_dev_t *dev, int fmt) {
u16 tmp;
- --- linux-2.6.10-rc1-mm1-full/sound/oss/ymfpci.c.old 2004-10-28 23:45:45.000000000 +0200
+++ linux-2.6.10-rc1-mm1-full/sound/oss/ymfpci.c 2004-10-28 23:46:01.000000000 +0200
@@ -124,11 +124,6 @@
* common I/O routines
*/
- -static inline u8 ymfpci_readb(ymfpci_t *codec, u32 offset)
- -{
- - return readb(codec->reg_area_virt + offset);
- -}
- -
static inline void ymfpci_writeb(ymfpci_t *codec, u32 offset, u8 val) {
writeb(val, codec->reg_area_virt + offset);
- --- linux-2.6.10-rc1-mm1-full/sound/oss/cmpci.c.old 2004-10-28 23:46:25.000000000 +0200
+++ linux-2.6.10-rc1-mm1-full/sound/oss/cmpci.c 2004-10-28 23:46:41.000000000 +0200
@@ -1162,15 +1162,6 @@
enable_adc(s);
}
- -static inline void enable_dac(struct cm_state *s)
- -{
- - unsigned long flags;
- -
- - spin_lock_irqsave(&s->lock, flags);
- - enable_dac_unlocked(s);
- - spin_unlock_irqrestore(&s->lock, flags);
- -}
- -
static inline void stop_adc_unlocked(struct cm_state *s) {
if (s->enable & ENADC) {
- --- linux-2.6.10-rc1-mm1-full/sound/oss/cs46xx.c.old 2004-10-28 23:47:27.000000000 +0200
+++ linux-2.6.10-rc1-mm1-full/sound/oss/cs46xx.c 2004-10-28 23:47:37.000000000 +0200
@@ -391,31 +391,6 @@
static int cs46xx_suspend_tbl(struct pci_dev *pcidev, u32 state); static int cs46xx_resume_tbl(struct pci_dev *pcidev);
- -static inline unsigned ld2(unsigned int x)
- -{
- - unsigned r = 0;
- -
- - if (x >= 0x10000) {
- - x >>= 16;
- - r += 16;
- - }
- - if (x >= 0x100) {
- - x >>= 8;
- - r += 8;
- - }
- - if (x >= 0x10) {
- - x >>= 4;
- - r += 4;
- - }
- - if (x >= 4) {
- - x >>= 2;
- - r += 2;
- - }
- - if (x >= 2)
- - r++;
- - return r;
- -}
- -
#if CSDEBUG
/* DEBUG ROUTINES */
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
iD8DBQFBgXzOmfzqmE8StAARAoGJAJ4nClI4zoWH0PDUchnRWkAvxB9/VgCdFYG8 0nKtu24Xrr1JLWqpx1KrPy4=
=V3O9
-----END PGP SIGNATURE-----
PATCH 1/1 OSS: remove unused functions
[ this time without the problems due to a digital signature... ]
The patch below removes some unused functions from OSS.
diffstat output:
sound/oss/ad1889.c | 14 -------------- sound/oss/cmpci.c | 9 --------- sound/oss/cs46xx.c | 25 ------------------------- sound/oss/ymfpci.c | 5 ----- 4 files changed, 53 deletions(-)
sound/oss/ad1889.c renamed from sound/oss/ad1889.c.old +0 -14
@@ -82,20 +82,6 @@ ac97_codec->codec_write (dev->ac97_codec,AC97_POWER_CONTROL ,0 ); } -static inline void ad1889_set_adc_rate (ad1889_dev_t *dev,int rate) -{ -struct ac97_codec *ac97_codec = dev->ac97_codec; - -DBG ("Setting ADC rate to %d\n" , rate); - dev->state[AD_ADC_STATE ].dmabuf.rate = rate; -AD1889_WRITEW (dev,AD_DSRES , rate); - -/* Cycle the ADC to enable the new rate */ - ac97_codec->codec_write (dev->ac97_codec,AC97_POWER_CONTROL ,0x0100 ); -WAIT_10MS (); - ac97_codec->codec_write (dev->ac97_codec,AC97_POWER_CONTROL ,0 ); -} -static inline void ad1889_set_wav_fmt (ad1889_dev_t *dev,int fmt) {u16 tmp;
sound/oss/ymfpci.c renamed from sound/oss/ymfpci.c.old +0 -5
@@ -124,11 +124,6 @@* common I/O routines */ -static inline u8 ymfpci_readb (ymfpci_t *codec,u32 offset) -{ -return readb (codec->reg_area_virt + offset); -} -static inline void ymfpci_writeb (ymfpci_t *codec,u32 offset,u8 val) {writeb (val, codec->reg_area_virt + offset);
sound/oss/cmpci.c renamed from sound/oss/cmpci.c.old +0 -9
@@ -1162,15 +1162,6 @@enable_adc (s); } -static inline void enable_dac (struct cm_state *s) -{ -unsigned long flags; - -spin_lock_irqsave (&s->lock, flags); -enable_dac_unlocked (s); -spin_unlock_irqrestore (&s->lock, flags); -} -static inline void stop_adc_unlocked (struct cm_state *s) {if (s->enable &ENADC ) {
sound/oss/cs46xx.c renamed from sound/oss/cs46xx.c.old +0 -25
@@ -391,31 +391,6 @@static int cs46xx_suspend_tbl (struct pci_dev *pcidev,u32 state);static int cs46xx_resume_tbl (struct pci_dev *pcidev); -static inline unsigned ld2 (unsigned int x) -{ -unsigned r =0 ; - -if (x >=0x10000 ) { - x >>=16 ; - r +=16 ; - } -if (x >=0x100 ) { - x >>=8 ; - r +=8 ; - } -if (x >=0x10 ) { - x >>=4 ; - r +=4 ; - } -if (x >=4 ) { - x >>=2 ; - r +=2 ; - } -if (x >=2 ) - r++; -return r; -} -#if CSDEBUG /* DEBUG ROUTINES */