summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ALSA: hda - Remove superfluous inclusion of linux/pci.hTakashi Iwai2014-02-158-8/+0
| | | | | | Some codec drivers still have it since using PCI_VENDOR_ID_*. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: hda/realtek - Allow NULL bus->pciTakashi Iwai2014-02-151-4/+11
| | | | | | | | | Realtek codec driver contains some codes referring to the PCI subdevice IDs, but most of them are optional, typically for checking the codec name variants. Add NULL checks appropriately so that it can work without PCI assignment. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: hda - Remove dependency on bus->pci in hda_beep.cTakashi Iwai2014-02-151-2/+1
| | | | | | | | The default parent device can be obtained directly via card object, so we don't need to rely on pci->dev.parent. Since there is no access to pci_dev, we can reduce the inclusion of linux/pci.h, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: ak4117: Do not free priv until timer handler hasn't actually stopped ↵Kirill Tkhai2014-02-141-1/+1
| | | | | | | | | | | | | | | using it Function del_timer() does not guarantee that timer was really deleted. If the timer handler is beeing executed at the moment, the function does nothing. So, it's possible to use already freed memory in the handler: [ref: Documentation/DocBook/kernel-locking.tmpl] This was found using grep and compile-tested only. Signed-off-by: Kirill Tkhai <ktkhai@parallels.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: Drop __bitwise and typedefs for snd_device attributesTakashi Iwai2014-02-144-36/+39
| | | | | | | | Using __bitwise and typedefs for the attributes of snd_device struct isn't so useful, and rather it worsens the readability. Let's drop them and use the straightforward enum. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: i2c/ak413x: Use SNDRV_DEV_CODEC for ak413x codec objectsTakashi Iwai2014-02-142-2/+2
| | | | | | | ... instead of SNDRV_DEV_LOWLEVEL. No functional change at this point. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: aoa: Use SNDRV_DEV_CODEC for AOA codec objectsTakashi Iwai2014-02-143-3/+3
| | | | | | | ... instead of SNDRV_DEV_LOWLEVEL. No functional change at this point. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: usb-audio: Use SNDRV_DEV_CODEC for mixer objectsTakashi Iwai2014-02-141-1/+1
| | | | | | | | Instead of SNDRV_DEV_LOWLEVEL, use SNDRV_DEV_CODEC type for mixer objects so that they are managed in a proper release order. No functional change at this point. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: seq_oss: Use standard printk helpersTakashi Iwai2014-02-145-18/+18
| | | | | | Use the standard pr_xxx() helpers instead of home-baked snd_print*(). Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: seq: Use standard printk helpersTakashi Iwai2014-02-1413-47/+47
| | | | | | Use the standard pr_xxx() helpers instead of home-baked snd_print*(). Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: timer: Use standard printk helpersTakashi Iwai2014-02-143-11/+8
| | | | | | Use the standard pr_xxx() helpers instead of home-baked snd_print*(). Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: oss: Use standard printk helpersTakashi Iwai2014-02-142-56/+55
| | | | | | | Use dev_err() & co as much as possible. If not available (no device assigned at the calling point), use pr_xxx() helpers instead. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: hwdep: Use standard printk helpersTakashi Iwai2014-02-141-8/+12
| | | | | | | Use dev_err() & co as much as possible. If not available (no device assigned at the calling point), use pr_xxx() helpers instead. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: rawmidi: Use standard printk helpersTakashi Iwai2014-02-141-15/+34
| | | | | | | Use dev_err() & co as much as possible. If not available (no device assigned at the calling point), use pr_xxx() helpers instead. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: core: Use standard printk helpersTakashi Iwai2014-02-148-32/+38
| | | | | | | Use dev_err() & co as much as possible. If not available (no device assigned at the calling point), use pr_xxx() helpers instead. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: pcm: Use standard printk helpersTakashi Iwai2014-02-145-43/+55
| | | | | | | | | Use dev_err() & co as much as possible. If not available (no device assigned at the calling point), use pr_xxx() helpers instead. For simplicity, introduce new helpers for pcm stream, pcm_err(), etc. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: control: Use standard printk helpersTakashi Iwai2014-02-142-9/+8
| | | | | | | Use dev_err() & co as much as possible. If not available (no device assigned at the calling point), use pr_xxx() helpers instead. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: seq_oss: Drop debug printsTakashi Iwai2014-02-147-68/+0
| | | | | | | The debug prints in snd-seq-oss module are rather useless. Let's clean up before further modifications. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: Use standard device refcount for card accountingTakashi Iwai2014-02-144-44/+20
| | | | | | | | | Drop the own refcount but use the standard device refcounting via get_device() and put_device(). Introduce a new completion to snd_card instead of the wait queue for syncing the last release, which is used in snd_card_free(). Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: Use static groups for id and number card sysfs attr filesTakashi Iwai2014-02-141-13/+19
| | | | | | | ... instead of calling device_create_file() manually. No functional change. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: Embed card device into struct snd_cardTakashi Iwai2014-02-142-23/+41
| | | | | | | | | | | | | | | | As prepared in the previous patch, we are ready to create a device struct for the card object in snd_card_create() now. This patch changes the scheme from the old style to: - embed a device struct for the card object into snd_card struct, - initialize the card device in snd_card_create() (but not register), - registration is done in snd_card_register() via device_add() The actual card device is stored in card->card_dev. The card->dev pointer is kept unchanged and pointing to the parent device as before for compatibility reason. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* usb: gadget: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-142-7/+4
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* staging/media: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-142-6/+5
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* staging/line6: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-143-6/+3
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* thinkpad_acpi: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-141-3/+3
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* [media] Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-1411-36/+29
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* HID: prodikeys: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-141-3/+2
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ASoC: core: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-141-2/+1
| | | | | | | Also remove superfluous card->dev assignment. Reviewed-by: Mark Brown <broonie@linaro.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: spi: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-141-4/+2
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: sparc: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-143-9/+10
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: sh: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-142-4/+3
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: ppc: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-143-8/+5
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: pcmcia: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-142-5/+4
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: parisc: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-141-3/+1
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: mips: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-143-6/+4
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: au1x00: convert to platform deviceManuel Lauss2014-02-141-98/+141
| | | | | | | | | | Make sound/mips/au1x00.c a proper platform_driver. [minor coding style fixes, cleanup and forward-ported by tiwai] Cc: Charles Eidsness <charles@cooper-street.com> Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: atmel: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-142-16/+7
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: arm: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-142-8/+4
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: firewire: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-144-8/+8
| | | | | | | Also remove superfluous snd_card_set_dev() calls. Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: usb: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-127-29/+31
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: pci: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-1256-156/+98
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: isa: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-1226-136/+96
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: drivers: Convert to snd_card_new() with a device pointerTakashi Iwai2014-02-1210-33/+23
| | | | | | Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: Mandate to pass a device pointer at card creation timeTakashi Iwai2014-02-123-51/+42
| | | | | | | | | | | | | | | | | | | | This is a part of preliminary works for modernizing the ALSA device structure. So far, we set card->dev at later point after the object creation. Because of this, the core layer doesn't always know which device is being handled before it's actually registered, and it makes impossible to show the device in error messages, for example. The first goal is to achieve a proper struct device initialization at the very beginning of probing. As a first step, this patch introduces snd_card_new() function (yes there was the same named function in the very past), in order to receive the parent device pointer from the very beginning. snd_card_create() is marked as deprecated. At this point, there is no functional change other than that. The actual change of the device creation scheme will follow later. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* ALSA: Drop unused name argument in snd_register_oss_device()Takashi Iwai2014-02-1210-25/+12
| | | | | | | The last argument, name, of snd_oss_register_device() is nowhere referred in the function in the current code. Let's drop it. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* Merge branch 'for-linus' into for-nextTakashi Iwai2014-02-129-37/+89
|\
| * ALSA: hda - Fix undefined symbol due to builtin/module mixupTakashi Iwai2014-02-101-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even after the fix for leftover kconfig handling (commit f8f1becf), the current code still doesn't handle properly the builtin/module mixup case between the core snd-hda-codec and other codec drivers. For example, when CONFIG_SND_HDA_INTEL=y and CONFIG_SND_HDA_CODEC_HDMI=m, it'll end up with an unresolved symbol snd_hda_parse_hdmi_codec. This patch fixes the issue. Now codec->parser points to the parser object *only* when a module (either generic or HDMI parser) is loaded and bound. When a builtin symbol is used, codec->parser still points to NULL. This is the difference from the previous versions. Fixes: f8f1becfa4ac ('ALSA: hda - Fix leftover ifdef checks after modularization') Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Fix mic capture on Sony VAIO Pro 11Takashi Iwai2014-02-071-0/+1
| | | | | | | | | | | | | | | | | | The very same fixup is needed to make the mic on Sony VAIO Pro 11 working as well as VAIO Pro 13 model. Reported-and-tested-by: Hendrik-Jan Heins <hjheins@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Add a headset quirk for Dell XPS 13David Henningsson2014-02-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | This quirk is needed for the headset microphone to work. Alsa-info at http://www.alsa-project.org/db/?f=8c7dfe857ceff462ca2de133e67023c0f68de9cb Cc: stable@vger.kernel.org (3.10+) Reported-by: Po-Hsu Lin <po-hsu.lin@canonical.com> Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Fix inconsistent Mic mute LEDTakashi Iwai2014-02-076-18/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current code for controlling mic mute LED in patch_sigmatel.c blindly assumes that there is a single capture switch. But, there can be multiple multiple ones, and each of them flips the state, ended up in an inconsistent state. For fixing this problem, this patch adds kcontrol to be passed to the hook function so that the callee can check which switch is being accessed. In stac_capture_led_hook(), the state is checked as a bitmask, and turns on the LED when all capture switches are off. Signed-off-by: Takashi Iwai <tiwai@suse.de>