November 2010 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] Buffer memory does not get allocated?
by Radivoje Jovanovic 05 Nov '10

05 Nov '10

I am allocating memory for the buffers in my init call by doing: snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, snd_dma_continuous_data(GFP_KERNEL), 256*1024, 256*1024); in my hw_params call I have: ret= snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params)); here is the output from my hw_params call: called snd_pcm_lib_malloc_pages return=1 params_buffer_bytes(hw_params)=32768 Size of DMA area=32768 Buffer size in bytes=262144 Buffer virt address=9dc00000 Buffer phys address=0 Now I am not sure why is my buffer size bigger than my DMA area. I assume that memory is not linear because of that and that is why I do not have phys address to the buffer. How do I fix this? Thanx Ogi

2 1

[alsa-devel] [PATCH 00/49] Use vzalloc not vmalloc/kmemset
by Joe Perches 05 Nov '10

05 Nov '10

Converted vmalloc/memset and vmalloc_node/memset to vzalloc or vzalloc_node using a cocci script and some editing Reduces text a little bit. Compiled x86 only. There are still vmalloc_32 with memset calls still around. Broken out to multiple patches to cc appropriate maintainers. Joe Perches (49): arch/ia64: Use vzalloc arch/mips: Use vzalloc arch/powerpc: Use vzalloc arch/s390: Use vzalloc arch/x86: Use vzalloc crypto: Use vzalloc drivers/atm: Use vzalloc drivers/block: Use vzalloc drivers/char: Use vzalloc drivers/gpu: Use vzalloc drivers/hid: Use vzalloc drivers/infiniband: Use vzalloc drivers/isdn: Use vzalloc drivers/md: Use vzalloc drivers/media: Use vzalloc drivers/mtd: Use vzalloc drivers/net/cxgb3: Use vzalloc drivers/net/cxgb4: Use vzalloc drivers/net/e1000: Use vzalloc drivers/net/e1000e: Use vzalloc drivers/net/ehea: Use vzalloc drivers/net/igb: Use vzalloc drivers/net/igbvf: Use vzalloc drivers/net/ixgb: Use vzalloc drivers/net/ixgbe: Use vzalloc drivers/net/ixgbevf: Use vzalloc drivers/net/netxen: Use vzalloc drivers/net/pch_gbe: Use vzalloc drivers/net/qlcnic: Use vzalloc drivers/net/sfc: Use vzalloc drivers/net/vxge: Use vzalloc drivers/net/bnx2.c: Use vzalloc drivers/s390: Use vzalloc drivers/scsi: Use vzalloc drivers/staging: Use vzalloc drivers/video: Use vzalloc fs/ext4: Use vzalloc fs/jffs2: Use vzalloc fs/reiserfs: Use vzalloc fs/udf: Use vzalloc fs/xfs: Use vzalloc include/linux/coda_linux.h: Use vzalloc kernel: Use vzalloc mm: Use vzalloc net/core/pktgen.c: Use vzalloc net/netfilter: Use vzalloc net/rds: Use vzalloc sound/oss/dev_table.c: Use vzalloc virt/kvm/kvm_main.c: Use vzalloc arch/ia64/kernel/perfmon.c | 3 +- arch/mips/sibyte/common/sb_tbprof.c | 3 +- arch/powerpc/kvm/book3s.c | 6 +-- arch/powerpc/platforms/cell/spufs/lscsa_alloc.c | 3 +- arch/s390/hypfs/hypfs_diag.c | 3 +- arch/x86/kernel/microcode_amd.c | 3 +- arch/x86/kvm/x86.c | 3 +- arch/x86/mm/pageattr-test.c | 3 +- crypto/deflate.c | 3 +- crypto/zlib.c | 3 +- drivers/atm/idt77252.c | 11 ++++--- drivers/atm/lanai.c | 3 +- drivers/block/drbd/drbd_bitmap.c | 5 +-- drivers/char/agp/backend.c | 3 +- drivers/char/mspec.c | 5 +-- drivers/gpu/drm/via/via_dmablit.c | 4 +- drivers/hid/hid-core.c | 3 +- drivers/infiniband/hw/amso1100/c2_rnic.c | 5 +-- drivers/infiniband/hw/ehca/ipz_pt_fn.c | 5 +-- drivers/infiniband/hw/ipath/ipath_driver.c | 3 +- drivers/infiniband/hw/ipath/ipath_file_ops.c | 11 ++----- drivers/infiniband/hw/ipath/ipath_init_chip.c | 5 +-- drivers/infiniband/hw/qib/qib_init.c | 7 +--- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 10 ++---- drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 +- drivers/isdn/i4l/isdn_common.c | 4 +- drivers/isdn/mISDN/dsp_core.c | 3 +- drivers/isdn/mISDN/l1oip_codec.c | 6 +-- drivers/md/dm-log.c | 3 +- drivers/md/dm-snap-persistent.c | 3 +- drivers/md/dm-table.c | 4 +-- drivers/media/dvb/ngene/ngene-core.c | 3 +- drivers/media/video/mx3_camera.c | 3 +- drivers/media/video/pwc/pwc-if.c | 3 +- drivers/media/video/videobuf-dma-sg.c | 3 +- drivers/mtd/nand/nandsim.c | 3 +- drivers/mtd/ubi/vtbl.c | 6 +-- drivers/net/bnx2.c | 10 +----- drivers/net/cxgb3/cxgb3_offload.c | 7 ++-- drivers/net/cxgb4/cxgb4_main.c | 7 ++-- drivers/net/e1000/e1000_main.c | 6 +-- drivers/net/e1000e/netdev.c | 6 +-- drivers/net/ehea/ehea_main.c | 4 +-- drivers/net/igb/igb_main.c | 6 +-- drivers/net/igbvf/netdev.c | 6 +-- drivers/net/ixgb/ixgb_main.c | 6 +-- drivers/net/ixgbe/ixgbe_main.c | 10 ++---- drivers/net/ixgbevf/ixgbevf_main.c | 6 +-- drivers/net/netxen/netxen_nic_init.c | 7 +--- drivers/net/pch_gbe/pch_gbe_main.c | 6 +-- drivers/net/qlcnic/qlcnic_init.c | 7 +--- drivers/net/sfc/filter.c | 3 +- drivers/net/vxge/vxge-config.c | 37 +++++----------------- drivers/s390/cio/blacklist.c | 3 +- drivers/scsi/bfa/bfad.c | 3 +- drivers/scsi/bfa/bfad_debugfs.c | 8 +---- drivers/scsi/cxgbi/libcxgbi.h | 9 ++---- drivers/scsi/osst.c | 3 +- drivers/scsi/qla2xxx/qla_attr.c | 3 +- drivers/scsi/qla2xxx/qla_bsg.c | 3 +- drivers/scsi/scsi_debug.c | 7 +--- drivers/staging/comedi/drivers.c | 4 +-- drivers/staging/rtl8192e/r8192E_core.c | 4 +-- drivers/staging/udlfb/udlfb.c | 5 +-- drivers/staging/xgifb/XGI_main_26.c | 3 +- drivers/staging/zram/zram_drv.c | 3 +- drivers/video/arcfb.c | 5 +-- drivers/video/broadsheetfb.c | 4 +-- drivers/video/hecubafb.c | 5 +-- drivers/video/metronomefb.c | 4 +-- drivers/video/xen-fbfront.c | 3 +- fs/ext4/super.c | 4 +-- fs/jffs2/build.c | 5 +-- fs/reiserfs/journal.c | 9 ++---- fs/reiserfs/resize.c | 4 +-- fs/udf/super.c | 5 +-- fs/xfs/linux-2.6/kmem.h | 7 +---- include/linux/coda_linux.h | 26 ++++++++++------ kernel/profile.c | 6 +-- kernel/relay.c | 4 +-- mm/memcontrol.c | 5 +-- mm/page_cgroup.c | 3 +- mm/percpu.c | 8 +---- mm/swapfile.c | 3 +- net/core/pktgen.c | 3 +- net/netfilter/x_tables.c | 5 +-- net/rds/ib_cm.c | 6 +-- sound/oss/dev_table.c | 6 +-- virt/kvm/kvm_main.c | 13 ++------ 89 files changed, 167 insertions(+), 328 deletions(-) -- 1.7.3.1.g432b3.dirty

1 0

[alsa-devel] On vacation
by Takashi Iwai 04 Nov '10

04 Nov '10

Hi, I'll be on vacation from today for two weeks, and will be less responsive during that. I'm going to catch up mails in my inbox occasionally, but won't read MLs, so don't forget to add me to Cc if you have urgent pull requests or patches to be merged. thanks, Takashi

2 1

[alsa-devel] Retrieving original timestamps in dsnoop.
by Pontus Oldberg 04 Nov '10

04 Nov '10

Hello, I am working in a gstreamer based project where we are using alsasrc to feed the audio pipeline. On of the things that we need to be able to do is to get the monotonic timestamp from the alsalib in order for our video and audio to be perfectly synchronized. This worked fine until we introduced the dsnoop plug-in which creates its own timestamp reference. I have played around with the dsnoop plugin and created a preliminary fix that gives us the result that we want. I'd like to know if this looks like the way to go or if this can be obtained in any other way. We are using dsnoop in order to be able to create two separate audio pipelines, we don't care about stereo, just simple mono streams. ? libs/alsa-lib/build ? libs/alsa-lib/alsa-lib/autom4te.cache ? libs/alsa-lib/alsa-lib/src/control/ctl_symbols_list.c ? libs/alsa-lib/alsa-lib/src/pcm/pcm_symbols_list.c Index: libs/alsa-lib/alsa-lib/src/pcm/pcm_direct.h =================================================================== RCS file: /usr/local/cvs/linux/libs/alsa-lib/alsa-lib/src/pcm/pcm_direct.h,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 pcm_direct.h --- libs/alsa-lib/alsa-lib/src/pcm/pcm_direct.h 6 Sep 2010 08:18:20 -0000 1.1.1.2 +++ libs/alsa-lib/alsa-lib/src/pcm/pcm_direct.h 29 Oct 2010 09:56:08 -0000 @@ -114,6 +114,14 @@ } u; } snd_pcm_direct_share_t; +/* + * Defines the clock type to use + */ +enum snd_pcm_sub_clock_type { + SND_PCM_SLAVE_CLOCK_DEFAULT = 0x00, + SND_PCM_SLAVE_CLOCK_SUB =0x01, +}; + typedef struct snd_pcm_direct snd_pcm_direct_t; struct snd_pcm_direct { @@ -153,6 +161,7 @@ int max_periods; /* max periods (-1 = fixed periods, 0 = max buffer size) */ unsigned int channels; /* client's channels */ unsigned int *bindings; + int sub_clock; union { struct { int shmid_sum; /* IPC global sum ring buffer memory identification */ Index: libs/alsa-lib/alsa-lib/src/pcm/pcm_dsnoop.c =================================================================== RCS file: /usr/local/cvs/linux/libs/alsa-lib/alsa-lib/src/pcm/pcm_dsnoop.c,v retrieving revision 1.1.1.2 diff -u -r1.1.1.2 pcm_dsnoop.c --- libs/alsa-lib/alsa-lib/src/pcm/pcm_dsnoop.c 6 Sep 2010 08:18:20 -0000 1.1.1.2 +++ libs/alsa-lib/alsa-lib/src/pcm/pcm_dsnoop.c 29 Oct 2010 09:56:08 -0000 @@ -51,7 +51,7 @@ #endif /* - * + * Handles packing and formating of buffers */ static void snoop_areas(snd_pcm_direct_t *dsnoop, @@ -168,11 +168,18 @@ default: break; } - memset(status, 0, sizeof(*status)); + + memset(status, 0, sizeof(status)); state = snd_pcm_state(dsnoop->spcm); status->state = state == SND_PCM_STATE_RUNNING ? dsnoop->state : state; - status->trigger_tstamp = dsnoop->trigger_tstamp; - gettimestamp(&status->tstamp, pcm->monotonic); + + if (dsnoop->sub_clock == SND_PCM_SLAVE_CLOCK_SUB) { + snd_pcm_status(dsnoop->spcm, status); + } else { + status->trigger_tstamp = dsnoop->trigger_tstamp; + gettimestamp(&status->tstamp, pcm->monotonic); + } + status->avail = snd_pcm_mmap_capture_avail(pcm); status->avail_max = status->avail > dsnoop->avail_max ? status->avail : dsnoop->avail_max; dsnoop->avail_max = 0; @@ -197,18 +204,21 @@ static int snd_pcm_dsnoop_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp) { snd_pcm_direct_t *dsnoop = pcm->private_data; - int err; + int err = 0; switch(dsnoop->state) { case SNDRV_PCM_STATE_DRAINING: case SNDRV_PCM_STATE_RUNNING: - err = snd_pcm_dsnoop_sync_ptr(pcm); + err = snd_pcm_dsnoop_sync_ptr(pcm); if (err < 0) return err; case SNDRV_PCM_STATE_PREPARED: case SNDRV_PCM_STATE_SUSPENDED: - *delayp = snd_pcm_mmap_capture_hw_avail(pcm); - return 0; + if (dsnoop->sub_clock == SND_PCM_SLAVE_CLOCK_SUB) + err = dsnoop->spcm->fast_ops->delay(dsnoop->spcm, delayp); + else + *delayp = snd_pcm_mmap_capture_hw_avail(pcm); + return err; case SNDRV_PCM_STATE_XRUN: return -EPIPE; case SNDRV_PCM_STATE_DISCONNECTED: @@ -271,7 +281,12 @@ if (err < 0) return err; dsnoop->state = SND_PCM_STATE_RUNNING; - gettimestamp(&dsnoop->trigger_tstamp, pcm->monotonic); + if (dsnoop->sub_clock == SND_PCM_SLAVE_CLOCK_SUB) { + snd_pcm_status_t status; + snd_pcm_status(dsnoop->spcm, &status); + dsnoop->trigger_tstamp = status.trigger_tstamp; + } else + gettimestamp(&dsnoop->trigger_tstamp, pcm->monotonic); return 0; } @@ -421,6 +436,7 @@ return snd_pcm_mmap_capture_avail(pcm); } +/* TODO: This function is faulty, needs fixing */ static int snd_pcm_dsnoop_htimestamp(snd_pcm_t *pcm, snd_pcm_uframes_t *avail, snd_htimestamp_t *tstamp) @@ -673,6 +689,9 @@ if (dsnoop->channels == UINT_MAX) dsnoop->channels = dsnoop->shmptr->s.channels; + /* TODO: Needs to be loaded from the config file */ + dsnoop->sub_clock = SND_PCM_SLAVE_CLOCK_SUB; + snd_pcm_direct_semaphore_up(dsnoop, DIRECT_IPC_SEM_CLIENT); *pcmp = pcm; /Regards /Pontus

2 3

[alsa-devel] [PATCH] ASoC: Use pm_wakeup_event() in WM8962 jack detection
by Mark Brown 03 Nov '10

03 Nov '10

Ensure that the system does not suspend while we process a WM8962 jack event by using pm_wakeup_event() to block the suspend while we're waiting for the jack to settle. Use a slightly longer timeout than the jack waits to allow for other stuff to take over and delays in scheduling. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 894d0cd..2eaf9bb 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -3353,6 +3353,8 @@ static irqreturn_t wm8962_irq(int irq, void *data) if (active & (WM8962_MICSCD_EINT | WM8962_MICD_EINT)) { dev_dbg(codec->dev, "Microphone event detected\n"); + pm_wakeup_event(codec->dev, 300); + schedule_delayed_work(&wm8962->mic_work, msecs_to_jiffies(250)); } -- 1.7.1

2 1

[alsa-devel] [PATCH] ASoC: Remove register write trace from WM8994
by Mark Brown 03 Nov '10

03 Nov '10

We now have trace in the ASoC core so we don't need to our own trace in the driver. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 3f70dee..d81cac5 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -1730,8 +1730,6 @@ static int wm8994_write(struct snd_soc_codec *codec, unsigned int reg, if (!wm8994_volatile(reg)) wm8994->reg_cache[reg] = value; - dev_dbg(codec->dev, "0x%x = 0x%x\n", reg, value); - return wm8994_reg_write(codec->control_data, reg, value); } -- 1.7.1

2 1

[alsa-devel] [PATCH] ASoC: soc-cache: Remove unnecessary debugging info
by Dimitris Papastamos 03 Nov '10

03 Nov '10

No need to print the register-value pair again, as we've already hooked snd_soc_write() for that matter. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/soc-cache.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index d214f02..8785a0c 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -50,8 +50,6 @@ static int snd_soc_4_12_write(struct snd_soc_codec *codec, unsigned int reg, return 0; } - dev_dbg(codec->dev, "0x%x = 0x%x\n", reg, value); - ret = codec->hw_write(codec->control_data, data, 2); if (ret == 2) return 0; @@ -126,8 +124,6 @@ static int snd_soc_7_9_write(struct snd_soc_codec *codec, unsigned int reg, return 0; } - dev_dbg(codec->dev, "0x%x = 0x%x\n", reg, value); - ret = codec->hw_write(codec->control_data, data, 2); if (ret == 2) return 0; @@ -186,8 +182,6 @@ static int snd_soc_8_8_write(struct snd_soc_codec *codec, unsigned int reg, return 0; } - dev_dbg(codec->dev, "0x%x = 0x%x\n", reg, value); - if (codec->hw_write(codec->control_data, data, 2) == 2) return 0; else @@ -260,8 +254,6 @@ static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg, return 0; } - dev_dbg(codec->dev, "0x%x = 0x%x\n", reg, value); - if (codec->hw_write(codec->control_data, data, 3) == 3) return 0; else @@ -455,8 +447,6 @@ static int snd_soc_16_8_write(struct snd_soc_codec *codec, unsigned int reg, return 0; } - dev_dbg(codec->dev, "0x%x = 0x%x\n", reg, value); - ret = codec->hw_write(codec->control_data, data, 3); if (ret == 3) return 0; @@ -568,8 +558,6 @@ static int snd_soc_16_16_write(struct snd_soc_codec *codec, unsigned int reg, return 0; } - dev_dbg(codec->dev, "0x%x = 0x%x\n", reg, value); - ret = codec->hw_write(codec->control_data, data, 4); if (ret == 4) return 0; -- 1.7.3.2

2 1

[alsa-devel] [PATCH] ASoC: Push snd_soc_write() and snd_soc_read() into the source file
by Mark Brown 03 Nov '10

03 Nov '10

Facilitating adding trace type stuff. For a first pass add some dev_dbg() statements into them. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- include/sound/soc.h | 14 +++----------- sound/soc/soc-core.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 5c3bce8..aaf34d7 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -639,17 +639,9 @@ struct soc_enum { }; /* codec IO */ -static inline unsigned int snd_soc_read(struct snd_soc_codec *codec, - unsigned int reg) -{ - return codec->driver->read(codec, reg); -} - -static inline unsigned int snd_soc_write(struct snd_soc_codec *codec, - unsigned int reg, unsigned int val) -{ - return codec->driver->write(codec, reg, val); -} +unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg); +unsigned int snd_soc_write(struct snd_soc_codec *codec, + unsigned int reg, unsigned int val); /* device driver data */ diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 805343f..6d93d44 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1876,6 +1876,25 @@ void snd_soc_free_ac97_codec(struct snd_soc_codec *codec) } EXPORT_SYMBOL_GPL(snd_soc_free_ac97_codec); +unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg) +{ + unsigned int ret; + + ret = codec->driver->read(codec, reg); + dev_dbg(codec->dev, "read %x => %x\n", reg, ret); + + return ret; +} +EXPORT_SYMBOL_GPL(snd_soc_read); + +unsigned int snd_soc_write(struct snd_soc_codec *codec, + unsigned int reg, unsigned int val) +{ + dev_dbg(codec->dev, "write %x = %x\n", reg, val); + return codec->driver->write(codec, reg, val); +} +EXPORT_SYMBOL_GPL(snd_soc_write); + /** * snd_soc_update_bits - update codec register bits * @codec: audio codec -- 1.7.1

2 2

[alsa-devel] [PATCH] ASoC: tpa6130a2: Fix unbalanced regulator disables
by Jarkko Nikula 03 Nov '10

03 Nov '10

This driver has unbalanced regulator_disable when doing module loading and unloading. This is because tpa6130a2_probe followed by tpa6130a2_remove calls twice tpa6130a2_power(0). Fix this by implementing a state checking in tpa6130a2_power. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> Cc: Peter Ujfalusi <peter.ujfalusi(a)nokia.com> --- sound/soc/codecs/tpa6130a2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c index 329acc1..83b5631 100644 --- a/sound/soc/codecs/tpa6130a2.c +++ b/sound/soc/codecs/tpa6130a2.c @@ -125,7 +125,7 @@ static int tpa6130a2_power(int power) data = i2c_get_clientdata(tpa6130a2_client); mutex_lock(&data->mutex); - if (power) { + if (power && !data->power_state) { /* Power on */ if (data->power_gpio >= 0) gpio_set_value(data->power_gpio, 1); @@ -153,7 +153,7 @@ static int tpa6130a2_power(int power) val = tpa6130a2_read(TPA6130A2_REG_CONTROL); val &= ~TPA6130A2_SWS; tpa6130a2_i2c_write(TPA6130A2_REG_CONTROL, val); - } else { + } else if (!power && data->power_state) { /* set SWS */ val = tpa6130a2_read(TPA6130A2_REG_CONTROL); val |= TPA6130A2_SWS; -- 1.7.1

5 7

[alsa-devel] [PATCH 1/2] ASoC: tlv320aic3x: Use gpio_is_valid in checking for valid gpio_reset
by Jarkko Nikula 03 Nov '10

03 Nov '10

I promised to convert this at some point. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> --- sound/soc/codecs/tlv320aic3x.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index fc68779..157b534 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1075,7 +1075,7 @@ static int aic3x_regulator_event(struct notifier_block *nb, * Put codec to reset and require cache sync as at least one * of the supplies was disabled */ - if (aic3x->gpio_reset >= 0) + if (gpio_is_valid(aic3x->gpio_reset)) gpio_set_value(aic3x->gpio_reset, 0); aic3x->codec->cache_sync = 1; } @@ -1102,7 +1102,7 @@ static int aic3x_set_power(struct snd_soc_codec *codec, int power) if (!codec->cache_sync) goto out; - if (aic3x->gpio_reset >= 0) { + if (gpio_is_valid(aic3x->gpio_reset)) { udelay(1); gpio_set_value(aic3x->gpio_reset, 1); } @@ -1359,7 +1359,7 @@ static int aic3x_probe(struct snd_soc_codec *codec) return ret; } - if (aic3x->gpio_reset >= 0) { + if (gpio_is_valid(aic3x->gpio_reset)) { ret = gpio_request(aic3x->gpio_reset, "tlv320aic3x reset"); if (ret != 0) goto err_gpio; @@ -1414,7 +1414,7 @@ err_notif: &aic3x->disable_nb[i].nb); regulator_bulk_free(ARRAY_SIZE(aic3x->supplies), aic3x->supplies); err_get: - if (aic3x->gpio_reset >= 0) + if (gpio_is_valid(aic3x->gpio_reset)) gpio_free(aic3x->gpio_reset); err_gpio: kfree(aic3x); @@ -1427,7 +1427,7 @@ static int aic3x_remove(struct snd_soc_codec *codec) int i; aic3x_set_bias_level(codec, SND_SOC_BIAS_OFF); - if (aic3x->gpio_reset >= 0) { + if (gpio_is_valid(aic3x->gpio_reset)) { gpio_set_value(aic3x->gpio_reset, 0); gpio_free(aic3x->gpio_reset); } -- 1.7.2.3

3 4