diff options
author | Alexander Viro <viro@www.linux.org.uk> | 2004-07-15 22:02:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-15 22:02:43 -0700 |
commit | ef57ecaf874386b93da0451f4a291a2d652865c5 (patch) | |
tree | 067a36959932258d12f0f210d8361b2948467737 /sound | |
parent | bf39d18e640909b8b88318158bec1450bd178ebd (diff) | |
download | history-ef57ecaf874386b93da0451f4a291a2d652865c5.tar.gz |
[PATCH] remove bogus casts of pointers to unsigned int in sound/*
Diffstat (limited to 'sound')
-rw-r--r-- | sound/oss/cs46xx.c | 67 | ||||
-rw-r--r-- | sound/oss/ymfpci.c | 3 |
2 files changed, 35 insertions, 35 deletions
diff --git a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c index 60fc6c69f744a5..aa1455a35caf68 100644 --- a/sound/oss/cs46xx.c +++ b/sound/oss/cs46xx.c @@ -1144,9 +1144,9 @@ static void start_dac(struct cs_state *state) tmp &= 0xFFFF; tmp |= card->pctl; CS_DBGOUT(CS_PARMS, 6, printk( - "cs46xx: start_dac() poke card=0x%.08x tmp=0x%.08x addr=0x%.08x \n", - (unsigned)card, (unsigned)tmp, - (unsigned)card->ba1.idx[(BA1_PCTL >> 16) & 3]+(BA1_PCTL&0xffff) ) ); + "cs46xx: start_dac() poke card=%p tmp=0x%.08x addr=%p \n", + card, (unsigned)tmp, + card->ba1.idx[(BA1_PCTL >> 16) & 3]+(BA1_PCTL&0xffff) ) ); cs461x_poke(card, BA1_PCTL, tmp); } spin_unlock_irqrestore(&card->lock, flags); @@ -1613,8 +1613,8 @@ static void cs_update_ptr(struct cs_card *card, int wake) memset(dmabuf->rawbuf, (dmabuf->fmt & CS_FMT_16BIT) ? 0 : 0x80, (unsigned)hwptr); - memset((void *)((unsigned)dmabuf->rawbuf + - dmabuf->dmasize + hwptr - diff), + memset((char *)dmabuf->rawbuf + + dmabuf->dmasize + hwptr - diff, (dmabuf->fmt & CS_FMT_16BIT) ? 0 : 0x80, diff - hwptr); } @@ -1970,8 +1970,8 @@ static void CopySamples(char *dst, char *src, int count, unsigned fmt, CS_DBGOUT(CS_FUNCTION, 2, printk(KERN_INFO "cs46xx: CopySamples()+ ") ); CS_DBGOUT(CS_WAVE_READ, 8, printk(KERN_INFO - " dst=0x%x src=0x%x count=%d fmt=0x%x\n", - (unsigned)dst,(unsigned)src,(unsigned)count,(unsigned)fmt) ); + " dst=%p src=%p count=%d fmt=0x%x\n", + dst,src,count,fmt) ); /* * See if the data should be output as 8-bit unsigned stereo. @@ -2169,7 +2169,7 @@ static ssize_t cs_read(struct file *file, char __user *buffer, size_t count, lof dmabuf->dmasize,dmabuf->count,buffer,ret) ); if (cs_copy_to_user(state, buffer, - (void *)((unsigned)dmabuf->rawbuf + swptr), cnt, &copied)) + (char *)dmabuf->rawbuf + swptr, cnt, &copied)) { if (!ret) ret = -EFAULT; goto out; @@ -2404,8 +2404,8 @@ static int cs_mmap(struct file *file, struct vm_area_struct *vma) int ret = 0; unsigned long size; - CS_DBGOUT(CS_FUNCTION | CS_PARMS, 2, printk("cs46xx: cs_mmap()+ file=0x%x %s %s\n", - (unsigned)file, vma->vm_flags & VM_WRITE ? "VM_WRITE" : "", + CS_DBGOUT(CS_FUNCTION | CS_PARMS, 2, printk("cs46xx: cs_mmap()+ file=%p %s %s\n", + file, vma->vm_flags & VM_WRITE ? "VM_WRITE" : "", vma->vm_flags & VM_READ ? "VM_READ" : "") ); if (vma->vm_flags & VM_WRITE) { @@ -2441,8 +2441,7 @@ static int cs_mmap(struct file *file, struct vm_area_struct *vma) * use the DAC only. */ state = card->states[1]; - if(!(unsigned)state) - { + if (!state) { ret = -EINVAL; goto out; } @@ -3204,8 +3203,8 @@ static int cs_open(struct inode *inode, struct file *file) int ret=0; unsigned int tmp; - CS_DBGOUT(CS_OPEN | CS_FUNCTION, 2, printk("cs46xx: cs_open()+ file=0x%x %s %s\n", - (unsigned)file, file->f_mode & FMODE_WRITE ? "FMODE_WRITE" : "", + CS_DBGOUT(CS_OPEN | CS_FUNCTION, 2, printk("cs46xx: cs_open()+ file=%p %s %s\n", + file, file->f_mode & FMODE_WRITE ? "FMODE_WRITE" : "", file->f_mode & FMODE_READ ? "FMODE_READ" : "") ); list_for_each(entry, &cs46xx_devs) @@ -3380,8 +3379,8 @@ static int cs_release(struct inode *inode, struct file *file) struct dmabuf *dmabuf; struct cs_state *state; unsigned int tmp; - CS_DBGOUT(CS_RELEASE | CS_FUNCTION, 2, printk("cs46xx: cs_release()+ file=0x%x %s %s\n", - (unsigned)file, file->f_mode & FMODE_WRITE ? "FMODE_WRITE" : "", + CS_DBGOUT(CS_RELEASE | CS_FUNCTION, 2, printk("cs46xx: cs_release()+ file=%p %s %s\n", + file, file->f_mode & FMODE_WRITE ? "FMODE_WRITE" : "", file->f_mode & FMODE_READ ? "FMODE_READ" : "") ); if (!(file->f_mode & (FMODE_WRITE | FMODE_READ))) @@ -3675,8 +3674,8 @@ static int cs46xx_suspend(struct cs_card *card, u32 state) { unsigned int tmp; CS_DBGOUT(CS_PM | CS_FUNCTION, 4, - printk("cs46xx: cs46xx_suspend()+ flags=0x%x s=0x%x\n", - (unsigned)card->pm.flags,(unsigned)card)); + printk("cs46xx: cs46xx_suspend()+ flags=0x%x s=%p\n", + (unsigned)card->pm.flags,card)); /* * check the current state, only suspend if IDLE */ @@ -4297,9 +4296,9 @@ static int __init cs_ac97_init(struct cs_card *card) card->ac97_codec[num_ac97] = codec; CS_DBGOUT(CS_FUNCTION | CS_INIT, 2, printk(KERN_INFO - "cs46xx: cs_ac97_init() ac97_codec[%d] set to 0x%x\n", + "cs46xx: cs_ac97_init() ac97_codec[%d] set to %p\n", (unsigned int)num_ac97, - (unsigned int)codec)); + codec)); /* if there is no secondary codec at all, don't probe any more */ if (!ready_2nd) { @@ -5489,13 +5488,13 @@ static int __devinit cs46xx_probe(struct pci_dev *pci_dev, card->ba1.name.reg = ioremap_nocache(card->ba1_addr + BA1_SP_REG, CS461X_BA1_REG_SIZE); CS_DBGOUT(CS_INIT, 4, printk(KERN_INFO - "cs46xx: card=0x%x card->ba0=0x%.08x\n",(unsigned)card,(unsigned)card->ba0) ); + "cs46xx: card=%p card->ba0=%p\n",card,card->ba0) ); CS_DBGOUT(CS_INIT, 4, printk(KERN_INFO - "cs46xx: card->ba1=0x%.08x 0x%.08x 0x%.08x 0x%.08x\n", - (unsigned)card->ba1.name.data0, - (unsigned)card->ba1.name.data1, - (unsigned)card->ba1.name.pmem, - (unsigned)card->ba1.name.reg) ); + "cs46xx: card->ba1=%p %p %p %p\n", + card->ba1.name.data0, + card->ba1.name.data1, + card->ba1.name.pmem, + card->ba1.name.reg) ); if(card->ba0 == 0 || card->ba1.name.data0 == 0 || card->ba1.name.data1 == 0 || card->ba1.name.pmem == 0 || @@ -5566,20 +5565,20 @@ static int __devinit cs46xx_probe(struct pci_dev *pci_dev, if (pmdev) { CS_DBGOUT(CS_INIT | CS_PM, 4, printk(KERN_INFO - "cs46xx: probe() pm_register() succeeded (0x%x).\n", - (unsigned)pmdev)); + "cs46xx: probe() pm_register() succeeded (%p).\n", + pmdev)); pmdev->data = card; } else { CS_DBGOUT(CS_INIT | CS_PM | CS_ERROR, 2, printk(KERN_INFO - "cs46xx: probe() pm_register() failed (0x%x).\n", - (unsigned)pmdev)); + "cs46xx: probe() pm_register() failed (%p).\n", + pmdev)); card->pm.flags |= CS46XX_PM_NOT_REGISTERED; } - CS_DBGOUT(CS_PM, 9, printk(KERN_INFO "cs46xx: pm.flags=0x%x card=0x%x\n", - (unsigned)card->pm.flags,(unsigned)card)); + CS_DBGOUT(CS_PM, 9, printk(KERN_INFO "cs46xx: pm.flags=0x%x card=%p\n", + (unsigned)card->pm.flags,card)); CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO "cs46xx: probe()- device allocated successfully\n")); @@ -5772,8 +5771,8 @@ int cs46xx_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data) struct cs_card *card; CS_DBGOUT(CS_PM, 2, printk(KERN_INFO - "cs46xx: cs46xx_pm_callback dev=0x%x rqst=0x%x card=%d\n", - (unsigned)dev,(unsigned)rqst,(unsigned)data)); + "cs46xx: cs46xx_pm_callback dev=%p rqst=0x%x card=%p\n", + dev,(unsigned)rqst,data)); card = (struct cs_card *) dev->data; if (card) { switch(rqst) { diff --git a/sound/oss/ymfpci.c b/sound/oss/ymfpci.c index 7b3236fed7416f..afa2876b62603a 100644 --- a/sound/oss/ymfpci.c +++ b/sound/oss/ymfpci.c @@ -2365,7 +2365,8 @@ static int ymfpci_memalloc(ymfpci_t *codec) codec->dma_area_ba = pba; codec->dma_area_size = size + 0xff; - if ((off = ((uint) ptr) & 0xff) != 0) { + off = (unsigned long)ptr & 0xff; + if (off) { ptr += 0x100 - off; pba += 0x100 - off; } |