ALSA: squash lines for simple wrapper functions

Remove unneeded variables and assignments.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Masahiro Yamada 2016-09-06 20:41:19 +09:00 committed by Takashi Iwai
parent f3f6c61452
commit 44cc4a017e
7 changed files with 13 additions and 43 deletions

View file

@ -1169,12 +1169,7 @@ static struct soundbus_driver aoa_soundbus_driver = {
static int __init aoa_fabric_layout_init(void) static int __init aoa_fabric_layout_init(void)
{ {
int err; return soundbus_register_driver(&aoa_soundbus_driver);
err = soundbus_register_driver(&aoa_soundbus_driver);
if (err)
return err;
return 0;
} }
static void __exit aoa_fabric_layout_exit(void) static void __exit aoa_fabric_layout_exit(void)

View file

@ -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, u16 hpi_sample_clock_query_local_rate(const u32 h_clock, const u32 index,
u32 *prate) u32 *prate)
{ {
u16 err; return hpi_control_query(h_clock, HPI_SAMPLECLOCK_LOCAL_SAMPLERATE,
err = hpi_control_query(h_clock, HPI_SAMPLECLOCK_LOCAL_SAMPLERATE, index, 0, prate);
index, 0, prate);
return err;
} }
u16 hpi_sample_clock_set_local_rate(u32 h_control, u32 sample_rate) u16 hpi_sample_clock_set_local_rate(u32 h_control, u32 sample_rate)

View file

@ -166,11 +166,7 @@ static void ct_vm_unmap(struct ct_vm *vm, struct ct_vm_block *block)
static dma_addr_t static dma_addr_t
ct_get_ptp_phys(struct ct_vm *vm, int index) ct_get_ptp_phys(struct ct_vm *vm, int index)
{ {
dma_addr_t addr; return (index >= CT_PTP_NUM) ? ~0UL : vm->ptp[index].addr;
addr = (index >= CT_PTP_NUM) ? ~0UL : vm->ptp[index].addr;
return addr;
} }
int ct_vm_create(struct ct_vm **rvm, struct pci_dev *pci) int ct_vm_create(struct ct_vm **rvm, struct pci_dev *pci)

View file

@ -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, static int snd_p16v_pcm_hw_params_playback(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params) struct snd_pcm_hw_params *hw_params)
{ {
int result; return snd_pcm_lib_malloc_pages(substream,
result = snd_pcm_lib_malloc_pages(substream,
params_buffer_bytes(hw_params)); params_buffer_bytes(hw_params));
return result;
} }
/* hw_params callback */ /* hw_params callback */
static int snd_p16v_pcm_hw_params_capture(struct snd_pcm_substream *substream, static int snd_p16v_pcm_hw_params_capture(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params) struct snd_pcm_hw_params *hw_params)
{ {
int result; return snd_pcm_lib_malloc_pages(substream,
result = snd_pcm_lib_malloc_pages(substream,
params_buffer_bytes(hw_params)); params_buffer_bytes(hw_params));
return result;
} }
/* hw_free callback */ /* hw_free callback */
static int snd_p16v_pcm_hw_free_playback(struct snd_pcm_substream *substream) static int snd_p16v_pcm_hw_free_playback(struct snd_pcm_substream *substream)
{ {
int result; return snd_pcm_lib_free_pages(substream);
result = snd_pcm_lib_free_pages(substream);
return result;
} }
/* hw_free callback */ /* hw_free callback */
static int snd_p16v_pcm_hw_free_capture(struct snd_pcm_substream *substream) static int snd_p16v_pcm_hw_free_capture(struct snd_pcm_substream *substream)
{ {
int result; return snd_pcm_lib_free_pages(substream);
result = snd_pcm_lib_free_pages(substream);
return result;
} }

View file

@ -620,9 +620,7 @@ static const unsigned int stdclock_rate_list[16] = {
static unsigned int stdclock_get_rate(struct snd_ice1712 *ice) static unsigned int stdclock_get_rate(struct snd_ice1712 *ice)
{ {
unsigned int rate; return stdclock_rate_list[inb(ICEMT1724(ice, RATE)) & 15];
rate = stdclock_rate_list[inb(ICEMT1724(ice, RATE)) & 15];
return rate;
} }
static void stdclock_set_rate(struct snd_ice1712 *ice, unsigned int rate) static void stdclock_set_rate(struct snd_ice1712 *ice, unsigned int rate)

View file

@ -564,9 +564,7 @@ static int snd_ps3_pcm_hw_params(struct snd_pcm_substream *substream,
static int snd_ps3_pcm_hw_free(struct snd_pcm_substream *substream) static int snd_ps3_pcm_hw_free(struct snd_pcm_substream *substream)
{ {
int ret; return snd_pcm_lib_free_pages(substream);
ret = snd_pcm_lib_free_pages(substream);
return ret;
}; };
static int snd_ps3_delay_to_bytes(struct snd_pcm_substream *substream, static int snd_ps3_delay_to_bytes(struct snd_pcm_substream *substream,

View file

@ -184,15 +184,9 @@ struct sst_byt {
static inline u64 sst_byt_header(int msg_id, int data, bool large, int str_id) static inline u64 sst_byt_header(int msg_id, int data, bool large, int str_id)
{ {
u64 header; return IPC_HEADER_MSG_ID(msg_id) | IPC_HEADER_STR_ID(str_id) |
IPC_HEADER_LARGE(large) | IPC_HEADER_DATA(data) |
header = IPC_HEADER_MSG_ID(msg_id) | SST_BYT_IPCX_BUSY;
IPC_HEADER_STR_ID(str_id) |
IPC_HEADER_LARGE(large) |
IPC_HEADER_DATA(data) |
SST_BYT_IPCX_BUSY;
return header;
} }
static inline u16 sst_byt_header_msg_id(u64 header) static inline u16 sst_byt_header_msg_id(u64 header)