April 2013 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 1/4] ASoC: imx-sgtl5000: Do not enter the error path on success
by Fabio Estevam 19 Apr '13

19 Apr '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> Return on success instead of entering the error path. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/fsl/imx-sgtl5000.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index 9584e78..88fc02c 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c @@ -174,6 +174,9 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, data); + + return 0; + clk_fail: clk_put(data->codec_clk); fail: -- 1.7.9.5

2 10

Re: [alsa-devel] [PATCH 26/28] proc: Supply a function to remove a proc entry by PDE [RFC]
by Bjorn Helgaas 18 Apr '13

18 Apr '13

On Tue, Apr 16, 2013 at 12:27 PM, David Howells <dhowells(a)redhat.com> wrote: > Supply a function (proc_remove()) to remove a proc entry (and any subtree > rooted there) by proc_dir_entry pointer rather than by name and (optionally) > root dir entry pointer. This allows us to eliminate all remaining pde->name > accesses outside of procfs. > > Signed-off-by: David Howells <dhowells(a)redhat.com> > cc: linux-acpi(a)vger.kernel.org > cc: openipmi-developer(a)lists.sourceforge.net > cc: devicetree-discuss(a)lists.ozlabs.org > cc: linux-pci(a)vger.kernel.org > cc: netdev(a)vger.kernel.org > cc: netfilter-devel(a)vger.kernel.org > cc: alsa-devel(a)alsa-project.org > --- > > drivers/acpi/sbs.c | 21 ++++----------------- > drivers/char/ipmi/ipmi_msghandler.c | 2 +- > drivers/misc/sgi-gru/gruprocfs.c | 2 +- > drivers/of/base.c | 11 +---------- > drivers/pci/proc.c | 12 +++--------- For the drivers/pci part: Acked-by: Bjorn Helgaas <bhelgaas(a)google.com> I assume you'll merge this via something other than my tree. > fs/proc/generic.c | 7 +++++++ > fs/proc/vmcore.c | 2 +- > include/linux/proc_fs.h | 2 ++ > kernel/irq/proc.c | 6 +----- > net/8021q/vlanproc.c | 9 ++------- > net/core/pktgen.c | 6 ++---- > net/ipv4/netfilter/ipt_CLUSTERIP.c | 4 ++-- > net/ipv6/proc.c | 3 +-- > net/netfilter/xt_hashlimit.c | 4 ++-- > sound/core/info.c | 19 +++++-------------- > 15 files changed, 35 insertions(+), 75 deletions(-) > > diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c > index a296e08..b6241ee 100644 > --- a/drivers/acpi/sbs.c > +++ b/drivers/acpi/sbs.c > @@ -521,19 +521,6 @@ acpi_sbs_add_fs(struct proc_dir_entry **dir, > return 0; > } > > -static void > -acpi_sbs_remove_fs(struct proc_dir_entry **dir, > - struct proc_dir_entry *parent_dir) > -{ > - if (*dir) { > - remove_proc_entry(ACPI_SBS_FILE_INFO, *dir); > - remove_proc_entry(ACPI_SBS_FILE_STATE, *dir); > - remove_proc_entry(ACPI_SBS_FILE_ALARM, *dir); > - remove_proc_entry((*dir)->name, parent_dir); > - *dir = NULL; > - } > -} > - > /* Smart Battery Interface */ > static struct proc_dir_entry *acpi_battery_dir = NULL; > > @@ -836,8 +823,8 @@ static void acpi_battery_remove(struct acpi_sbs *sbs, int id) > power_supply_unregister(&battery->bat); > } > #ifdef CONFIG_ACPI_PROCFS_POWER > - if (battery->proc_entry) > - acpi_sbs_remove_fs(&battery->proc_entry, acpi_battery_dir); > + proc_remove(battery->proc_entry); > + battery->proc_entry = NULL; > #endif > } > > @@ -873,8 +860,8 @@ static void acpi_charger_remove(struct acpi_sbs *sbs) > if (sbs->charger.dev) > power_supply_unregister(&sbs->charger); > #ifdef CONFIG_ACPI_PROCFS_POWER > - if (sbs->charger_entry) > - acpi_sbs_remove_fs(&sbs->charger_entry, acpi_ac_dir); > + proc_remove(sbs->charger_entry); > + sbs->charger_entry = NULL; > #endif > } > > diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c > index 1420bbb..4d439d2 100644 > --- a/drivers/char/ipmi/ipmi_msghandler.c > +++ b/drivers/char/ipmi/ipmi_msghandler.c > @@ -4541,7 +4541,7 @@ static void __exit cleanup_ipmi(void) > del_timer_sync(&ipmi_timer); > > #ifdef CONFIG_PROC_FS > - remove_proc_entry(proc_ipmi_root->name, NULL); > + proc_remove(proc_ipmi_root); > #endif /* CONFIG_PROC_FS */ > > driver_unregister(&ipmidriver.driver); > diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c > index 950dbe9..797d796 100644 > --- a/drivers/misc/sgi-gru/gruprocfs.c > +++ b/drivers/misc/sgi-gru/gruprocfs.c > @@ -355,7 +355,7 @@ static void delete_proc_files(void) > for (p = proc_files; p->name; p++) > if (p->entry) > remove_proc_entry(p->name, proc_gru); > - remove_proc_entry("gru", proc_gru->parent); > + proc_remove(proc_gru); > } > } > > diff --git a/drivers/of/base.c b/drivers/of/base.c > index 321d3ef..9c70436 100644 > --- a/drivers/of/base.c > +++ b/drivers/of/base.c > @@ -1452,16 +1452,7 @@ int of_attach_node(struct device_node *np) > #ifdef CONFIG_PROC_DEVICETREE > static void of_remove_proc_dt_entry(struct device_node *dn) > { > - struct device_node *parent = dn->parent; > - struct property *prop = dn->properties; > - > - while (prop) { > - remove_proc_entry(prop->name, dn->pde); > - prop = prop->next; > - } > - > - if (dn->pde) > - remove_proc_entry(dn->pde->name, parent->pde); > + proc_remove(dn->pde); > } > #else > static void of_remove_proc_dt_entry(struct device_node *dn) > diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c > index 7cde7c1..0812608 100644 > --- a/drivers/pci/proc.c > +++ b/drivers/pci/proc.c > @@ -427,20 +427,14 @@ int pci_proc_attach_device(struct pci_dev *dev) > > int pci_proc_detach_device(struct pci_dev *dev) > { > - struct proc_dir_entry *e; > - > - if ((e = dev->procent)) { > - remove_proc_entry(e->name, dev->bus->procdir); > - dev->procent = NULL; > - } > + proc_remove(dev->procent); > + dev->procent = NULL; > return 0; > } > > int pci_proc_detach_bus(struct pci_bus* bus) > { > - struct proc_dir_entry *de = bus->procdir; > - if (de) > - remove_proc_entry(de->name, proc_bus_pci_dir); > + proc_remove(bus->procdir); > return 0; > } > > diff --git a/fs/proc/generic.c b/fs/proc/generic.c > index 2c6d6be..4b48033 100644 > --- a/fs/proc/generic.c > +++ b/fs/proc/generic.c > @@ -630,3 +630,10 @@ const char *get_proc_name(const struct proc_dir_entry *de) > return de->name; > } > EXPORT_SYMBOL_GPL(get_proc_name); > + > +void proc_remove(struct proc_dir_entry *de) > +{ > + if (de) > + remove_proc_subtree(de->name, de->parent); > +} > +EXPORT_SYMBOL(proc_remove); > diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c > index 38edddc..17f7e08 100644 > --- a/fs/proc/vmcore.c > +++ b/fs/proc/vmcore.c > @@ -699,7 +699,7 @@ void vmcore_cleanup(void) > struct list_head *pos, *next; > > if (proc_vmcore) { > - remove_proc_entry(proc_vmcore->name, proc_vmcore->parent); > + proc_remove(proc_vmcore); > proc_vmcore = NULL; > } > > diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h > index 7abc72a..b8949b1 100644 > --- a/include/linux/proc_fs.h > +++ b/include/linux/proc_fs.h > @@ -67,6 +67,7 @@ struct proc_dir_entry *proc_create_data(const char *name, umode_t mode, > struct proc_dir_entry *parent, > const struct file_operations *proc_fops, > void *data); > +extern void proc_remove(struct proc_dir_entry *); > extern void remove_proc_entry(const char *name, struct proc_dir_entry *parent); > extern int remove_proc_subtree(const char *name, struct proc_dir_entry *parent); > > @@ -103,6 +104,7 @@ static inline struct proc_dir_entry *proc_create_data(const char *name, > { > return NULL; > } > +static inline void proc_remove(struct proc_dir_entry *de) {} > #define remove_proc_entry(name, parent) do {} while (0) > #define remove_proc_subtree(name, parent) do {} while (0) > > diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c > index d59ae37..19ed5c4 100644 > --- a/kernel/irq/proc.c > +++ b/kernel/irq/proc.c > @@ -366,11 +366,7 @@ void unregister_irq_proc(unsigned int irq, struct irq_desc *desc) > > void unregister_handler_proc(unsigned int irq, struct irqaction *action) > { > - if (action->dir) { > - struct irq_desc *desc = irq_to_desc(irq); > - > - remove_proc_entry(action->dir->name, desc->dir); > - } > + proc_remove(action->dir); > } > > static void register_default_affinity_proc(void) > diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c > index 959ddbb..1d0e8921 100644 > --- a/net/8021q/vlanproc.c > +++ b/net/8021q/vlanproc.c > @@ -184,14 +184,9 @@ int vlan_proc_add_dev(struct net_device *vlandev) > */ > int vlan_proc_rem_dev(struct net_device *vlandev) > { > - struct vlan_net *vn = net_generic(dev_net(vlandev), vlan_net_id); > - > /** NOTE: This will consume the memory pointed to by dent, it seems. */ > - if (vlan_dev_priv(vlandev)->dent) { > - remove_proc_entry(vlan_dev_priv(vlandev)->dent->name, > - vn->proc_vlan_dir); > - vlan_dev_priv(vlandev)->dent = NULL; > - } > + proc_remove(vlan_dev_priv(vlandev)->dent); > + vlan_dev_priv(vlandev)->dent = NULL; > return 0; > } > > diff --git a/net/core/pktgen.c b/net/core/pktgen.c > index f6af4fe..6c41e97 100644 > --- a/net/core/pktgen.c > +++ b/net/core/pktgen.c > @@ -1904,7 +1904,7 @@ static void pktgen_change_name(const struct pktgen_net *pn, struct net_device *d > if (pkt_dev->odev != dev) > continue; > > - remove_proc_entry(pkt_dev->entry->name, pn->proc_dir); > + proc_remove(pkt_dev->entry); > > pkt_dev->entry = proc_create_data(dev->name, 0600, > pn->proc_dir, > @@ -3576,8 +3576,6 @@ static void _rem_dev_from_if_list(struct pktgen_thread *t, > static int pktgen_remove_device(struct pktgen_thread *t, > struct pktgen_dev *pkt_dev) > { > - struct pktgen_net *pn = t->net; > - > pr_debug("remove_device pkt_dev=%p\n", pkt_dev); > > if (pkt_dev->running) { > @@ -3597,7 +3595,7 @@ static int pktgen_remove_device(struct pktgen_thread *t, > _rem_dev_from_if_list(t, pkt_dev); > > if (pkt_dev->entry) > - remove_proc_entry(pkt_dev->entry->name, pn->proc_dir); > + proc_remove(pkt_dev->entry); > > #ifdef CONFIG_XFRM > free_SAs(pkt_dev); > diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c > index e4738fe..0b732ef 100644 > --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c > +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c > @@ -105,7 +105,7 @@ clusterip_config_entry_put(struct clusterip_config *c) > * functions are also incrementing the refcount on their own, > * so it's safe to remove the entry even if it's in use. */ > #ifdef CONFIG_PROC_FS > - remove_proc_entry(c->pde->name, c->pde->parent); > + proc_remove(c->pde); > #endif > return; > } > @@ -736,7 +736,7 @@ static void __exit clusterip_tg_exit(void) > { > pr_info("ClusterIP Version %s unloading\n", CLUSTERIP_VERSION); > #ifdef CONFIG_PROC_FS > - remove_proc_entry(clusterip_procdir->name, clusterip_procdir->parent); > + proc_remove(clusterip_procdir); > #endif > nf_unregister_hook(&cip_arp_ops); > xt_unregister_target(&clusterip_tg_reg); > diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c > index 7ea6e18..537d9ee 100644 > --- a/net/ipv6/proc.c > +++ b/net/ipv6/proc.c > @@ -287,8 +287,7 @@ int snmp6_unregister_dev(struct inet6_dev *idev) > return -ENOENT; > if (!idev->stats.proc_dir_entry) > return -EINVAL; > - remove_proc_entry(idev->stats.proc_dir_entry->name, > - net->mib.proc_net_devsnmp6); > + proc_remove(idev->stats.proc_dir_entry); > idev->stats.proc_dir_entry = NULL; > return 0; > } > diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c > index d2fd53b..40002ef 100644 > --- a/net/netfilter/xt_hashlimit.c > +++ b/net/netfilter/xt_hashlimit.c > @@ -330,7 +330,7 @@ static void htable_destroy(struct xt_hashlimit_htable *hinfo) > parent = hashlimit_net->ip6t_hashlimit; > > if(parent != NULL) > - remove_proc_entry(hinfo->pde->name, parent); > + proc_remove(hinfo->pde); > > htable_selective_cleanup(hinfo, select_all); > vfree(hinfo); > @@ -887,7 +887,7 @@ static void __net_exit hashlimit_proc_net_exit(struct net *net) > pde = hashlimit_net->ip6t_hashlimit; > > hlist_for_each_entry(hinfo, &hashlimit_net->htables, node) > - remove_proc_entry(hinfo->pde->name, pde); > + proc_remove(hinfo->pde); > > hashlimit_net->ipt_hashlimit = NULL; > hashlimit_net->ip6t_hashlimit = NULL; > diff --git a/sound/core/info.c b/sound/core/info.c > index c7f41c3..3c9bd6b 100644 > --- a/sound/core/info.c > +++ b/sound/core/info.c > @@ -153,13 +153,6 @@ EXPORT_SYMBOL(snd_seq_root); > struct snd_info_entry *snd_oss_root; > #endif > > -static void snd_remove_proc_entry(struct proc_dir_entry *parent, > - struct proc_dir_entry *de) > -{ > - if (de) > - remove_proc_entry(de->name, parent); > -} > - > static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig) > { > struct snd_info_private_data *data; > @@ -580,7 +573,7 @@ int __exit snd_info_done(void) > #ifdef CONFIG_SND_OSSEMUL > snd_info_free_entry(snd_oss_root); > #endif > - snd_remove_proc_entry(NULL, snd_proc_root); > + proc_remove(snd_proc_root); > } > return 0; > } > @@ -642,7 +635,7 @@ void snd_info_card_id_change(struct snd_card *card) > { > mutex_lock(&info_mutex); > if (card->proc_root_link) { > - snd_remove_proc_entry(snd_proc_root, card->proc_root_link); > + proc_remove(card->proc_root_link); > card->proc_root_link = NULL; > } > if (strcmp(card->id, card->proc_root->name)) > @@ -661,10 +654,8 @@ void snd_info_card_disconnect(struct snd_card *card) > if (!card) > return; > mutex_lock(&info_mutex); > - if (card->proc_root_link) { > - snd_remove_proc_entry(snd_proc_root, card->proc_root_link); > - card->proc_root_link = NULL; > - } > + proc_remove(card->proc_root_link); > + card->proc_root_link = NULL; > if (card->proc_root) > snd_info_disconnect(card->proc_root); > mutex_unlock(&info_mutex); > @@ -856,7 +847,7 @@ static void snd_info_disconnect(struct snd_info_entry *entry) > list_del_init(&entry->list); > root = entry->parent == NULL ? snd_proc_root : entry->parent->p; > snd_BUG_ON(!root); > - snd_remove_proc_entry(root, entry->p); > + proc_remove(entry->p); > entry->p = NULL; > } > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html

2 1

[alsa-devel] [PATCH 00/17] ASoC: Towards a generic dmaengine PCM driver
by Lars-Peter Clausen 18 Apr '13

18 Apr '13

Hi, This series adds a (almost) generic dmaengine PCM driver for ASoC. The tegra, spear, omap, imx, mxs, ep93xx and ux500 platforms are converted to use the generic driver instead of their own custom implementation. The driver builds on top of the dmaengine PCM library and adds the missing bits. The driver was primarily built for handling devicetree based platforms, but the series also adds support for compat platforms which don't use devicetree yet or have to support non-devicetree instantiation for backwards compatibility. Since non of the converted platforms have devicetree support yet (at least not using the generic DMA bindings) this series doesn't enable devicetree support for them either. But enabling support for them is very easy and can be done by removing the SND_DMAENGINE_PCM_NO_DT flag for these platforms. For platforms using devicetree the DMA channels are requested early on before the ASoC platform driver is registered. This allows us, at least in theory, to use probe deferral if the DMA driver hasn't been probed yet. Unfortunately of_dma_request_slave_channel either returns a valid channel or NULL, so we can't distinguish between the case where there is no DMA channel assigned and the case where the DMA driver hasn't been probed yet. I plan to submit a patch which lets of_dma_request_slave_channel return a ERR_PTR, but for now the generic PCM dmaengine driver assumes that the DMA driver will always be probed before it. For the compat case the DMA channel gets requested from within the PCM driver's pcm_new callback. This requires some minor changes to some of the DAI drivers moving the initialization of the DAI DMA data pointer from the DAI startup callback to the DAI probe callback. Unfortunately the driver is not fully generic yet and we still need some platform specific data to make it work, but the plan is to eventually make the driver fully generic in the future. The platform specific bits currently are: * The snd_pcm_hardware struct which contains device specific parameters like the maximum period size and maximum number of periods as well as whether the driver supports pause and resume. The idea is to get rid of the per platform snd_pcm_hardware struct by extending the dmaengine API to a point where we can query all necessary information from the dmaengine driver to fill in the snd_pcm_hardware struct at runtime. * The size of the pre-allocated audio buffer. All platforms seem use different sizes and since some of them might be sensitive to changes to the buffer size this series keeps the original size for now. But we should probably try to decide on a sane default for this and maybe allow ASoC board drivers to overwrite it somehow. * A callback to fill in the dma_slave_config. Currently this is either NULL (for platforms which don't need to configure the DMA channel at runtime) or uses the generic snd_dmaengine_pcm_prepare_slave_config(), which uses snd_hwparams_to_dma_slave_config() and snd_dmaengine_pcm_set_config_from_dai_data(). The later requires the platform to use the generic DMA DAI data struct though, hopefully we'll be able to convert all platforms to use this generic struct, and once that's done we can always use snd_dmaengine_pcm_prepare_slave_config() unconditionally. * For platforms not using devicetree platforms a callback to request the dma channel. This can either be a completely custom function which returns the channel or a filter function which will be passed to dma_request_channel. The route forward here probably is to let the DAI driver provide the filter function or implement a table based DMA channel lookup like we have for other subsystems (like clk or regulator) where the board file provides a mapping based on the device name. Platforms which use the dmaengine pcm library but are not converted to the generic driver yet are atmel and mmp. mmp use a custom genalloc based memory allocator, we may add support for this to the generic driver at a later point. The atmel PCM driver is very interlocked with atmel SSC DAI driver, it'll probably require some serious refactoring before it can use the generic dmaengine PCM driver. The driver uses snd_pcm_lib_preallocate_pages to preallocate the memory buffer. snd_pcm_lib_preallocate_pages internally uses dma_alloc_coherent, while most of the platforms converted in this series use dma_alloc_writecombine. Laxman Dewangan submitted a patch[1] a couple of months ago to add support for dma_alloc_writecombine to snd_pcm_lib_preallocate_pages, I always thought the patch had been merged, but it looks like I was mistaken. So if there are concerns about performance regression due to using coherent instead of writecombine mappings we'll have to postpone converting these platforms until Laxman's patch has been merged. The compat path of this series hasn't been runtime tested yet and neither have the platforms which are converted in this series. I probably broke one or two of them by accident, so please test the patches. Thanks, - Lars [1] https://lkml.org/lkml/2012/7/2/94 Lars-Peter Clausen (17): ASoC: dmaengine-pcm: Make requesting the DMA channel at PCM open optional ASoC: Add snd_soc_{add,remove}_platform ASoC: Add a generic dmaengine_pcm driver ASoC: dmaengine_pcm: Add support for compat platforms ASoC: tegra: Use generic dmaengine PCM ASoC: spear: Setup dma data in DAI probe ASoC: spear: Use generic dmaengine PCM ASoC: dmaengine-pcm: Add support for platforms which can't report residue ASoC: mxs: Setup dma data in DAI probe ASoC: mxs: Use generic dmaengine PCM ASoC: imx: Setup dma data in DAI probe ASoC: imx: Use generic dmaengine PCM ASoC: omap: Setup dma data in DAI probe ASoC: omap: Use generic dmaengine PCM ASoC: ep93xx: Setup dma data in DAI probe ASoC: ep93xx: Use generic dmaengine PCM ASoC: ux500: Use generic dmaengine PCM include/sound/dmaengine_pcm.h | 65 +++++++- include/sound/soc.h | 4 + sound/soc/Kconfig | 4 + sound/soc/Makefile | 4 + sound/soc/atmel/atmel-pcm-dma.c | 6 +- sound/soc/cirrus/Kconfig | 2 +- sound/soc/cirrus/ep93xx-ac97.c | 14 +- sound/soc/cirrus/ep93xx-i2s.c | 14 +- sound/soc/cirrus/ep93xx-pcm.c | 137 ++-------------- sound/soc/fsl/Kconfig | 2 +- sound/soc/fsl/fsl_ssi.c | 19 ++- sound/soc/fsl/imx-pcm-dma.c | 76 ++------- sound/soc/fsl/imx-pcm.c | 6 +- sound/soc/fsl/imx-pcm.h | 5 + sound/soc/fsl/imx-ssi.c | 22 +-- sound/soc/mxs/Kconfig | 2 +- sound/soc/mxs/mxs-pcm.c | 135 ++-------------- sound/soc/mxs/mxs-saif.c | 3 +- sound/soc/omap/Kconfig | 2 +- sound/soc/omap/omap-dmic.c | 4 +- sound/soc/omap/omap-hdmi.c | 12 +- sound/soc/omap/omap-mcbsp.c | 6 +- sound/soc/omap/omap-mcpdm.c | 7 +- sound/soc/omap/omap-pcm.c | 186 ++-------------------- sound/soc/pxa/mmp-pcm.c | 5 +- sound/soc/soc-core.c | 85 +++++++--- sound/soc/soc-dmaengine-pcm.c | 82 +++++++--- sound/soc/soc-generic-dmaengine-pcm.c | 284 ++++++++++++++++++++++++++++++++++ sound/soc/spear/spdif_in.c | 12 +- sound/soc/spear/spdif_out.c | 7 +- sound/soc/spear/spear_pcm.c | 151 ++---------------- sound/soc/tegra/Kconfig | 2 +- sound/soc/tegra/tegra_pcm.c | 171 ++------------------ sound/soc/ux500/Kconfig | 2 +- sound/soc/ux500/ux500_pcm.c | 159 ++----------------- 35 files changed, 651 insertions(+), 1046 deletions(-) create mode 100644 sound/soc/soc-generic-dmaengine-pcm.c -- 1.8.0

7 48

Re: [alsa-devel] [PATCH 04/28] proc: Supply PDE attribute setting accessor functions [RFC]
by Bjorn Helgaas 18 Apr '13

18 Apr '13

On Tue, Apr 16, 2013 at 12:26 PM, David Howells <dhowells(a)redhat.com> wrote: > Supply accessor functions to set attributes in proc_dir_entry structs. > > The following are supplied: proc_set_size() and proc_set_user(). > > Signed-off-by: David Howells <dhowells(a)redhat.com> > cc: linuxppc-dev(a)lists.ozlabs.org > cc: linux-media(a)vger.kernel.org > cc: netdev(a)vger.kernel.org > cc: linux-wireless(a)vger.kernel.org > cc: linux-pci(a)vger.kernel.org > cc: netfilter-devel(a)vger.kernel.org > cc: alsa-devel(a)alsa-project.org > --- > > arch/powerpc/kernel/proc_powerpc.c | 2 +- > arch/powerpc/platforms/pseries/reconfig.c | 2 +- > drivers/media/pci/ttpci/av7110_ir.c | 2 +- > drivers/net/irda/vlsi_ir.c | 2 +- > drivers/net/wireless/airo.c | 34 +++++++++-------------------- > drivers/pci/proc.c | 2 +- For the drivers/pci part: Acked-by: Bjorn Helgaas <bhelgaas(a)google.com> > fs/proc/generic.c | 13 +++++++++++ > include/linux/proc_fs.h | 5 ++++ > kernel/configs.c | 2 +- > kernel/profile.c | 2 +- > net/netfilter/xt_recent.c | 3 +-- > sound/core/info.c | 2 +- > 12 files changed, 38 insertions(+), 33 deletions(-) > > diff --git a/arch/powerpc/kernel/proc_powerpc.c b/arch/powerpc/kernel/proc_powerpc.c > index 41d8ee9..feb8580 100644 > --- a/arch/powerpc/kernel/proc_powerpc.c > +++ b/arch/powerpc/kernel/proc_powerpc.c > @@ -83,7 +83,7 @@ static int __init proc_ppc64_init(void) > &page_map_fops, vdso_data); > if (!pde) > return 1; > - pde->size = PAGE_SIZE; > + proc_set_size(pde, PAGE_SIZE); > > return 0; > } > diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c > index d6491bd..f93cdf5 100644 > --- a/arch/powerpc/platforms/pseries/reconfig.c > +++ b/arch/powerpc/platforms/pseries/reconfig.c > @@ -452,7 +452,7 @@ static int proc_ppc64_create_ofdt(void) > > ent = proc_create("powerpc/ofdt", S_IWUSR, NULL, &ofdt_fops); > if (ent) > - ent->size = 0; > + proc_set_size(ent, 0); > > return 0; > } > diff --git a/drivers/media/pci/ttpci/av7110_ir.c b/drivers/media/pci/ttpci/av7110_ir.c > index eb82286..0e763a7 100644 > --- a/drivers/media/pci/ttpci/av7110_ir.c > +++ b/drivers/media/pci/ttpci/av7110_ir.c > @@ -375,7 +375,7 @@ int av7110_ir_init(struct av7110 *av7110) > if (av_cnt == 1) { > e = proc_create("av7110_ir", S_IWUSR, NULL, &av7110_ir_proc_fops); > if (e) > - e->size = 4 + 256 * sizeof(u16); > + proc_set_size(e, 4 + 256 * sizeof(u16)); > } > > tasklet_init(&av7110->ir.ir_tasklet, av7110_emit_key, (unsigned long) &av7110->ir); > diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c > index e22cd4e..5f47584 100644 > --- a/drivers/net/irda/vlsi_ir.c > +++ b/drivers/net/irda/vlsi_ir.c > @@ -1678,7 +1678,7 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id) > IRDA_WARNING("%s: failed to create proc entry\n", > __func__); > } else { > - ent->size = 0; > + proc_set_size(ent, 0); > } > idev->proc_entry = ent; > } > diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c > index 66e398d..21d0233 100644 > --- a/drivers/net/wireless/airo.c > +++ b/drivers/net/wireless/airo.c > @@ -4507,73 +4507,63 @@ static int setup_proc_entry( struct net_device *dev, > airo_entry); > if (!apriv->proc_entry) > goto fail; > - apriv->proc_entry->uid = proc_kuid; > - apriv->proc_entry->gid = proc_kgid; > + proc_set_user(apriv->proc_entry, proc_kuid, proc_kgid); > > /* Setup the StatsDelta */ > entry = proc_create_data("StatsDelta", S_IRUGO & proc_perm, > apriv->proc_entry, &proc_statsdelta_ops, dev); > if (!entry) > goto fail_stats_delta; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the Stats */ > entry = proc_create_data("Stats", S_IRUGO & proc_perm, > apriv->proc_entry, &proc_stats_ops, dev); > if (!entry) > goto fail_stats; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the Status */ > entry = proc_create_data("Status", S_IRUGO & proc_perm, > apriv->proc_entry, &proc_status_ops, dev); > if (!entry) > goto fail_status; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the Config */ > entry = proc_create_data("Config", proc_perm, > apriv->proc_entry, &proc_config_ops, dev); > if (!entry) > goto fail_config; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the SSID */ > entry = proc_create_data("SSID", proc_perm, > apriv->proc_entry, &proc_SSID_ops, dev); > if (!entry) > goto fail_ssid; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the APList */ > entry = proc_create_data("APList", proc_perm, > apriv->proc_entry, &proc_APList_ops, dev); > if (!entry) > goto fail_aplist; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the BSSList */ > entry = proc_create_data("BSSList", proc_perm, > apriv->proc_entry, &proc_BSSList_ops, dev); > if (!entry) > goto fail_bsslist; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the WepKey */ > entry = proc_create_data("WepKey", proc_perm, > apriv->proc_entry, &proc_wepkey_ops, dev); > if (!entry) > goto fail_wepkey; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > - > + proc_set_user(entry, proc_kuid, proc_kgid); > return 0; > > fail_wepkey: > @@ -5695,10 +5685,8 @@ static int __init airo_init_module( void ) > > airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL); > > - if (airo_entry) { > - airo_entry->uid = proc_kuid; > - airo_entry->gid = proc_kgid; > - } > + if (airo_entry) > + proc_set_user(airo_entry, proc_kuid, proc_kgid); > > for (i = 0; i < 4 && io[i] && irq[i]; i++) { > airo_print_info("", "Trying to configure ISA adapter at irq=%d " > diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c > index 12e4fb5..7cde7c1 100644 > --- a/drivers/pci/proc.c > +++ b/drivers/pci/proc.c > @@ -419,7 +419,7 @@ int pci_proc_attach_device(struct pci_dev *dev) > &proc_bus_pci_operations, dev); > if (!e) > return -ENOMEM; > - e->size = dev->cfg_size; > + proc_set_size(e, dev->cfg_size); > dev->procent = e; > > return 0; > diff --git a/fs/proc/generic.c b/fs/proc/generic.c > index 1c07cad..5f6f6c3 100644 > --- a/fs/proc/generic.c > +++ b/fs/proc/generic.c > @@ -498,6 +498,19 @@ out: > return NULL; > } > EXPORT_SYMBOL(proc_create_data); > + > +void proc_set_size(struct proc_dir_entry *de, loff_t size) > +{ > + de->size = size; > +} > +EXPORT_SYMBOL(proc_set_size); > + > +void proc_set_user(struct proc_dir_entry *de, kuid_t uid, kgid_t gid) > +{ > + de->uid = uid; > + de->gid = gid; > +} > +EXPORT_SYMBOL(proc_set_user); > > static void free_proc_entry(struct proc_dir_entry *de) > { > diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h > index 805edac..28a4d7e 100644 > --- a/include/linux/proc_fs.h > +++ b/include/linux/proc_fs.h > @@ -130,6 +130,9 @@ static inline struct proc_dir_entry *proc_create(const char *name, umode_t mode, > extern struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name, > struct proc_dir_entry *parent); > > +extern void proc_set_size(struct proc_dir_entry *, loff_t); > +extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t); > + > extern struct file *proc_ns_fget(int fd); > extern bool proc_ns_inode(struct inode *inode); > > @@ -158,6 +161,8 @@ static inline struct proc_dir_entry *proc_mkdir(const char *name, > struct proc_dir_entry *parent) {return NULL;} > static inline struct proc_dir_entry *proc_mkdir_mode(const char *name, > umode_t mode, struct proc_dir_entry *parent) { return NULL; } > +static inline void proc_set_size(struct proc_dir_entry *de, loff_t size) {} > +static inline void proc_set_user(struct proc_dir_entry *de, kuid_t uid, kgid_t gid) {} > > struct tty_driver; > static inline void proc_tty_register_driver(struct tty_driver *driver) {}; > diff --git a/kernel/configs.c b/kernel/configs.c > index 42e8fa0..c18b1f1 100644 > --- a/kernel/configs.c > +++ b/kernel/configs.c > @@ -79,7 +79,7 @@ static int __init ikconfig_init(void) > if (!entry) > return -ENOMEM; > > - entry->size = kernel_config_data_size; > + proc_set_size(entry, kernel_config_data_size); > > return 0; > } > diff --git a/kernel/profile.c b/kernel/profile.c > index 524ce5e..0bf4007 100644 > --- a/kernel/profile.c > +++ b/kernel/profile.c > @@ -600,7 +600,7 @@ int __ref create_proc_profile(void) /* false positive from hotcpu_notifier */ > NULL, &proc_profile_operations); > if (!entry) > return 0; > - entry->size = (1+prof_len) * sizeof(atomic_t); > + proc_set_size(entry, (1 + prof_len) * sizeof(atomic_t)); > hotcpu_notifier(profile_cpu_callback, 0); > return 0; > } > diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c > index 3db2d38..1e657cf 100644 > --- a/net/netfilter/xt_recent.c > +++ b/net/netfilter/xt_recent.c > @@ -401,8 +401,7 @@ static int recent_mt_check(const struct xt_mtchk_param *par, > ret = -ENOMEM; > goto out; > } > - pde->uid = uid; > - pde->gid = gid; > + proc_set_user(pde, uid, gid); > #endif > spin_lock_bh(&recent_lock); > list_add_tail(&t->list, &recent_net->tables); > diff --git a/sound/core/info.c b/sound/core/info.c > index 3aa8864..c7f41c3 100644 > --- a/sound/core/info.c > +++ b/sound/core/info.c > @@ -970,7 +970,7 @@ int snd_info_register(struct snd_info_entry * entry) > mutex_unlock(&info_mutex); > return -ENOMEM; > } > - p->size = entry->size; > + proc_set_size(p, entry->size); > } > entry->p = p; > if (entry->parent) > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pci" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html

1 0

[alsa-devel] [PATCH v4 00/10] ASoC: fsl-ssi: ac97-slave support
by Markus Pargmann 18 Apr '13

18 Apr '13

Hi, This series adds DT support for phycore-ac97. It is now based on the pcm dma cleanups from Lars. Beside ac97 support, the series adds fsl-ssi imx-pcm-fiq and generic DMA binding handling. Regards, Markus Changes in v4: - phycore-ac97 uses the iomux functions based on audmux phandle now. - fsl-ssi imx-pcm-fiq got some new comments about problems with imx-ssi and incompatible codecs Changes in v3: - Rebased onto pcm dma cleanup patches - A lot of cleanups for the fsl-ssi ac97 integration - Some small changes which are listed in the notes of the patches. Markus Pargmann (10): ASoC: phycore-ac97: Add DT support ASoC: imx-pcm-dma: DT support ASoC: imx-pcm-fiq: Introduce pcm-fiq-params ASoC: fsl-ssi: Add support for imx-pcm-fiq ASoC: fsl-ssi: Use generic DMA bindings if possible ARM: imx: Export ac97 reset functions ASoC: fsl-ssi: imx ac97 support ASoC: fsl: Kconfig: Use fsl-ssi for phycore-ac97 ASoC: fsl: Move fsl-ssi binding doc to sound/ ASoC: fsl: Update fsl-ssi binding doc Documentation/devicetree/bindings/{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} | 10 ++ Documentation/devicetree/bindings/sound/phytec,phycore-ac97.txt | 14 ++ arch/arm/mach-imx/mach-pca100.c | 7 +- arch/arm/mach-imx/mach-pcm043.c | 7 +- sound/soc/fsl/Kconfig | 2 +- sound/soc/fsl/fsl_ssi.c | 512 ++++++++++++++++++++++++++++++++++++++++++++++++---------- sound/soc/fsl/imx-pcm-dma.c | 4 +- sound/soc/fsl/imx-pcm-fiq.c | 16 +- sound/soc/fsl/imx-pcm.h | 9 ++ sound/soc/fsl/imx-ssi.c | 7 +- sound/soc/fsl/imx-ssi.h | 1 + sound/soc/fsl/phycore-ac97.c | 166 ++++++++++++++++--- 12 files changed, 633 insertions(+), 122 deletions(-) rename Documentation/devicetree/bindings/{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} (88%) create mode 100644 Documentation/devicetree/bindings/sound/phytec,phycore-ac97.txt

3 13

[alsa-devel] More ASoC updates for v3.10
by Mark Brown 18 Apr '13

18 Apr '13

The following changes since commit b02e48f2f8755e51fe8ce246988a29bd96f6b85e: MAINTAINERS: Update e-mail address (2013-04-12 11:53:41 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next for you to fetch changes up to 24568ea4bef5ab8106206eddf5512434421c00ed: Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next (2013-04-18 15:05:35 +0100) There's a bunch of extra stuff in the diffstat/log since your for-next is further behind Linus' tree than one of my branches. ---------------------------------------------------------------- ASoC: More updates for v3.10 The main additional change here is Lars-Peter's DMA work plus the platform conversions which have been tested - getting this in mainline will make life easier for development after the merge window. These factor a large chunk of code out of the drivers for the platforms using dmaengine, greatly simplifying development. ---------------------------------------------------------------- Al Viro (3): ecryptfs: close rmmod race procfs: add proc_remove_subtree() palinfo fixes Alex Williamson (1): vfio-pci: Fix possible integer overflow Alexandre Belloni (1): gpio: pca953x: fix irq_domain_add_simple usage Alexey Khoroshilov (1): tty: mxser: fix cycle termination condition in mxser_probe() and mxser_module_init() Alexey Pelykh (1): OMAP/serial: Revert bad fix of Rx FIFO threshold granularity Andrea Arcangeli (2): x86/mm/cpa: Convert noop to functional fix x86/mm/cpa/selftest: Fix false positive in CPA self test Andrey Vagin (1): mnt: release locks on error path in do_loopback Arnd Bergmann (5): block: avoid using uninitialized value in from queue_var_store Merge tag 'mxs-fixes-3.9-4' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes Merge tag 'imx-fixes-3.9-5' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes Merge tag 'samsung-fixes-for-v3.9' of git://git.kernel.org/.../kgene/linux-samsung into fixes Merge tag 'mvebu_fixes_for_v3.9_round3' of git://git.infradead.org/users/jcooper/linux into fixes Artem Savkov (1): cfg80211: sched_scan_mtx lock in cfg80211_conn_work() Arun Easi (1): [SCSI] qla2xxx: Fix crash during firmware dump procedure. Asai Thambi S P (3): mtip32xx: recovery from command timeout mtip32xx: return 0 from pci probe in case of rebuild mtip32xx: Add debugfs entry device_status Asias He (7): tcm_vhost: Use ACCESS_ONCE for vs->vs_tpg[target] access tcm_vhost: Use vq->private_data to indicate if the endpoint is setup tcm_vhost: Initialize vq->last_used_idx when set endpoint tcm_vhost: Remove double check of response tcm_vhost: Fix tv_cmd leak in vhost_scsi_handle_vq tcm_vhost: Add vhost_scsi_send_bad_target() helper tcm_vhost: Send bad target to guest when cmd fails Bing Zhao (1): mwifiex: complete last internal scan Boris Ostrovsky (2): x86, mm: Patch out arch_flush_lazy_mmu_mode() when running on bare metal x86/mm: Flush lazy MMU when DEBUG_PAGEALLOC is set Brian King (1): [SCSI] ibmvscsi: Fix slave_configure deadlock Calvin Owens (1): drm/nouveau: fix unconditional return waiting on memory Chen Gang (3): perf: Fix strncpy() use, always make sure it's NUL terminated perf: Fix strncpy() use, use strlcpy() instead of strncpy() ftrace: Fix strncpy() use, use strlcpy() instead of strncpy() Chris Metcalf (1): tile: comment assumption about __insn_mtspr for <asm/irqflags.h> Christian Ruppert (1): ARC: Add implicit compiler barrier to raw_local_irq* functions Christoph Paasch (1): ipv6/tcp: Stop processing ICMPv6 redirect messages Christopher Harvey (1): drm/mgag200: Index 24 in extended CRTC registers is 24 in hex, not decimal. Chuck Lever (1): SUNRPC: Remove extra xprt_put() Daniel Vetter (1): drm/fb-helper: Fix locking in drm_fb_helper_hotplug_event Dave Airlie (2): Merge branch 'drm-nouveau-fixes-3.9' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes udl: handle EDID failure properly. Dave Hansen (1): x86-32: Fix possible incomplete TLB invalidate with PAE pagetables David S. Miller (3): Merge branch 'infoleaks' Merge branch 'wireless' Merge branch 'fixes-for-3.9' of git://gitorious.org/linux-can/linux-can David Woodhouse (1): libata: fix DMA to stack in reading devslp_timing parameters Dirk Behme (1): ARM i.MX6: Fix ldb_di clock selection Dirk Brandewie (1): cpufreq / intel_pstate: Set timer timeout correctly Dmitry Tarnyagin (1): remoteproc/ste: fix memory leak on shutdown Dylan Reid (1): ASoC: max98088: Fix logging of hardware revision. Eldad Zack (1): ALSA: usb-audio: fix endianness bug in snd_nativeinstruments_* Eric Dumazet (1): selinux: add a skb_owned_by() hook Franky Lin (1): brcmfmac: do not proceed if fail to download nvram to dongle Gabor Juhos (1): rt2x00: rt2x00pci: fix build error on Ralink RT3x5x SoCs Greg Ungerer (1): m68k: define a local gpio_request_one() function Gregory CLEMENT (1): arm: mvebu: Fix the irq map function in SMP mode Guennadi Liakhovetski (1): tty: Documentation: fix a path in a DocBook template Guenter Roeck (1): misc/vmw_vmci: Add dependency on CONFIG_NET Haiyang Zhang (2): hyperv: Fix a kernel warning from netvsc_linkstatus_callback() hyperv: Fix RNDIS send_completion code path Hante Meuleman (3): brcmfmac: fix tkip mic tx/rx ap swap bug. brcmfmac: fix stopping AP. brcmfmac: fix returning cipher_suite for get_key operation. Huacai Chen (1): PM / reboot: call syscore_shutdown() after disable_nonboot_cpus() Jan Kiszka (1): ftrace: Consistently restore trace function on sysctl enabling Jens Axboe (2): mtip32xx: fix two smatch warnings Revert "loop: cleanup partitions when detaching loop device" Jiri Pirko (2): net: ipv4: reset check_lifetime_work after changing lifetime net: ipv4: fix schedule while atomic bug in check_lifetime() Joe Carnuccio (1): [SCSI] Revert "qla2xxx: Add setting of driver version string for vendor application." Joe Lawrence (1): [SCSI] st: Take additional queue ref in st_probe John Gong (1): [SCSI] libsas: use right function to alloc smp response John W. Linville (2): Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Josef Bacik (1): Btrfs: make sure nbytes are right after log replay Jussi Kivilinna (1): crypto: gcm - fix assumption that assoc has one segment Keir Fraser (1): xen/events: Handle VIRQ_TIMER before any other hardirq in event loop. Kleber Sacilotto de Souza (1): [SCSI] ipr: fix addition of abort command to HRRQ free queue Konrad Rzeszutek Wilk (1): xen/mmu: On early bootup, flush the TLB when changing RO->RW bits Xen provided pagetables. Krzysztof Mazur (1): [libata] Fix HDIO_DRIVE_* ioctl() Linux 3.9 regression Lars-Peter Clausen (9): ASoC: dmaengine-pcm: Make requesting the DMA channel at PCM open optional ASoC: Add snd_soc_{add, remove}_platform ASoC: Add a generic dmaengine_pcm driver ASoC: dmaengine_pcm: Add support for compat platforms ASoC: tegra: Use generic dmaengine PCM ASoC: dmaengine-pcm: Add support for platforms which can't report residue ASoC: imx: Setup dma data in DAI probe ASoC: imx: Use generic dmaengine PCM ASoC: ux500: Use generic dmaengine PCM Li Fei (1): hwspinlock: fix __hwspin_lock_request error path Linus Torvalds (39): Merge tag 'trace-fixes-3.9-rc6' of git://git.kernel.org/.../rostedt/linux-trace Merge tag 'upstream-linus' of git://git.kernel.org/.../jgarzik/libata-dev Merge tag 'for-linus' of git://git.kernel.org/.../sfr/next-fixes Merge tag 'remoteproc-3.9-fixes' of git://git.kernel.org/.../ohad/remoteproc Merge tag 'hwspinlock-3.9-fix' of git://git.kernel.org/.../ohad/hwspinlock spinlocks and preemption points need to be at least compiler barriers Merge tag 'for-linus-20130409' of git://git.kernel.dk/linux-block Merge tag 'vfio-v3.9-rc7' of git://github.com/awilliam/linux-vfio Merge branch 'for-linus' of git://git.kernel.org/.../viro/vfs Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Merge git://git.kernel.org/.../herbert/crypto-2.6 Merge tag 'nfs-for-3.9-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs Merge tag 'nfs-for-3.9-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming Merge git://git.kernel.org/.../davem/net Merge tag 'trace-fixes-3.9-rc-v2' of git://git.kernel.org/.../rostedt/linux-trace Merge tag 'stable/for-linus-3.9-rc6-tag' of git://git.kernel.org/.../konrad/xen Merge tag 'tty-3.9-rc6' of git://git.kernel.org/.../gregkh/tty Merge tag 'char-misc-3.9-rc6' of git://git.kernel.org/.../gregkh/char-misc Merge tag 'arm-soc-fixes' of git://git.kernel.org/.../arm/arm-soc Merge tag 'gpio-fixes-v3.9-rc6' of git://git.kernel.org/.../linusw/linux-gpio Merge tag 'regmap-v3.9-rc6' of git://git.kernel.org/.../broonie/regmap Merge tag 'pm-3.9-rc7' of git://git.kernel.org/.../rafael/linux-pm Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma Merge tag 'sound-3.9' of git://git.kernel.org/.../tiwai/sound Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 Merge tag 'scsi-fixes' of git://git.kernel.org/.../jejb/scsi Merge git://git.kernel.org/.../nab/target-pending kobject: fix kset_find_obj() race with concurrent last kobject_put() Add file_ns_capable() helper function for open-time capability checking Merge tag 'trace-fixes-v3.9-rc-v3' of git://git.kernel.org/.../rostedt/linux-trace Merge branch 'for-linus' of git://git.kernel.org/.../mason/linux-btrfs Merge git://www.linux-watchdog.org/linux-watchdog Merge branch 'for-linus' of git://git.kernel.org/.../gerg/m68knommu Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Linux 3.9-rc7 Linus Walleij (1): crypto: ux500 - add missing comma Lukasz Dorau (1): [SCSI] libsas: fix handling vacant phy in sas_set_ex_phy() Marek Vasut (1): ARM: mxs: Slow down the I2C clock speed Mark Brown (13): regmap: Back out work buffer fix Merge remote-tracking branch 'asoc/fix/compress' into tmp Merge remote-tracking branch 'asoc/fix/core' into tmp Merge remote-tracking branch 'asoc/fix/samsung' into tmp Merge remote-tracking branch 'asoc/fix/tegra' into tmp Merge remote-tracking branch 'asoc/fix/wm8903' into tmp Merge branch 'topic/core' of git://git.kernel.org/.../broonie/sound into asoc-dma Merge tag 'v3.9-rc7' into asoc-dma Merge remote-tracking branch 'asoc/topic/core' into asoc-next Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next Merge remote-tracking branch 'asoc/topic/dma' into asoc-next Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next Mark Salter (1): add memory barrier to arch_local_irq_restore Markus Pargmann (3): ARM: clk-imx35: Bugfix iomux clock ARM: imx35 Bugfix admux clock ASoC: fsl-ssi: Add SACNT definitions Mathias Krause (16): atm: update msg_namelen in vcc_recvmsg() ax25: fix info leak via msg_name in ax25_recvmsg() Bluetooth: fix possible info leak in bt_sock_recvmsg() Bluetooth: RFCOMM - Fix missing msg_namelen update in rfcomm_sock_recvmsg() Bluetooth: SCO - Fix missing msg_namelen update in sco_sock_recvmsg() caif: Fix missing msg_namelen update in caif_seqpkt_recvmsg() irda: Fix missing msg_namelen update in irda_recvmsg_dgram() iucv: Fix missing msg_namelen update in iucv_sock_recvmsg() l2tp: fix info leak in l2tp_ip6_recvmsg() llc: Fix missing msg_namelen update in llc_ui_recvmsg() netrom: fix info leak via msg_name in nr_recvmsg() NFC: llcp: fix info leaks via msg_name in llcp_sock_recvmsg() rose: fix info leak via msg_name in rose_recvmsg() tipc: fix info leaks via msg_name in recv_msg/recv_stream VSOCK: vmci - fix possible info leak in vmci_transport_dgram_dequeue() VSOCK: Fix missing msg_namelen update in vsock_stream_recvmsg() Michael Riesch (1): rtnetlink: Call nlmsg_parse() with correct header length Michael Wolf (1): powerpc: pSeries_lpar_hpte_remove fails from Adjunct partition being performed before the ANDCOND test Namhyung Kim (2): tracing: Fix double free when function profile init failed tracing: Fix possible NULL pointer dereferences Neil Horman (1): e100: Add dma mapping error check Nicholas Bellinger (1): target: Fix incorrect fallthrough of ALUA Standby/Offline/Transition CDBs Nicolas Ferre (1): watchdog: Revert the AT91RM9200_WATCHDOG dependency Nigel Roberts (2): ARM: Kirkwood: Fix typo in the definition of ix2-200 rebuild LED Fix GE0/GE1 init on ix2-200 as GE0 has no PHY Padmavathi Venna (1): DMA: PL330: Add check if device tree compatible Paul Moore (1): lsm: add the missing documentation for the security_skb_owned_by() hook Peter Ujfalusi (1): dmaengine: omap-dma: Start DMA without delay for cyclic channels Robert Shade (1): ath9k: Re-enable interrupts after a channel change failure Robert Tivy (1): remoteproc: fix FW_CONFIG typo Roland Stigge (1): MAINTAINERS: Add maintainer for LPC32xx Sachin Prabhu (1): cifs: Allow passwords which begin with a delimitor Samu Kallio (1): x86, mm, paravirt: Fix vmalloc_fault oops during lazy MMU updates Saurav Kashyap (3): [SCSI] qla2xxx: Update copyright dates information in LICENSE.qla2xxx file. [SCSI] qla2xxx: Remove debug code that msleeps for random duration. [SCSI] qla2xxx: Update the driver version to 8.04.00.13-k. Sean Young (1): Revert "tty/8250_pnp: serial port detection regression since v3.7" Shan Hai (2): libata: Use integer return value for atapi_command_packet_set libata: Set max sector to 65535 for Slimtype DVD A DS8A8SH drive Shawn Guo (1): ARM: imx: provide twd clock lookup from device tree Sjur Brændeland (1): remoteproc: fix error path of handle_vdev Sridhar Samudrala (1): sctp: remove 'sridhar' from maintainers list Stanislaw Gruszka (1): sched/cputime: Fix accounting on multi-threaded processes Stas Sergeev (1): ASoC: define playback and capture streams in dummy codec Stefan Raspl (1): qeth: fix qeth_wait_for_threads() deadlock for OSN devices Stephane Eranian (2): perf/x86: Fix uninitialized pt_regs in intel_pmu_drain_bts_buffer() perf: Fix ring_buffer perf_output_space() boundary calculation Steven Rostedt (Red Hat) (3): tracing: Fix race with update_max_tr_single and changing tracers ftrace: Do not call stub functions in control loop ftrace: Move ftrace_filter_lseek out of CONFIG_DYNAMIC_FTRACE section Suleiman Souhlal (1): vfs: Revert spurious fix to spinning prevention in prune_icache_sb Suman Anna (1): remoteproc: fix the error check for idr_alloc Sylwester Nawrocki (2): ARM: S3C24XX: Correct NR_IRQS definition for s3c2440 ARM: S3C24XX: Fix interrupt pending register offset of the EINT controller Takashi Iwai (2): Merge tag 'asoc-v3.9-rc6' of git://git.kernel.org/.../broonie/sound into for-linus Merge tag 'asoc-maintainers-v3.9-rc6' of git://git.kernel.org/.../broonie/sound into for-linus Tejun Heo (1): sched: Convert BUG_ON()s in try_to_wake_up_local() to WARN_ON_ONCE()s Thomas Gleixner (1): sched_clock: Prevent 64bit inatomicity on 32bit systems Tim Gardner (1): rt2x00: rt2x00pci_regbusy_read() - only print register access failure once Trond Myklebust (5): NFSv4: Fix a memory leak in nfs4_discover_server_trunking NFSv4/4.1: Fix bugs in nfs4[01]_walk_client_list SUNRPC: Fix a potential memory leak in rpc_new_client NFSv4: Fix another potential state manager deadlock NFSv4: Doh! Typo in the fix to nfs41_walk_client_list Ursula Braun (1): af_iucv: fix recvmsg by replacing skb_pull() function Wei Yongjun (4): netrom: fix invalid use of sizeof in nr_recvmsg() can: gw: use kmem_cache_free() instead of kfree() [SCSI] lpfc: fix potential NULL pointer dereference in lpfc_sli4_rq_put() perf: Fix error return code Yaniv Rosner (1): bnx2x: Fix KR2 rapid link flap Youquan Song (1): ata_piix: Fix DVD not dectected at some Haswell platforms Yuval Mintz (1): bnx2x: Prevent null pointer dereference in AFEX mode libin (1): sched/debug: Fix sd->*_idx limit range avoiding overflow nikolay(a)redhat.com (2): Revert "bonding: remove sysfs before removing devices" bonding: fix bonding_masters race condition in bond unloading wenxiong(a)linux.vnet.ibm.com (2): [SCSI] ipr: ipr_test_msi() fails when running with msi-x enabled adapter [SCSI] ipr: dlpar failed when adding an adapter back willy tarreau (1): net: mvneta: enable features before registering the driver Documentation/DocBook/device-drivers.tmpl | 2 +- Documentation/scsi/LICENSE.qla2xxx | 2 +- MAINTAINERS | 7 +- Makefile | 2 +- arch/arc/include/asm/irqflags.h | 12 +- arch/arm/boot/dts/imx28-m28evk.dts | 1 - arch/arm/boot/dts/imx28-sps1.dts | 1 - arch/arm/boot/dts/imx6qdl.dtsi | 1 + arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 14 +- arch/arm/mach-imx/clk-imx35.c | 2 + arch/arm/mach-imx/clk-imx6q.c | 3 +- arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 7 +- arch/arm/mach-mvebu/irq-armada-370-xp.c | 16 +- arch/arm/mach-s3c24xx/include/mach/irqs.h | 4 +- arch/arm/mach-s3c24xx/irq.c | 2 +- arch/c6x/include/asm/irqflags.h | 2 +- arch/ia64/kernel/palinfo.c | 77 +---- arch/m68k/include/asm/gpio.h | 20 ++ arch/powerpc/platforms/pseries/lpar.c | 8 +- arch/tile/include/asm/irqflags.h | 10 +- arch/x86/include/asm/paravirt.h | 5 +- arch/x86/include/asm/paravirt_types.h | 2 + arch/x86/include/asm/tlb.h | 2 +- arch/x86/kernel/cpu/perf_event_intel_ds.c | 3 +- arch/x86/kernel/paravirt.c | 25 +- arch/x86/lguest/boot.c | 1 + arch/x86/mm/fault.c | 6 +- arch/x86/mm/pageattr-test.c | 2 +- arch/x86/mm/pageattr.c | 12 +- arch/x86/mm/pgtable.c | 7 + arch/x86/xen/mmu.c | 13 +- block/blk-sysfs.c | 2 + block/partition-generic.c | 1 - crypto/gcm.c | 17 +- drivers/ata/ata_piix.c | 14 +- drivers/ata/libata-core.c | 6 +- drivers/ata/libata-scsi.c | 8 +- drivers/base/regmap/regmap.c | 3 +- drivers/block/loop.c | 21 +- drivers/block/mtip32xx/mtip32xx.c | 327 ++++++++++++++------ drivers/block/mtip32xx/mtip32xx.h | 18 +- drivers/cpufreq/intel_pstate.c | 1 - drivers/crypto/ux500/cryp/cryp_core.c | 2 +- drivers/dma/omap-dma.c | 20 +- drivers/dma/pl330.c | 38 ++- drivers/gpio/gpio-pca953x.c | 2 +- drivers/gpu/drm/drm_fb_helper.c | 8 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 13 +- drivers/gpu/drm/nouveau/nv50_display.c | 2 +- drivers/gpu/drm/udl/udl_connector.c | 4 + drivers/hwspinlock/hwspinlock_core.c | 2 + drivers/misc/vmw_vmci/Kconfig | 2 +- drivers/net/bonding/bond_main.c | 11 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 18 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 +- drivers/net/ethernet/intel/e100.c | 36 ++- drivers/net/ethernet/marvell/mvneta.c | 9 +- drivers/net/hyperv/netvsc.c | 17 +- drivers/net/hyperv/netvsc_drv.c | 2 - drivers/net/hyperv/rndis_filter.c | 14 +- drivers/net/wireless/ath/ath9k/main.c | 4 + drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 6 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 46 +-- drivers/net/wireless/mwifiex/scan.c | 11 +- drivers/net/wireless/rt2x00/Kconfig | 7 + drivers/net/wireless/rt2x00/Makefile | 1 + drivers/net/wireless/rt2x00/rt2400pci.c | 1 + drivers/net/wireless/rt2x00/rt2500pci.c | 1 + drivers/net/wireless/rt2x00/rt2800pci.c | 1 + drivers/net/wireless/rt2x00/rt2x00mmio.c | 216 +++++++++++++ drivers/net/wireless/rt2x00/rt2x00mmio.h | 119 +++++++ drivers/net/wireless/rt2x00/rt2x00pci.c | 176 ----------- drivers/net/wireless/rt2x00/rt2x00pci.h | 88 ------ drivers/net/wireless/rt2x00/rt61pci.c | 1 + drivers/remoteproc/Kconfig | 2 +- drivers/remoteproc/remoteproc_core.c | 6 +- drivers/remoteproc/ste_modem_rproc.c | 7 +- drivers/s390/net/qeth_core.h | 3 + drivers/s390/net/qeth_core_main.c | 19 ++ drivers/s390/net/qeth_l2_main.c | 2 + drivers/s390/net/qeth_l3_main.c | 2 + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- drivers/scsi/ipr.c | 13 +- drivers/scsi/libsas/sas_expander.c | 14 +- drivers/scsi/lpfc/lpfc_sli.c | 3 +- drivers/scsi/qla2xxx/qla_attr.c | 5 - drivers/scsi/qla2xxx/qla_dbg.c | 3 +- drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_gbl.h | 3 - drivers/scsi/qla2xxx/qla_init.c | 4 +- drivers/scsi/qla2xxx/qla_mbx.c | 58 ---- drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/st.c | 8 +- drivers/target/target_core_alua.c | 3 + drivers/tty/mxser.c | 8 +- drivers/tty/serial/8250/8250_pnp.c | 12 +- drivers/tty/serial/omap-serial.c | 11 + drivers/vfio/pci/vfio_pci.c | 3 +- drivers/vhost/tcm_vhost.c | 198 ++++++++---- drivers/watchdog/Kconfig | 2 +- drivers/xen/events.c | 19 +- fs/btrfs/tree-log.c | 48 ++- fs/cifs/connect.c | 16 +- fs/ecryptfs/miscdev.c | 14 +- fs/inode.c | 2 +- fs/namespace.c | 2 +- fs/nfs/nfs4client.c | 45 ++- fs/nfs/nfs4proc.c | 1 + fs/nfs/nfs4state.c | 8 +- fs/proc/generic.c | 119 +++++-- include/asm-generic/tlb.h | 7 +- include/linux/ata.h | 2 +- include/linux/capability.h | 2 + include/linux/ftrace.h | 5 +- include/linux/libata.h | 1 + include/linux/preempt.h | 22 +- include/linux/proc_fs.h | 2 + include/linux/security.h | 12 + include/linux/spinlock_up.h | 29 +- include/net/iucv/af_iucv.h | 8 + include/sound/dmaengine_pcm.h | 92 +++++- include/sound/soc-dapm.h | 1 - include/sound/soc.h | 13 +- kernel/capability.c | 24 ++ kernel/events/core.c | 4 +- kernel/events/internal.h | 2 +- kernel/events/ring_buffer.c | 22 +- kernel/sched/clock.c | 26 ++ kernel/sched/core.c | 8 +- kernel/sched/cputime.c | 2 +- kernel/sys.c | 3 +- kernel/trace/ftrace.c | 54 ++-- kernel/trace/trace.c | 9 +- kernel/trace/trace_stack.c | 2 +- lib/kobject.c | 9 +- mm/memory.c | 1 + net/atm/common.c | 2 + net/ax25/af_ax25.c | 1 + net/bluetooth/af_bluetooth.c | 4 +- net/bluetooth/rfcomm/sock.c | 1 + net/bluetooth/sco.c | 1 + net/caif/caif_socket.c | 2 + net/can/gw.c | 6 +- net/core/rtnetlink.c | 4 +- net/ipv4/devinet.c | 60 +++- net/ipv4/tcp_output.c | 1 + net/ipv6/tcp_ipv6.c | 1 + net/irda/af_irda.c | 2 + net/iucv/af_iucv.c | 36 +-- net/l2tp/l2tp_ip6.c | 1 + net/llc/af_llc.c | 2 + net/netrom/af_netrom.c | 1 + net/nfc/llcp/sock.c | 3 + net/rose/af_rose.c | 1 + net/sunrpc/clnt.c | 11 +- net/tipc/socket.c | 7 + net/vmw_vsock/af_vsock.c | 2 + net/vmw_vsock/vmci_transport.c | 3 +- net/wireless/sme.c | 2 + security/capability.c | 6 + security/security.c | 5 + security/selinux/hooks.c | 7 + sound/soc/Kconfig | 4 + sound/soc/Makefile | 4 + sound/soc/atmel/atmel-pcm-dma.c | 29 +- sound/soc/cirrus/edb93xx.c | 1 - sound/soc/cirrus/ep93xx-ac97.c | 9 +- sound/soc/cirrus/ep93xx-i2s.c | 16 +- sound/soc/cirrus/ep93xx-pcm.c | 38 +-- sound/soc/cirrus/ep93xx-pcm.h | 20 -- sound/soc/cirrus/simone.c | 2 - sound/soc/cirrus/snappercl15.c | 1 - sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/cs4271.c | 166 +++++----- sound/soc/codecs/max98088.c | 32 +- sound/soc/codecs/wm5102.c | 2 +- sound/soc/codecs/wm8903.c | 2 + sound/soc/fsl/Kconfig | 2 +- sound/soc/fsl/fsl_ssi.c | 55 ++-- sound/soc/fsl/fsl_ssi.h | 8 + sound/soc/fsl/imx-audmux.c | 3 +- sound/soc/fsl/imx-pcm-dma.c | 120 +------ sound/soc/fsl/imx-pcm-fiq.c | 6 +- sound/soc/fsl/imx-pcm.c | 6 +- sound/soc/fsl/imx-pcm.h | 24 +- sound/soc/fsl/imx-sgtl5000.c | 2 +- sound/soc/fsl/imx-ssi.c | 51 ++- sound/soc/fsl/imx-ssi.h | 7 +- sound/soc/mxs/mxs-pcm.c | 43 +-- sound/soc/mxs/mxs-pcm.h | 4 +- sound/soc/mxs/mxs-saif.c | 6 +- sound/soc/omap/am3517evm.c | 1 - sound/soc/omap/ams-delta.c | 1 - sound/soc/omap/mcbsp.c | 14 +- sound/soc/omap/mcbsp.h | 7 +- sound/soc/omap/n810.c | 1 - sound/soc/omap/omap-abe-twl6040.c | 1 - sound/soc/omap/omap-dmic.c | 38 +-- sound/soc/omap/omap-hdmi.c | 24 +- sound/soc/omap/omap-mcbsp.c | 18 +- sound/soc/omap/omap-mcpdm.c | 109 ++++--- sound/soc/omap/omap-pcm.c | 86 +---- sound/soc/omap/omap-pcm.h | 40 --- sound/soc/omap/omap-twl4030.c | 1 - sound/soc/omap/omap3pandora.c | 9 +- sound/soc/omap/osk5912.c | 1 - sound/soc/omap/rx51.c | 1 - sound/soc/pxa/mmp-pcm.c | 34 +- sound/soc/samsung/i2s.c | 17 +- sound/soc/soc-compress.c | 14 +- sound/soc/soc-core.c | 116 ++++--- sound/soc/soc-dapm.c | 1 - sound/soc/soc-dmaengine-pcm.c | 150 +++++---- sound/soc/soc-generic-dmaengine-pcm.c | 284 +++++++++++++++++ sound/soc/soc-io.c | 5 +- sound/soc/soc-utils.c | 25 ++ sound/soc/spear/spear_pcm.c | 19 +- sound/soc/tegra/Kconfig | 2 +- sound/soc/tegra/tegra20_ac97.c | 13 +- sound/soc/tegra/tegra20_ac97.h | 4 +- sound/soc/tegra/tegra20_i2s.c | 13 +- sound/soc/tegra/tegra20_i2s.h | 4 +- sound/soc/tegra/tegra20_spdif.c | 7 +- sound/soc/tegra/tegra20_spdif.h | 4 +- sound/soc/tegra/tegra30_ahub.c | 8 +- sound/soc/tegra/tegra30_ahub.h | 8 +- sound/soc/tegra/tegra30_i2s.c | 13 +- sound/soc/tegra/tegra30_i2s.h | 4 +- sound/soc/tegra/tegra_pcm.c | 209 +------------ sound/soc/tegra/tegra_pcm.h | 7 - sound/soc/ux500/Kconfig | 2 +- sound/soc/ux500/ux500_pcm.c | 229 ++------------ sound/soc/ux500/ux500_pcm.h | 14 - sound/usb/mixer_quirks.c | 4 +- sound/usb/quirks.c | 2 +- 235 files changed, 2790 insertions(+), 2211 deletions(-) create mode 100644 drivers/net/wireless/rt2x00/rt2x00mmio.c create mode 100644 drivers/net/wireless/rt2x00/rt2x00mmio.h delete mode 100644 sound/soc/cirrus/ep93xx-pcm.h delete mode 100644 sound/soc/omap/omap-pcm.h create mode 100644 sound/soc/soc-generic-dmaengine-pcm.c

3 4

[alsa-devel] [PATCH] sgtl5000.txt: Include supplies as required properties
by Fabio Estevam 18 Apr '13

18 Apr '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> sgtl5000 driver cannot probe succesfully if VDDA and VDDIO regulators are not provided. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- .../devicetree/bindings/sound/sgtl5000.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/sgtl5000.txt b/Documentation/devicetree/bindings/sound/sgtl5000.txt index 9cc4444..520eb98 100644 --- a/Documentation/devicetree/bindings/sound/sgtl5000.txt +++ b/Documentation/devicetree/bindings/sound/sgtl5000.txt @@ -5,9 +5,15 @@ Required properties: - reg : the I2C address of the device +- VDDA-supply: regulator that provides VDDA voltage + +- VDDIO-supply: regulator that provides VDDIO voltage + Example: codec: sgtl5000@0a { compatible = "fsl,sgtl5000"; reg = <0x0a>; + VDDA-supply = <&reg_2p5v>; + VDDIO-supply = <&reg_3p3v>; }; -- 1.7.9.5

2 1

[alsa-devel] [PATCH 1/2] alsa-lib: pcm.c: fix indentation
by Daniel Mack 18 Apr '13

18 Apr '13

Signed-off-by: Daniel Mack <zonque(a)gmail.com> --- src/pcm/pcm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 05737d9..2963711 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -1634,11 +1634,11 @@ static const char *const snd_pcm_type_names[] = { PCMTYPE(LADSPA), PCMTYPE(DMIX), PCMTYPE(JACK), - PCMTYPE(DSNOOP), - PCMTYPE(IEC958), + PCMTYPE(DSNOOP), + PCMTYPE(IEC958), PCMTYPE(SOFTVOL), - PCMTYPE(IOPLUG), - PCMTYPE(EXTPLUG), + PCMTYPE(IOPLUG), + PCMTYPE(EXTPLUG), PCMTYPE(MMAP_EMUL), }; -- 1.8.1.4

2 2

[alsa-devel] [PATCH v3 0/5] ALSA: snd-usb: add support for DSD
by Daniel Mack 18 Apr '13

18 Apr '13

In contrast to the first two approaches, this one keeps the userspace unaware of the actual transport on the bus. More specifically, the DSD_U16_LE format may be implemented to actually send DOP samples to the device, depending on the quirks entries. Also, as there is quite some confusion in both data file formats as well as hardware sample formats about whether to stuff the oldest bit in the MSB or the LSB of a byte, ALSA defines that now to be in the MSB, as far as the ALSA userspace layer is concerned. The driver learned functions to re-encode the bytes according to what the hardware supports. I also wrote a very basic test tool which I published here: https://github.com/zonque/alsa-dsd-player Thanks, Daniel Daniel Mack (5): ALSA: add DSD formats ALSA: snd-usb: use ep->stride from urb callbacks ALSA: snd-usb: add support for DSD DOP stream transport ALSA: snd-usb: add support for bit-reversed byte formats ALSA: snd-usb: add quirks handler for DSD streams include/sound/pcm.h | 2 + include/uapi/sound/asound.h | 4 +- sound/core/pcm.c | 2 + sound/core/pcm_misc.c | 8 +++ sound/usb/card.h | 8 +++ sound/usb/endpoint.c | 9 ++++ sound/usb/format.c | 3 ++ sound/usb/pcm.c | 118 ++++++++++++++++++++++++++++++++++++------- sound/usb/quirks.c | 28 ++++++++++ sound/usb/quirks.h | 4 ++ 10 files changed, 167 insertions(+), 19 deletions(-) -- 1.7.10.4

3 12

Re: [alsa-devel] [PATCH -next] ALSA: hda - fix error return code in patch_alc662()
by Takashi Iwai 18 Apr '13

18 Apr '13

At Thu, 18 Apr 2013 11:12:59 +0800, Wei Yongjun wrote: > > From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> > > Fix to return a negative error code from the error handling > case instead of 0, as returned elsewhere in this function. > > Signed-off-by: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> Thanks, applied. Takashi > --- > sound/pci/hda/patch_realtek.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c > index f15c36b..a3965b0 100644 > --- a/sound/pci/hda/patch_realtek.c > +++ b/sound/pci/hda/patch_realtek.c > @@ -3787,7 +3787,8 @@ static int patch_alc662(struct hda_codec *codec) > if ((alc_get_coef0(codec) & (1 << 14)) && > codec->bus->pci->subsystem_vendor == 0x1025 && > spec->cdefine.platform_type == 1) { > - if (alc_codec_rename(codec, "ALC272X") < 0) > + err = alc_codec_rename(codec, "ALC272X"); > + if (err < 0) > goto error; > } > >

1 0