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
This commit was generated by cvs2svn to compensate for changes in r632,
[linux-2.6.git]
/
sound
/
oss
/
ymfpci.c
diff --git
a/sound/oss/ymfpci.c
b/sound/oss/ymfpci.c
index
7b3236f
..
3bbe819
100644
(file)
--- a/
sound/oss/ymfpci.c
+++ b/
sound/oss/ymfpci.c
@@
-99,7
+99,7
@@
static void ymfpci_disable_dsp(ymfpci_t *unit);
static void ymfpci_download_image(ymfpci_t *codec);
static void ymf_memload(ymfpci_t *unit);
static void ymfpci_download_image(ymfpci_t *codec);
static void ymf_memload(ymfpci_t *unit);
-static
spinlock_t ymf_devs_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(ymf_devs_lock)
;
static LIST_HEAD(ymf_devs);
/*
static LIST_HEAD(ymf_devs);
/*
@@
-124,11
+124,6
@@
MODULE_DEVICE_TABLE(pci, ymf_id_tbl);
* common I/O routines
*/
* 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);
static inline void ymfpci_writeb(ymfpci_t *codec, u32 offset, u8 val)
{
writeb(val, codec->reg_area_virt + offset);
@@
-334,7
+329,7
@@
static int alloc_dmabuf(ymfpci_t *unit, struct ymf_dmabuf *dmabuf)
dmabuf->dma_addr = dma_addr;
dmabuf->buforder = order;
dmabuf->dma_addr = dma_addr;
dmabuf->buforder = order;
- /* now mark the pages as reserved; otherwise remap_p
age
_range doesn't do what we want */
+ /* now mark the pages as reserved; otherwise remap_p
fn
_range doesn't do what we want */
mapend = virt_to_page(rawbuf + (PAGE_SIZE << order) - 1);
for (map = virt_to_page(rawbuf); map <= mapend; map++)
set_bit(PG_reserved, &map->flags);
mapend = virt_to_page(rawbuf + (PAGE_SIZE << order) - 1);
for (map = virt_to_page(rawbuf); map <= mapend; map++)
set_bit(PG_reserved, &map->flags);
@@
-1231,8
+1226,6
@@
ymf_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
unsigned int swptr;
int cnt; /* This many to go in this revolution */
unsigned int swptr;
int cnt; /* This many to go in this revolution */
- if (ppos != &file->f_pos)
- return -ESPIPE;
if (dmabuf->mapped)
return -ENXIO;
if (!dmabuf->ready && (ret = prog_dmabuf(state, 1)))
if (dmabuf->mapped)
return -ENXIO;
if (!dmabuf->ready && (ret = prog_dmabuf(state, 1)))
@@
-1350,8
+1343,6
@@
ymf_write(struct file *file, const char __user *buffer, size_t count, loff_t *pp
YMFDBGW("ymf_write: count %d\n", count);
YMFDBGW("ymf_write: count %d\n", count);
- if (ppos != &file->f_pos)
- return -ESPIPE;
if (dmabuf->mapped)
return -ENXIO;
if (!dmabuf->ready && (ret = prog_dmabuf(state, 0)))
if (dmabuf->mapped)
return -ENXIO;
if (!dmabuf->ready && (ret = prog_dmabuf(state, 0)))
@@
-1549,7
+1540,8
@@
static int ymf_mmap(struct file *file, struct vm_area_struct *vma)
size = vma->vm_end - vma->vm_start;
if (size > (PAGE_SIZE << dmabuf->buforder))
return -EINVAL;
size = vma->vm_end - vma->vm_start;
if (size > (PAGE_SIZE << dmabuf->buforder))
return -EINVAL;
- 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))
return -EAGAIN;
dmabuf->mapped = 1;
size, vma->vm_page_prot))
return -EAGAIN;
dmabuf->mapped = 1;
@@
-1965,7
+1957,7
@@
static int ymf_open(struct inode *inode, struct file *file)
#endif
up(&unit->open_sem);
#endif
up(&unit->open_sem);
- return
0
;
+ return
nonseekable_open(inode, file)
;
out_nodma:
/*
out_nodma:
/*
@@
-2043,7
+2035,7
@@
static int ymf_open_mixdev(struct inode *inode, struct file *file)
match:
file->private_data = unit->ac97_codec[i];
match:
file->private_data = unit->ac97_codec[i];
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int ymf_ioctl_mixdev(struct inode *inode, struct file *file,
}
static int ymf_ioctl_mixdev(struct inode *inode, struct file *file,
@@
-2365,7
+2357,8
@@
static int ymfpci_memalloc(ymfpci_t *codec)
codec->dma_area_ba = pba;
codec->dma_area_size = size + 0xff;
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;
}
ptr += 0x100 - off;
pba += 0x100 - off;
}
@@
-2506,8
+2499,8
@@
static int ymf_ac97_init(ymfpci_t *unit, int num_ac97)
# ifdef MODULE
static int mpu_io;
static int synth_io;
# ifdef MODULE
static int mpu_io;
static int synth_io;
-
MODULE_PARM(mpu_io, "i"
);
-
MODULE_PARM(synth_io, "i"
);
+
module_param(mpu_io, int, 0
);
+
module_param(synth_io, int, 0
);
# else
static int mpu_io = 0x330;
static int synth_io = 0x388;
# else
static int mpu_io = 0x330;
static int synth_io = 0x388;