path: root/sound/sh
AgeCommit message (Collapse)AuthorFilesLines
2014-02-14ALSA: sh: Convert to snd_card_new() with a device pointerTakashi Iwai2-4/+3
Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <>
2013-05-23ALSA: sh_dac_audio: Remove redundant platform_set_drvdata()Sachin Kamat1-2/+0
Commit 0998d06310 (device-core: Ensure drvdata = NULL when no driver is bound) removes the need to set driver data field to NULL. Signed-off-by: Sachin Kamat <> Cc: Rafael Ignacio Zurita <> Signed-off-by: Takashi Iwai <>
2013-05-23ALSA: sh: aica: Remove redundant platform_set_drvdata()Sachin Kamat1-1/+0
Commit 0998d06310 (device-core: Ensure drvdata = NULL when no driver is bound) removes the need to set driver data field to NULL. Signed-off-by: Sachin Kamat <> Cc: Adrian McMenamin <> Signed-off-by: Takashi Iwai <>
2012-12-07ALSA: sh: remove __dev* attributesBill Pemberton2-12/+11
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <> Signed-off-by: Takashi Iwai <>
2012-07-02ALSA: Add missing .owner=THIS_MODULE to platform_driver definitionsTakashi Iwai2-1/+4
Signed-off-by: Takashi Iwai <>
2012-05-21ALSA: sh: Fix up namespace collision in sh_dac_audio.Paul Mundt1-2/+2
The module_platform_driver() conversion ended up tripping over the driver name, leading to confusion in the macro with regards to 'driver' being redefined. rename it to something slightly more suitable to avoid namespace collisions. sound/sh/sh_dac_audio.c:444:122: error: conflicting types for 'driver_init' include/linux/device.h:773:6: note: previous declaration of 'driver_init' was here make[3]: *** [sound/sh/sh_dac_audio.o] Error 1 Signed-off-by: Paul Mundt <> Signed-off-by: Takashi Iwai <>
2011-12-19ALSA: module_param: make bool parameters really boolRusty Russell1-1/+1
module_param(bool) used to counter-intuitively take an int. In fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy trick. It's time to remove the int/unsigned int option. For this version it'll simply give a warning, but it'll break next kernel version. Signed-off-by: Rusty Russell <> Signed-off-by: Takashi Iwai <>
2011-11-27ALSA: convert sound/* to use module_platform_driver()Axel Lin1-12/+1
This patch converts the drivers in sound/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler. Signed-off-by: Axel Lin <> Signed-off-by: Takashi Iwai <>
2011-10-31sound: Add module.h to the previously silent sound usersPaul Gortmaker1-0/+1
Lots of sound drivers were getting module.h via the implicit presence of it in <linux/device.h> but we are going to clean that up. So fix up those users now. Signed-off-by: Paul Gortmaker <>
2011-10-31sound: fix drivers needing module.h not moduleparam.hPaul Gortmaker1-1/+1
The implicit presence of module.h lured several users into incorrectly thinking that they only needed/used modparam.h but once we clean up the module.h presence, these will show up as build failures, so fix 'em now. Signed-off-by: Paul Gortmaker <>
2010-10-27sound: sh: ctrl_in/outX to __raw_read/writeX conversion.Paul Mundt1-1/+1
The ctrl_xxx routines are deprecated, switch over to the __raw_xxx versions. Signed-off-by: Paul Mundt <>
2010-03-30include cleanup: Update gfp.h and slab.h includes to prepare for breaking ↵Tejun Heo1-0/+1
implicit slab.h inclusion from percpu.h percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <> Guess-its-ok-by: Christoph Lameter <> Cc: Ingo Molnar <> Cc: Lee Schermerhorn <>
2009-12-01Merge branch 'topic/beep-rename' into topic/core-changeTakashi Iwai3-0/+463
2009-11-08ALSA: snd-aica: declare MODULE_FIRMWAREBen Hutchings1-0/+1
Signed-off-by: Ben Hutchings <> Signed-off-by: Takashi Iwai <>
2009-11-04ALSA: sh: add SuperH DAC audio driver for ALSA V4Rafael Ignacio Zurita3-0/+463
This is a port of the sound/oss/sh_dac_audio.c driver. The driver uses an on-chip 8-bit D/A converter, which has a speaker connected to one of its channels, found in several ancient HP machines. For interrupts it uses a high-resolution timer (hrtimer). Tested on SH7709 based hp6xx (HP Jornada 680/690 and HP Palmtop 620lx/660lx). Also, since OSS Emulation works, the old OSS sound/oss/sh_dac_audio.c driver would be obsolete soon, and it could be removed. Signed-off-by: Rafael Ignacio Zurita <> Acked-by: Paul Mundt <> Signed-off-by: Takashi Iwai <>
2009-03-30trivial: Fix misspelling of firmwareNick Andrew1-1/+1
Fix misspelling of firmware. Signed-off-by: Nick Andrew <> Signed-off-by: Jiri Kosina <>
2009-03-26Merge git:// Torvalds1-0/+1
* git:// (96 commits) sh: add support for SMSC Polaris platform sh: fix the HD64461 level-triggered interrupts handling sh: sh-rtc wakeup support sh: sh-rtc invalid time rework sh: sh-rtc carry interrupt rework sh: disallow kexec virtual entry sh: kexec jump: fix for ftrace. sh: kexec: Drop SR.BL bit toggling. sh: add kexec jump support sh: rework kexec segment code sh: simplify kexec vbr code sh: Flush only the needed range when unmapping a VMA. sh: Update debugfs ASID dumping for 16-bit ASID support. sh: tlb-pteaex: Kill off legacy PTEA updates. sh: Support for extended ASIDs on PTEAEX-capable SH-X3 cores. sh: sh7763rdp: Change IRQ number for sh_eth of sh7763rdp sh: espt-giga board support sh: dma: Make G2 DMA configurable. sh: dma: Make PVR2 DMA configurable. sh: Move IRQ multi definition of DMAC to defconfig ...
2009-03-17sh: dma: Make G2 DMA configurable.Paul Mundt1-0/+1
Follow the PVR2 DMAC change for G2 DMA. Signed-off-by: Paul Mundt <>
2009-01-12ALSA: Convert to snd_card_create() in other sound/*Takashi Iwai1-4/+4
Convert from snd_card_new() to the new snd_card_create() function in other sound subdirectories. Signed-off-by: Takashi Iwai <>
2008-09-23ALSA: Fix section for snd-aica platform driverUwe Kleine-König1-3/+3
Don't use __init but __devinit to define probe function. A pointer to snd_aica_probe is passed to the core via platform_driver_register and so the function must not disappear after the module is loaded. Using __init and having HOTPLUG=y and SND_AICA=m the following probably oopses: echo -n AICA > /sys/bus/platform/driver/AICA/unbind echo -n AICA > /sys/bus/platform/driver/AICA/bind Strange enough add_aicamixer_controls which is only called by snd_aica_probe was already using __devinit. While at it move the remove function to .devexit.text section. Signed-off-by: Uwe Kleine-König <> Cc: Adrian McMenamin <> Cc: Paul Mundt <> Cc: Jaroslav Kysela <> Cc: Andrew Morton <> Signed-off-by: Takashi Iwai <> Signed-off-by: Jaroslav Kysela <>
2008-08-13ALSA: Kill snd_assert() in other placesTakashi Iwai1-1/+2
Kill snd_assert() in other places, either removed or replaced with if () with snd_BUG_ON(). Signed-off-by: Takashi Iwai <> Signed-off-by: Jaroslav Kysela <>
2008-07-29sh: migrate to arch/sh/include/Paul Mundt1-1/+1
This follows the sparc changes a439fe51a1f8eb087c22dd24d69cebae4a3addac. Most of the moving about was done with Sam's directions at: with subsequent hacking and fixups entirely my fault. Signed-off-by: Sam Ravnborg <> Signed-off-by: Paul Mundt <>
2008-05-27sound: Convert to menuconfigTakashi Iwai1-4/+12
Convert menu in sound Kconfig files to menuconfig and if. Signed-off-by: Takashi Iwai <>
2008-04-29Remove duplicated unlikely() in IS_ERR()Hirofumi Nakagawa1-1/+1
Some drivers have duplicated unlikely() macros. IS_ERR() already has unlikely() in itself. This patch cleans up such pointless code. Signed-off-by: Hirofumi Nakagawa <> Acked-by: David S. Miller <> Acked-by: Jeff Garzik <> Cc: Paul Clements <> Cc: Richard Purdie <> Cc: Alessandro Zummo <> Cc: David Brownell <> Cc: James Bottomley <> Cc: Michael Halcrow <> Cc: Anton Altaparmakov <> Cc: Al Viro <> Cc: Carsten Otte <> Cc: Patrick McHardy <> Cc: Paul Mundt <> Cc: Jaroslav Kysela <> Cc: Takashi Iwai <> Acked-by: Mike Frysinger <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
2008-01-31[ALSA] Remove sound/driver.hTakashi Iwai1-1/+0
This header file exists only for some hacks to adapt alsa-driver tree. It's useless for building in the kernel. Let's move a few lines in it to sound/core.h and remove it. With this patch, sound/driver.h isn't removed but has just a single compile warning to include it. This should be really killed in future. Signed-off-by: Takashi Iwai <> Signed-off-by: Jaroslav Kysela <>
2008-01-31[ALSA] Check value range in ctl callbacksTakashi Iwai1-2/+5
Check the value ranges in ctl put callbacks properly (in the rest drivers). Signed-off-by: Takashi Iwai <> Signed-off-by: Jaroslav Kysela <>
2008-01-31[ALSA] Dreamcast AICA sound - Get rid of annoying compiler warningTakashi Iwai1-0/+1
This patch supresses an annoying compiler warning that the variable err may be used uninitialised. Signed-off by: Adrian McMenamin <> Signed-off-by: Takashi Iwai <> Signed-off-by: Jaroslav Kysela <>
2007-10-23[ALSA] protect Dreamcast PCM driver (AICA) from G2 bus effectsAdrian McMenamin1-2/+29
The G2 bus on the SEGA Dreamcast connects both the maple peripheral bus and the AICA sound memory. DMA requests on one can cause the other to timeout on memory operations. This patch prevents maple interrupts from causing hiccoughs in the AICA sound (maple bus code will land in 2.6.24). There are other cleanups for this (AICA) code - but this is in effect a regression fix rather than a cleanup. Signed-off-by: Adrian McMenamin <> Signed-off-by: Takashi Iwai <> Signed-off-by: Jaroslav Kysela <>
2007-10-16[ALSA] Clean up with common snd_ctl_boolean_*_info callbacksTakashi Iwai1-9/+1
Clean up codes using the new common snd_ctl_boolean_*_info() callbacks. Signed-off-by: Takashi Iwai <> Signed-off-by: Jaroslav Kysela <>
2007-07-24sh: Fix Dreamcast DMA issues.Adrian McMenamin1-1/+1
The current SH DMA API is somewhat broken, not correctly matching virtual channel to the correct SH DMAC. This wasn't noticeable when using g2 DMA for the sound driver - one channel 0 is as good as any other! - but caused the pvr2 driver to fail. This patch fixes the pvr2 problem and consequently fixes the sound driver to ensure it continues to function. Signed-off by: Adrian McMenamin <> Signed-off-by: Paul Mundt <>
2007-07-20[ALSA] aica - fix behaviour in poor resource conditionsTakashi Iwai2-46/+37
Fix behaviour in poor resource conditions. With this new patch, tidied with indent and with SNDRV_PCM_TRIGGER_STOP being used. Signed-off by: Adrian McMenamin <> Signed-off-by: Takashi Iwai <> Signed-off-by: Jaroslav Kysela <>
2007-07-20[ALSA] Add ALSA support for the SEGA Dreamcast PCM deviceAdrian McMenamin4-0/+777
ALSA support for the SEGA Dreamcast Yamaha AICA sound device (pcm) This patch adds ALSA sound support for pcm playback on two channels on the SEGA Dreamcast built-in sound device (the Yamaha AICA) Add driver for the AICA sound device built into the SEGA Dreamcast Hook it all up with the build system. Signed-off-by: Adrian McMenamin <> Signed-off-by: Takashi Iwai <> Signed-off-by: Jaroslav Kysela <>