git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
sound
/
oss
/
cs46xx.c
diff --git
a/sound/oss/cs46xx.c
b/sound/oss/cs46xx.c
index
60fc6c6
..
bc4941c
100644
(file)
--- a/
sound/oss/cs46xx.c
+++ b/
sound/oss/cs46xx.c
@@
-94,7
+94,6
@@
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/uaccess.h>
-#include <asm/hardirq.h>
#include "cs46xxpm-24.h"
#include "cs46xx_wrapper-24.h"
#include "cs46xxpm-24.h"
#include "cs46xx_wrapper-24.h"
@@
-176,24
+175,24
@@
#if CSDEBUG
static unsigned long cs_debuglevel=1; /* levels range from 1-9 */
#if CSDEBUG
static unsigned long cs_debuglevel=1; /* levels range from 1-9 */
-
MODULE_PARM(cs_debuglevel, "i"
);
+
module_param(cs_debuglevel, ulong, 0644
);
static unsigned long cs_debugmask=CS_INIT | CS_ERROR; /* use CS_DBGOUT with various mask values */
static unsigned long cs_debugmask=CS_INIT | CS_ERROR; /* use CS_DBGOUT with various mask values */
-
MODULE_PARM(cs_debugmask, "i"
);
+
module_param(cs_debugmask, ulong, 0644
);
#endif
static unsigned long hercules_egpio_disable; /* if non-zero set all EGPIO to 0 */
#endif
static unsigned long hercules_egpio_disable; /* if non-zero set all EGPIO to 0 */
-
MODULE_PARM(hercules_egpio_disable, "i"
);
+
module_param(hercules_egpio_disable, ulong, 0
);
static unsigned long initdelay=700; /* PM delay in millisecs */
static unsigned long initdelay=700; /* PM delay in millisecs */
-
MODULE_PARM(initdelay, "i"
);
+
module_param(initdelay, ulong, 0
);
static unsigned long powerdown=-1; /* turn on/off powerdown processing in driver */
static unsigned long powerdown=-1; /* turn on/off powerdown processing in driver */
-
MODULE_PARM(powerdown, "i"
);
+
module_param(powerdown, ulong, 0
);
#define DMABUF_DEFAULTORDER 3
static unsigned long defaultorder=DMABUF_DEFAULTORDER;
#define DMABUF_DEFAULTORDER 3
static unsigned long defaultorder=DMABUF_DEFAULTORDER;
-
MODULE_PARM(defaultorder, "i"
);
+
module_param(defaultorder, ulong, 0
);
static int external_amp;
static int external_amp;
-
MODULE_PARM(external_amp, "i"
);
+
module_param(external_amp, bool, 0
);
static int thinkpad;
static int thinkpad;
-
MODULE_PARM(thinkpad, "i"
);
+
module_param(thinkpad, bool, 0
);
/*
* set the powerdown module parm to 0 to disable all
/*
* set the powerdown module parm to 0 to disable all
@@
-220,7
+219,7
@@
struct cs_channel
#define CS46XX_ARCH "32" //architecture key
#endif
#define CS46XX_ARCH "32" //architecture key
#endif
-struct list_head cs46xx_devs = { &cs46xx_devs, &cs46xx_devs };
+st
atic st
ruct list_head cs46xx_devs = { &cs46xx_devs, &cs46xx_devs };
/* magic numbers to protect our data structures */
#define CS_CARD_MAGIC 0x43525553 /* "CRUS" */
/* magic numbers to protect our data structures */
#define CS_CARD_MAGIC 0x43525553 /* "CRUS" */
@@
-347,17
+346,17
@@
struct cs_card {
u32 irq;
/* mappings */
u32 irq;
/* mappings */
- void *ba0;
+ void
__iomem
*ba0;
union
{
struct
{
union
{
struct
{
- u8 *data0;
- u8 *data1;
- u8 *pmem;
- u8 *reg;
+ u8
__iomem
*data0;
+ u8
__iomem
*data1;
+ u8
__iomem
*pmem;
+ u8
__iomem
*reg;
} name;
} name;
- u8 *idx[4];
+ u8
__iomem
*idx[4];
} ba1;
/* Function support */
} ba1;
/* Function support */
@@
-392,30
+391,9
@@
static void cs461x_clear_serial_FIFOs(struct cs_card *card, int type);
static int cs46xx_suspend_tbl(struct pci_dev *pcidev, u32 state);
static int cs46xx_resume_tbl(struct pci_dev *pcidev);
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;
-}
+#ifndef CS46XX_ACPI_SUPPORT
+static int cs46xx_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data);
+#endif
#if CSDEBUG
#if CSDEBUG
@@
-427,7
+405,7
@@
static inline unsigned ld2(unsigned int x)
#define SOUND_MIXER_CS_SETDBGMASK _SIOWR('M',123, int)
#define SOUND_MIXER_CS_APM _SIOWR('M',124, int)
#define SOUND_MIXER_CS_SETDBGMASK _SIOWR('M',123, int)
#define SOUND_MIXER_CS_APM _SIOWR('M',124, int)
-void printioctl(unsigned int x)
+
static
void printioctl(unsigned int x)
{
unsigned int i;
unsigned char vidx;
{
unsigned int i;
unsigned char vidx;
@@
-965,7
+943,7
@@
static struct InitStruct
* "SetCaptureSPValues()" -- Initialize record task values before each
* capture startup.
*/
* "SetCaptureSPValues()" -- Initialize record task values before each
* capture startup.
*/
-void SetCaptureSPValues(struct cs_card *card)
+
static
void SetCaptureSPValues(struct cs_card *card)
{
unsigned i, offset;
CS_DBGOUT(CS_FUNCTION, 8, printk("cs46xx: SetCaptureSPValues()+\n") );
{
unsigned i, offset;
CS_DBGOUT(CS_FUNCTION, 8, printk("cs46xx: SetCaptureSPValues()+\n") );
@@
-1144,9
+1122,9
@@
static void start_dac(struct cs_state *state)
tmp &= 0xFFFF;
tmp |= card->pctl;
CS_DBGOUT(CS_PARMS, 6, printk(
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);
cs461x_poke(card, BA1_PCTL, tmp);
}
spin_unlock_irqrestore(&card->lock, flags);
@@
-1191,7
+1169,7
@@
static int alloc_dmabuf(struct cs_state *state)
dmabuf->buforder = order;
dmabuf->rawbuf = rawbuf;
// Now mark the pages as reserved; otherwise the
dmabuf->buforder = order;
dmabuf->rawbuf = rawbuf;
// Now mark the pages as reserved; otherwise the
- // remap_p
age
_range() in cs46xx_mmap doesn't work.
+ // remap_p
fn
_range() in cs46xx_mmap doesn't work.
// 1. get index to last page in mem_map array for rawbuf.
mapend = virt_to_page(dmabuf->rawbuf +
(PAGE_SIZE << dmabuf->buforder) - 1);
// 1. get index to last page in mem_map array for rawbuf.
mapend = virt_to_page(dmabuf->rawbuf +
(PAGE_SIZE << dmabuf->buforder) - 1);
@@
-1228,7
+1206,7
@@
static int alloc_dmabuf(struct cs_state *state)
dmabuf->buforder_tmpbuff = order;
// Now mark the pages as reserved; otherwise the
dmabuf->buforder_tmpbuff = order;
// Now mark the pages as reserved; otherwise the
- // remap_p
age
_range() in cs46xx_mmap doesn't work.
+ // remap_p
fn
_range() in cs46xx_mmap doesn't work.
// 1. get index to last page in mem_map array for rawbuf.
mapend = virt_to_page(dmabuf->tmpbuff +
(PAGE_SIZE << dmabuf->buforder_tmpbuff) - 1);
// 1. get index to last page in mem_map array for rawbuf.
mapend = virt_to_page(dmabuf->tmpbuff +
(PAGE_SIZE << dmabuf->buforder_tmpbuff) - 1);
@@
-1613,8
+1591,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(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);
}
(dmabuf->fmt & CS_FMT_16BIT) ? 0 : 0x80,
diff - hwptr);
}
@@
-1725,8
+1703,6
@@
static ssize_t cs_midi_read(struct file *file, char __user *buffer, size_t count
unsigned ptr;
int cnt;
unsigned ptr;
int cnt;
- if (ppos != &file->f_pos)
- return -ESPIPE;
if (!access_ok(VERIFY_WRITE, buffer, count))
return -EFAULT;
ret = 0;
if (!access_ok(VERIFY_WRITE, buffer, count))
return -EFAULT;
ret = 0;
@@
-1770,8
+1746,6
@@
static ssize_t cs_midi_write(struct file *file, const char __user *buffer, size_
unsigned ptr;
int cnt;
unsigned ptr;
int cnt;
- if (ppos != &file->f_pos)
- return -ESPIPE;
if (!access_ok(VERIFY_READ, buffer, count))
return -EFAULT;
ret = 0;
if (!access_ok(VERIFY_READ, buffer, count))
return -EFAULT;
ret = 0;
@@
-1970,8
+1944,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
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.
/*
* See if the data should be output as 8-bit unsigned stereo.
@@
-2100,14
+2074,12
@@
static ssize_t cs_read(struct file *file, char __user *buffer, size_t count, lof
unsigned copied=0;
CS_DBGOUT(CS_WAVE_READ | CS_FUNCTION, 4,
unsigned copied=0;
CS_DBGOUT(CS_WAVE_READ | CS_FUNCTION, 4,
- printk("cs46xx: cs_read()+ %d\n",count) );
+ printk("cs46xx: cs_read()+ %
z
d\n",count) );
state = (struct cs_state *)card->states[0];
if(!state)
return -ENODEV;
dmabuf = &state->dmabuf;
state = (struct cs_state *)card->states[0];
if(!state)
return -ENODEV;
dmabuf = &state->dmabuf;
- if (ppos != &file->f_pos)
- return -ESPIPE;
if (dmabuf->mapped)
return -ENXIO;
if (!access_ok(VERIFY_WRITE, buffer, count))
if (dmabuf->mapped)
return -ENXIO;
if (!access_ok(VERIFY_WRITE, buffer, count))
@@
-2163,13
+2135,13
@@
static ssize_t cs_read(struct file *file, char __user *buffer, size_t count, lof
}
CS_DBGOUT(CS_WAVE_READ, 2, printk(KERN_INFO
}
CS_DBGOUT(CS_WAVE_READ, 2, printk(KERN_INFO
- "_read() copy_to cnt=%d count=%d ", cnt,count) );
+ "_read() copy_to cnt=%d count=%
z
d ", cnt,count) );
CS_DBGOUT(CS_WAVE_READ, 8, printk(KERN_INFO
CS_DBGOUT(CS_WAVE_READ, 8, printk(KERN_INFO
- " .dmasize=%d .count=%d buffer=%p ret=%d\n",
+ " .dmasize=%d .count=%d buffer=%p ret=%
z
d\n",
dmabuf->dmasize,dmabuf->count,buffer,ret) );
if (cs_copy_to_user(state, buffer,
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;
{
if (!ret) ret = -EFAULT;
goto out;
@@
-2190,7
+2162,7
@@
out2:
up(&state->sem);
set_current_state(TASK_RUNNING);
CS_DBGOUT(CS_WAVE_READ | CS_FUNCTION, 4,
up(&state->sem);
set_current_state(TASK_RUNNING);
CS_DBGOUT(CS_WAVE_READ | CS_FUNCTION, 4,
- printk("cs46xx: cs_read()- %d\n",ret) );
+ printk("cs46xx: cs_read()- %
z
d\n",ret) );
return ret;
}
return ret;
}
@@
-2208,7
+2180,7
@@
static ssize_t cs_write(struct file *file, const char __user *buffer, size_t cou
int cnt;
CS_DBGOUT(CS_WAVE_WRITE | CS_FUNCTION, 4,
int cnt;
CS_DBGOUT(CS_WAVE_WRITE | CS_FUNCTION, 4,
- printk("cs46xx: cs_write called, count = %d\n", count) );
+ printk("cs46xx: cs_write called, count = %
z
d\n", count) );
state = (struct cs_state *)card->states[1];
if(!state)
return -ENODEV;
state = (struct cs_state *)card->states[1];
if(!state)
return -ENODEV;
@@
-2216,9
+2188,6
@@
static ssize_t cs_write(struct file *file, const char __user *buffer, size_t cou
return -EFAULT;
dmabuf = &state->dmabuf;
return -EFAULT;
dmabuf = &state->dmabuf;
- if (ppos != &file->f_pos)
- return -ESPIPE;
-
down(&state->sem);
if (dmabuf->mapped)
{
down(&state->sem);
if (dmabuf->mapped)
{
@@
-2318,7
+2287,7
@@
out:
set_current_state(TASK_RUNNING);
CS_DBGOUT(CS_WAVE_WRITE | CS_FUNCTION, 2,
set_current_state(TASK_RUNNING);
CS_DBGOUT(CS_WAVE_WRITE | CS_FUNCTION, 2,
- printk("cs46xx: cs_write()- ret=
0x%x
\n", ret) );
+ printk("cs46xx: cs_write()- ret=
%zd
\n", ret) );
return ret;
}
return ret;
}
@@
-2404,8
+2373,8
@@
static int cs_mmap(struct file *file, struct vm_area_struct *vma)
int ret = 0;
unsigned long size;
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) {
vma->vm_flags & VM_READ ? "VM_READ" : "") );
if (vma->vm_flags & VM_WRITE) {
@@
-2441,8
+2410,7
@@
static int cs_mmap(struct file *file, struct vm_area_struct *vma)
* use the DAC only.
*/
state = card->states[1];
* use the DAC only.
*/
state = card->states[1];
- if(!(unsigned)state)
- {
+ if (!state) {
ret = -EINVAL;
goto out;
}
ret = -EINVAL;
goto out;
}
@@
-2463,7
+2431,8
@@
static int cs_mmap(struct file *file, struct vm_area_struct *vma)
ret = -EINVAL;
goto out;
}
ret = -EINVAL;
goto out;
}
- if (remap_page_range(vma, vma->vm_start, virt_to_phys(dmabuf->rawbuf),
+ if (remap_pfn_range(vma, vma->vm_start,
+ virt_to_phys(dmabuf->rawbuf) >> PAGE_SHIFT,
size, vma->vm_page_prot))
{
ret = -EAGAIN;
size, vma->vm_page_prot))
{
ret = -EAGAIN;
@@
-2481,7
+2450,7
@@
static int cs_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
{
struct cs_card *card = (struct cs_card *)file->private_data;
struct cs_state *state;
{
struct cs_card *card = (struct cs_card *)file->private_data;
struct cs_state *state;
- struct dmabuf *dmabuf=
0
;
+ struct dmabuf *dmabuf=
NULL
;
unsigned long flags;
audio_buf_info abinfo;
count_info cinfo;
unsigned long flags;
audio_buf_info abinfo;
count_info cinfo;
@@
-3204,8
+3173,8
@@
static int cs_open(struct inode *inode, struct file *file)
int ret=0;
unsigned int tmp;
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)
file->f_mode & FMODE_READ ? "FMODE_READ" : "") );
list_for_each(entry, &cs46xx_devs)
@@
-3371,7
+3340,7
@@
static int cs_open(struct inode *inode, struct file *file)
return ret;
}
CS_DBGOUT(CS_OPEN | CS_FUNCTION, 2, printk("cs46xx: cs_open()- 0\n") );
return ret;
}
CS_DBGOUT(CS_OPEN | CS_FUNCTION, 2, printk("cs46xx: cs_open()- 0\n") );
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int cs_release(struct inode *inode, struct file *file)
}
static int cs_release(struct inode *inode, struct file *file)
@@
-3380,8
+3349,8
@@
static int cs_release(struct inode *inode, struct file *file)
struct dmabuf *dmabuf;
struct cs_state *state;
unsigned int tmp;
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)))
file->f_mode & FMODE_READ ? "FMODE_READ" : "") );
if (!(file->f_mode & (FMODE_WRITE | FMODE_READ)))
@@
-3500,7
+3469,7
@@
static void printpm(struct cs_card *s)
* Suspend - save the ac97 regs, mute the outputs and power down the part.
*
****************************************************************************/
* Suspend - save the ac97 regs, mute the outputs and power down the part.
*
****************************************************************************/
-void cs46xx_ac97_suspend(struct cs_card *card)
+
static
void cs46xx_ac97_suspend(struct cs_card *card)
{
int Count,i;
struct ac97_codec *dev=card->ac97_codec[0];
{
int Count,i;
struct ac97_codec *dev=card->ac97_codec[0];
@@
-3571,7
+3540,7
@@
void cs46xx_ac97_suspend(struct cs_card *card)
* Resume - power up the part and restore its registers..
*
****************************************************************************/
* Resume - power up the part and restore its registers..
*
****************************************************************************/
-void cs46xx_ac97_resume(struct cs_card *card)
+
static
void cs46xx_ac97_resume(struct cs_card *card)
{
int Count,i;
struct ac97_codec *dev=card->ac97_codec[0];
{
int Count,i;
struct ac97_codec *dev=card->ac97_codec[0];
@@
-3675,8
+3644,8
@@
static int cs46xx_suspend(struct cs_card *card, u32 state)
{
unsigned int tmp;
CS_DBGOUT(CS_PM | CS_FUNCTION, 4,
{
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
*/
/*
* check the current state, only suspend if IDLE
*/
@@
-4105,7
+4074,7
@@
static int cs_open_mixdev(struct inode *inode, struct file *file)
CS_INC_USE_COUNT(&card->mixer_use_cnt);
CS_DBGOUT(CS_FUNCTION | CS_OPEN, 4,
printk(KERN_INFO "cs46xx: cs_open_mixdev()- 0\n"));
CS_INC_USE_COUNT(&card->mixer_use_cnt);
CS_DBGOUT(CS_FUNCTION | CS_OPEN, 4,
printk(KERN_INFO "cs46xx: cs_open_mixdev()- 0\n"));
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int cs_release_mixdev(struct inode *inode, struct file *file)
}
static int cs_release_mixdev(struct inode *inode, struct file *file)
@@
-4159,7
+4128,6
@@
match:
return 0;
}
return 0;
}
-void __exit cs46xx_cleanup_module(void);
static int cs_ioctl_mixdev(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
static int cs_ioctl_mixdev(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
@@
-4272,7
+4240,7
@@
static int __init cs_ac97_init(struct cs_card *card)
CS_DBGOUT(CS_FUNCTION | CS_INIT, 2, printk(KERN_INFO
"cs46xx: cs_ac97_init()- codec number %d not found\n",
num_ac97) );
CS_DBGOUT(CS_FUNCTION | CS_INIT, 2, printk(KERN_INFO
"cs46xx: cs_ac97_init()- codec number %d not found\n",
num_ac97) );
- card->ac97_codec[num_ac97] =
0
;
+ card->ac97_codec[num_ac97] =
NULL
;
break;
}
CS_DBGOUT(CS_FUNCTION | CS_INIT, 2, printk(KERN_INFO
break;
}
CS_DBGOUT(CS_FUNCTION | CS_INIT, 2, printk(KERN_INFO
@@
-4297,9
+4265,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
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)num_ac97,
-
(unsigned int)
codec));
+ codec));
/* if there is no secondary codec at all, don't probe any more */
if (!ready_2nd)
{
/* if there is no secondary codec at all, don't probe any more */
if (!ready_2nd)
{
@@
-4319,7
+4287,7
@@
static int __init cs_ac97_init(struct cs_card *card)
static void cs461x_download_image(struct cs_card *card)
{
unsigned i, j, temp1, temp2, offset, count;
static void cs461x_download_image(struct cs_card *card)
{
unsigned i, j, temp1, temp2, offset, count;
- unsigned char *pBA1 = ioremap(card->ba1_addr, 0x40000);
+ unsigned char
__iomem
*pBA1 = ioremap(card->ba1_addr, 0x40000);
for( i=0; i < CLEAR__COUNT; i++)
{
offset = ClrStat[i].BA1__DestByteOffset;
for( i=0; i < CLEAR__COUNT; i++)
{
offset = ClrStat[i].BA1__DestByteOffset;
@@
-5489,13
+5457,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
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
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 ||
if(card->ba0 == 0 || card->ba1.name.data0 == 0 ||
card->ba1.name.data1 == 0 || card->ba1.name.pmem == 0 ||
@@
-5566,20
+5534,20
@@
static int __devinit cs46xx_probe(struct pci_dev *pci_dev,
if (pmdev)
{
CS_DBGOUT(CS_INIT | CS_PM, 4, printk(KERN_INFO
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
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;
}
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"));
CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO
"cs46xx: probe()- device allocated successfully\n"));
@@
-5729,7
+5697,7
@@
static struct pci_device_id cs46xx_pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, cs46xx_pci_tbl);
MODULE_DEVICE_TABLE(pci, cs46xx_pci_tbl);
-struct pci_driver cs46xx_pci_driver = {
+st
atic st
ruct pci_driver cs46xx_pci_driver = {
.name = "cs46xx",
.id_table = cs46xx_pci_tbl,
.probe = cs46xx_probe,
.name = "cs46xx",
.id_table = cs46xx_pci_tbl,
.probe = cs46xx_probe,
@@
-5738,7
+5706,7
@@
struct pci_driver cs46xx_pci_driver = {
.resume = CS46XX_RESUME_TBL,
};
.resume = CS46XX_RESUME_TBL,
};
-int __init cs46xx_init_module(void)
+
static
int __init cs46xx_init_module(void)
{
int rtn = 0;
CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO
{
int rtn = 0;
CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO
@@
-5756,7
+5724,7
@@
int __init cs46xx_init_module(void)
return rtn;
}
return rtn;
}
-void __exit cs46xx_cleanup_module(void)
+
static
void __exit cs46xx_cleanup_module(void)
{
pci_unregister_driver(&cs46xx_pci_driver);
cs_pm_unregister_all(cs46xx_pm_callback);
{
pci_unregister_driver(&cs46xx_pci_driver);
cs_pm_unregister_all(cs46xx_pm_callback);
@@
-5767,13
+5735,14
@@
void __exit cs46xx_cleanup_module(void)
module_init(cs46xx_init_module);
module_exit(cs46xx_cleanup_module);
module_init(cs46xx_init_module);
module_exit(cs46xx_cleanup_module);
-int cs46xx_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
+#ifndef CS46XX_ACPI_SUPPORT
+static 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
{
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) {
card = (struct cs_card *) dev->data;
if (card) {
switch(rqst) {
@@
-5802,6
+5771,7
@@
int cs46xx_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
return 0;
}
return 0;
}
+#endif
#if CS46XX_ACPI_SUPPORT
static int cs46xx_suspend_tbl(struct pci_dev *pcidev, u32 state)
#if CS46XX_ACPI_SUPPORT
static int cs46xx_suspend_tbl(struct pci_dev *pcidev, u32 state)