diff options
| author | Roland Dreier | 2005-07-28 04:12:56 +0200 |
|---|---|---|
| committer | Roland Dreier | 2005-07-28 04:12:56 +0200 |
| commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
| tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /sound/pci/nm256/nm256.c | |
| parent | [IB/mthca]: Use io_remap_pfn_range for PCI space (diff) | |
| parent | [PATCH] new alpha syscalls (diff) | |
| download | kernel-qcow2-linux-2868bd281fef21d1e73d6b7648a41efc3d75f10c.tar.gz kernel-qcow2-linux-2868bd281fef21d1e73d6b7648a41efc3d75f10c.tar.xz kernel-qcow2-linux-2868bd281fef21d1e73d6b7648a41efc3d75f10c.zip | |
Merge /scratch/Ksrc/linux-git/
Diffstat (limited to 'sound/pci/nm256/nm256.c')
| -rw-r--r-- | sound/pci/nm256/nm256.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index 8a52091f8552..7eb20b8f89f6 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c @@ -285,43 +285,43 @@ MODULE_DEVICE_TABLE(pci, snd_nm256_ids); * lowlvel stuffs */ -inline static u8 +static inline u8 snd_nm256_readb(nm256_t *chip, int offset) { return readb(chip->cport + offset); } -inline static u16 +static inline u16 snd_nm256_readw(nm256_t *chip, int offset) { return readw(chip->cport + offset); } -inline static u32 +static inline u32 snd_nm256_readl(nm256_t *chip, int offset) { return readl(chip->cport + offset); } -inline static void +static inline void snd_nm256_writeb(nm256_t *chip, int offset, u8 val) { writeb(val, chip->cport + offset); } -inline static void +static inline void snd_nm256_writew(nm256_t *chip, int offset, u16 val) { writew(val, chip->cport + offset); } -inline static void +static inline void snd_nm256_writel(nm256_t *chip, int offset, u32 val) { writel(val, chip->cport + offset); } -inline static void +static inline void snd_nm256_write_buffer(nm256_t *chip, void *src, int offset, int size) { offset -= chip->buffer_start; @@ -926,7 +926,7 @@ snd_nm256_init_chip(nm256_t *chip) } -inline static void +static inline void snd_nm256_intr_check(nm256_t *chip) { if (chip->badintrcount++ > 1000) { |