Commit 44cc4a01 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Takashi Iwai
Browse files

ALSA: squash lines for simple wrapper functions 



Remove unneeded variables and assignments.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f3f6c614

sound/aoa/fabrics/layout.c

+1 −6
Original line number Diff line number Diff line
@@ -1169,12 +1169,7 @@ static struct soundbus_driver aoa_soundbus_driver = { 


static int __init aoa_fabric_layout_init(void)

{

	int err;



	err = soundbus_register_driver(&aoa_soundbus_driver);

	if (err)

		return err;

	return 0;

	return soundbus_register_driver(&aoa_soundbus_driver);

}



static void __exit aoa_fabric_layout_exit(void)

sound/pci/asihpi/hpifunc.c

+2 −5
Original line number Diff line number Diff line
@@ -2323,11 +2323,8 @@ u16 hpi_sample_clock_get_source_index(u32 h_control, u16 *pw_source_index) 
u16 hpi_sample_clock_query_local_rate(const u32 h_clock, const u32 index,

	u32 *prate)

{

	u16 err;

	err = hpi_control_query(h_clock, HPI_SAMPLECLOCK_LOCAL_SAMPLERATE,

	return hpi_control_query(h_clock, HPI_SAMPLECLOCK_LOCAL_SAMPLERATE,

				 index, 0, prate);



	return err;

}



u16 hpi_sample_clock_set_local_rate(u32 h_control, u32 sample_rate)

sound/pci/ctxfi/ctvmem.c

+1 −5
Original line number Diff line number Diff line
@@ -166,11 +166,7 @@ static void ct_vm_unmap(struct ct_vm *vm, struct ct_vm_block *block) 
static dma_addr_t

ct_get_ptp_phys(struct ct_vm *vm, int index)

{

	dma_addr_t addr;



	addr = (index >= CT_PTP_NUM) ? ~0UL : vm->ptp[index].addr;



	return addr;

	return (index >= CT_PTP_NUM) ? ~0UL : vm->ptp[index].addr;

}



int ct_vm_create(struct ct_vm **rvm, struct pci_dev *pci)

sound/pci/emu10k1/p16v.c

+4 −12
Original line number Diff line number Diff line
@@ -300,37 +300,29 @@ static int snd_p16v_pcm_open_capture(struct snd_pcm_substream *substream) 
static int snd_p16v_pcm_hw_params_playback(struct snd_pcm_substream *substream,

				      struct snd_pcm_hw_params *hw_params)

{

	int result;

	result = snd_pcm_lib_malloc_pages(substream,

	return snd_pcm_lib_malloc_pages(substream,

					params_buffer_bytes(hw_params));

	return result;

}



/* hw_params callback */

static int snd_p16v_pcm_hw_params_capture(struct snd_pcm_substream *substream,

				      struct snd_pcm_hw_params *hw_params)

{

	int result;

	result = snd_pcm_lib_malloc_pages(substream,

	return snd_pcm_lib_malloc_pages(substream,

					params_buffer_bytes(hw_params));

	return result;

}





/* hw_free callback */

static int snd_p16v_pcm_hw_free_playback(struct snd_pcm_substream *substream)

{

	int result;

	result = snd_pcm_lib_free_pages(substream);

	return result;

	return snd_pcm_lib_free_pages(substream);

}



/* hw_free callback */

static int snd_p16v_pcm_hw_free_capture(struct snd_pcm_substream *substream)

{

	int result;

	result = snd_pcm_lib_free_pages(substream);

	return result;

	return snd_pcm_lib_free_pages(substream);

}

sound/pci/ice1712/ice1724.c

+1 −3
Original line number Diff line number Diff line
@@ -620,9 +620,7 @@ static const unsigned int stdclock_rate_list[16] = { 


static unsigned int stdclock_get_rate(struct snd_ice1712 *ice)

{

	unsigned int rate;

	rate = stdclock_rate_list[inb(ICEMT1724(ice, RATE)) & 15];

	return rate;

	return stdclock_rate_list[inb(ICEMT1724(ice, RATE)) & 15];

}



static void stdclock_set_rate(struct snd_ice1712 *ice, unsigned int rate)