diff options
author | Eliot Blennerhassett <eblennerhassett@audioscience.com> | 2010-04-16 10:27:57 +1200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 11:16:57 +0200 |
commit | fbc3e7d25847b334f79fd3eae5162a7a31cd3191 (patch) | |
tree | 7293568076f092923d235c3ce143e613c426a030 | |
parent | 2afa3a921bf022e43c72b1a9e78eefc6c4fe1b4d (diff) | |
download | alsa-driver-build-unstable-fbc3e7d25847b334f79fd3eae5162a7a31cd3191.tar.gz |
ALSA: asihpi - checkpatch, no parens on return value
Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | pci/asihpi/asihpi.c | 18 | ||||
-rw-r--r-- | pci/asihpi/hpi6000.c | 32 | ||||
-rw-r--r-- | pci/asihpi/hpi6205.c | 63 | ||||
-rw-r--r-- | pci/asihpi/hpicmn.c | 6 | ||||
-rw-r--r-- | pci/asihpi/hpidebug.c | 4 | ||||
-rw-r--r-- | pci/asihpi/hpidspcd.c | 8 | ||||
-rw-r--r-- | pci/asihpi/hpifunc.c | 8 |
7 files changed, 69 insertions, 70 deletions
diff --git a/pci/asihpi/asihpi.c b/pci/asihpi/asihpi.c index 8aa1231c8..e7604d772 100644 --- a/pci/asihpi/asihpi.c +++ b/pci/asihpi/asihpi.c @@ -199,7 +199,7 @@ static u16 hpi_stream_host_buffer_attach( hm.u.d.u.buffer.pci_address = pci_address; hm.u.d.u.buffer.command = HPI_BUFFER_CMD_INTERNAL_GRANTADAPTER; hpi_send_recv(&hm, &hr); - return(hr.error); + return hr.error; } static u16 hpi_stream_host_buffer_detach( @@ -223,7 +223,7 @@ static u16 hpi_stream_host_buffer_detach( &hm.obj_index); hm.u.d.u.buffer.command = HPI_BUFFER_CMD_INTERNAL_REVOKEADAPTER; hpi_send_recv(&hm, &hr); - return(hr.error); + return hr.error; } static inline u16 hpi_stream_start(struct hpi_hsubsys *hS, u32 h_stream) @@ -1539,7 +1539,7 @@ static int __devinit snd_asihpi_volume_add(struct snd_card_asihpi *asihpi, snd_control.put = snd_asihpi_volume_put; snd_control.tlv.p = db_scale_100; - return (ctl_add(card, &snd_control, asihpi)); + return ctl_add(card, &snd_control, asihpi); } /*------------------------------------------------------------ @@ -1622,7 +1622,7 @@ static int __devinit snd_asihpi_level_add(struct snd_card_asihpi *asihpi, snd_control.put = snd_asihpi_level_put; snd_control.tlv.p = db_scale_level; - return (ctl_add(card, &snd_control, asihpi)); + return ctl_add(card, &snd_control, asihpi); } /*------------------------------------------------------------ @@ -2043,7 +2043,7 @@ static int __devinit snd_asihpi_tuner_add(struct snd_card_asihpi *asihpi, snd_control.get = snd_asihpi_tuner_freq_get; snd_control.put = snd_asihpi_tuner_freq_put; - return (ctl_add(card, &snd_control, asihpi)); + return ctl_add(card, &snd_control, asihpi); } /*------------------------------------------------------------ @@ -2142,7 +2142,7 @@ static int snd_card_asihpi_mux_count_sources(struct snd_kcontrol *snd_control) if (err) break; } - return (s); + return s; } static int snd_asihpi_mux_info(struct snd_kcontrol *kcontrol, @@ -2236,7 +2236,7 @@ static int __devinit snd_asihpi_mux_add(struct snd_card_asihpi *asihpi, snd_control.get = snd_asihpi_mux_get; snd_control.put = snd_asihpi_mux_put; - return (ctl_add(card, &snd_control, asihpi)); + return ctl_add(card, &snd_control, asihpi); } @@ -2314,7 +2314,7 @@ static int __devinit snd_asihpi_cmode_add(struct snd_card_asihpi *asihpi, snd_control.get = snd_asihpi_cmode_get; snd_control.put = snd_asihpi_cmode_put; - return (ctl_add(card, &snd_control, asihpi)); + return ctl_add(card, &snd_control, asihpi); } /*------------------------------------------------------------ @@ -2544,7 +2544,7 @@ static int __devinit snd_asihpi_sampleclock_add(struct snd_card_asihpi *asihpi, snd_control.info = snd_asihpi_clkrate_info; snd_control.get = snd_asihpi_clkrate_get; - return (ctl_add(card, &snd_control, asihpi)); + return ctl_add(card, &snd_control, asihpi); } /*------------------------------------------------------------ Mixer diff --git a/pci/asihpi/hpi6000.c b/pci/asihpi/hpi6000.c index 3a0c651c7..4ce1e93d7 100644 --- a/pci/asihpi/hpi6000.c +++ b/pci/asihpi/hpi6000.c @@ -1,7 +1,7 @@ /****************************************************************************** AudioScience HPI driver - Copyright (C) 1997-2003 AudioScience Inc. <support@audioscience.com> + Copyright (C) 1997-2010 AudioScience Inc. <support@audioscience.com> This program is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as @@ -566,7 +566,7 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao, boot_error = hpi6000_adapter_boot_load_dsp(pao, pos_error_code); if (boot_error) - return (boot_error); + return boot_error; HPI_DEBUG_LOG(INFO, "bootload DSP OK\n"); @@ -596,7 +596,7 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao, error = hpi6000_message_response_sequence(pao, 0, &hM, &hR0); if (hR0.error) { HPI_DEBUG_LOG(DEBUG, "message error %d\n", hR0.error); - return (hR0.error); /*error */ + return hR0.error; } if (phw->num_dsp == 2) { error = hpi6000_message_response_sequence(pao, 1, &hM, @@ -696,7 +696,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, boot_load_family = HPI_ADAPTER_FAMILY_ASI(0x8800); break; default: - return (HPI6000_ERROR_UNHANDLED_SUBSYS_ID); + return HPI6000_ERROR_UNHANDLED_SUBSYS_ID; } /* reset all DSPs, indicate two DSPs are present @@ -715,7 +715,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, if (delay != dw2040_reset) { HPI_DEBUG_LOG(ERROR, "INIT_PCI2040 %x %x\n", dw2040_reset, delay); - return (HPI6000_ERROR_INIT_PCI2040); + return HPI6000_ERROR_INIT_PCI2040; } /* Indicate that DSP#0,1 is a C6X */ @@ -763,7 +763,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, if (data != test_data) { HPI_DEBUG_LOG(ERROR, "INIT_DSPHPI %x %x %x\n", test_data, data, dsp_index); - return (HPI6000_ERROR_INIT_DSPHPI); + return HPI6000_ERROR_INIT_DSPHPI; } test_data = test_data << 1; } @@ -825,7 +825,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, test_addr + i, test_data, data, dsp_index); - return (HPI6000_ERROR_INIT_DSPINTMEM); + return HPI6000_ERROR_INIT_DSPINTMEM; } test_data = test_data << 1; } @@ -945,7 +945,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, test_addr, test_data, data, dsp_index); - return (HPI6000_ERROR_INIT_SDRAM1); + return HPI6000_ERROR_INIT_SDRAM1; } test_data = test_data << 1; } @@ -967,7 +967,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, "DSP dram %x %x %x %x\n", test_addr + i, test_data, data, dsp_index); - return (HPI6000_ERROR_INIT_SDRAM2); + return HPI6000_ERROR_INIT_SDRAM2; } test_data++; } @@ -982,7 +982,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, pos_error_code); if (error) - return (error); + return error; while (1) { u32 length; @@ -1014,7 +1014,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, if (error) { hpi_dsp_code_close(&dsp_code); - return (error); + return error; } /* verify that code was written correctly */ /* this time through, assume no errors in DSP code file/array */ @@ -1051,7 +1051,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, } hpi_dsp_code_close(&dsp_code); if (error) - return (error); + return error; /* zero out the hostmailbox */ { @@ -1104,7 +1104,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, hpios_delay_micro_seconds(1000); } if (timeout == 0) - return (HPI6000_ERROR_INIT_NOACK); + return HPI6000_ERROR_INIT_NOACK; /* read the DSP adapter Info from the */ /* hostmailbox structure after starting the DSP */ @@ -1150,7 +1150,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, if (read != test_data) { HPI_DEBUG_LOG(ERROR, "PLD %x %x\n", test_data, read); - return (HPI6000_ERROR_INIT_PLDTEST1); + return HPI6000_ERROR_INIT_PLDTEST1; } test_data = 0x55555500L & mask; hpi_write_word(pdo, PLD_BASE_ADDRESS + 4L, test_data); @@ -1159,7 +1159,7 @@ static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao, if (read != test_data) { HPI_DEBUG_LOG(ERROR, "PLD %x %x\n", test_data, read); - return (HPI6000_ERROR_INIT_PLDTEST2); + return HPI6000_ERROR_INIT_PLDTEST2; } } } /* for numDSP */ @@ -1203,7 +1203,7 @@ static u32 hpi_read_word(struct dsp_obj *pdo, u32 address) /* take care of errata in revB DSP (2.0.1) */ data = ioread32(pdo->prHPI_data); - return (data); + return data; } /* write a block of 32bit words to the DSP HPI port using auto-inc mode */ diff --git a/pci/asihpi/hpi6205.c b/pci/asihpi/hpi6205.c index 83ce029c4..43ef85b65 100644 --- a/pci/asihpi/hpi6205.c +++ b/pci/asihpi/hpi6205.c @@ -1,7 +1,7 @@ /****************************************************************************** AudioScience HPI driver - Copyright (C) 1997-2003 AudioScience Inc. <support@audioscience.com> + Copyright (C) 1997-2010 AudioScience Inc. <support@audioscience.com> This program is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as @@ -585,13 +585,13 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao, if (err) /* no need to clean up as SubSysCreateAdapter */ /* calls DeleteAdapter on error. */ - return (err); + return err; HPI_DEBUG_LOG(INFO, "load DSP code OK\n"); /* allow boot load even if mem alloc wont work */ if (!phw->p_interface_buffer) - return (hpi6205_error(0, HPI_ERROR_MEMORY_ALLOC)); + return hpi6205_error(0, HPI_ERROR_MEMORY_ALLOC); interface = phw->p_interface_buffer; @@ -609,7 +609,7 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao, HPI_DEBUG_LOG(ERROR, "timed out waiting for interrupt " "confirming DSP code running\n"); - return (hpi6205_error(0, HPI6205_ERROR_6205_NO_IRQ)); + return hpi6205_error(0, HPI6205_ERROR_6205_NO_IRQ); } /* reset the interrupt */ @@ -619,7 +619,7 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao, /* make sure the DSP has started ok */ if (!wait_dsp_ack(phw, H620_HIF_RESET, HPI6205_TIMEOUT * 10)) { HPI_DEBUG_LOG(ERROR, "timed out waiting reset state \n"); - return (hpi6205_error(0, HPI6205_ERROR_6205_INIT_FAILED)); + return hpi6205_error(0, HPI6205_ERROR_6205_INIT_FAILED); } /* Note that *pao, *phw are zeroed after allocation, * so pointers and flags are NULL by default. @@ -709,10 +709,10 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao, if (err) { HPI_DEBUG_LOG(ERROR, "message transport error %d\n", err); - return (err); + return err; } if (hR.error) - return (hR.error); + return hR.error; pao->adapter_type = hR.u.a.adapter_type; pao->index = hR.u.a.adapter_index; @@ -731,7 +731,7 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao, pao->open = 0; /* upon creation the adapter is closed */ HPI_DEBUG_LOG(INFO, "bootload DSP OK\n"); - return (0); + return 0; } /** Free memory areas allocated by adapter @@ -1440,26 +1440,26 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao, err = boot_loader_config_emif(pao, dsp); if (err) - return (err); + return err; err = boot_loader_test_internal_memory(pao, dsp); if (err) - return (err); + return err; err = boot_loader_test_external_memory(pao, dsp); if (err) - return (err); + return err; err = boot_loader_test_pld(pao, dsp); if (err) - return (err); + return err; /* write the DSP code down into the DSPs memory */ dsp_code.ps_dev = pao->pci.p_os_data; err = hpi_dsp_code_open(boot_code_id[dsp], &dsp_code, pos_error_code); if (err) - return (err); + return err; while (1) { u32 length; @@ -1500,7 +1500,7 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao, } if (err) { hpi_dsp_code_close(&dsp_code); - return (err); + return err; } /* verify code */ @@ -1535,7 +1535,7 @@ static u16 adapter_boot_load_dsp(struct hpi_adapter_obj *pao, } hpi_dsp_code_close(&dsp_code); if (err) - return (err); + return err; } /* After bootloading all DSPs, start DSP0 running @@ -1899,7 +1899,7 @@ static u16 boot_loader_test_memory(struct hpi_adapter_obj *pao, int dsp_index, "memtest error details " "%08x %08x %08x %i\n", test_addr, test_data, data, dsp_index); - return (1); /* error */ + return 1; /* error */ } test_data = test_data << 1; } /* for(j) */ @@ -1919,7 +1919,7 @@ static u16 boot_loader_test_memory(struct hpi_adapter_obj *pao, int dsp_index, "memtest error details " "%08x %08x %08x %i\n", test_addr, test_data, data, dsp_index); - return (1); /* error */ + return 1; /* error */ } /* leave location as zero */ boot_loader_write_mem32(pao, dsp_index, test_addr, 0x0); @@ -1930,7 +1930,7 @@ static u16 boot_loader_test_memory(struct hpi_adapter_obj *pao, int dsp_index, test_addr = start_address + i * 4; boot_loader_write_mem32(pao, dsp_index, test_addr, 0x0); } - return (0); /*success! */ + return 0; } static u16 boot_loader_test_internal_memory(struct hpi_adapter_obj *pao, @@ -1959,7 +1959,7 @@ static u16 boot_loader_test_internal_memory(struct hpi_adapter_obj *pao, return hpi6205_error(dsp_index, HPI6205_ERROR_BAD_DSPINDEX); if (err) - return (hpi6205_error(dsp_index, HPI6205_ERROR_DSP_INTMEM)); + return hpi6205_error(dsp_index, HPI6205_ERROR_DSP_INTMEM); else return 0; } @@ -1978,7 +1978,7 @@ static u16 boot_loader_test_external_memory(struct hpi_adapter_obj *pao, dRAM_size = 0x200000; /*dwDRAMinc=1024; */ } else - return (0); + return 0; } else if ((dsp_index == 1) || (dsp_index == 2)) { /* DSP 1 is a C6713 */ dRAM_start_address = 0x80000000; @@ -1989,7 +1989,7 @@ static u16 boot_loader_test_external_memory(struct hpi_adapter_obj *pao, if (boot_loader_test_memory(pao, dsp_index, dRAM_start_address, dRAM_size)) - return (hpi6205_error(dsp_index, HPI6205_ERROR_DSP_EXTMEM)); + return hpi6205_error(dsp_index, HPI6205_ERROR_DSP_EXTMEM); return 0; } @@ -2003,13 +2003,13 @@ static u16 boot_loader_test_pld(struct hpi_adapter_obj *pao, int dsp_index) data = boot_loader_read_mem32(pao, dsp_index, 0x03000008); if ((data & 0xF) != 0x5) - return (hpi6205_error(dsp_index, - HPI6205_ERROR_DSP_PLD)); + return hpi6205_error(dsp_index, + HPI6205_ERROR_DSP_PLD); data = boot_loader_read_mem32(pao, dsp_index, 0x0300000C); if ((data & 0xF) != 0xA) - return (hpi6205_error(dsp_index, - HPI6205_ERROR_DSP_PLD)); + return hpi6205_error(dsp_index, + HPI6205_ERROR_DSP_PLD); } } else if (dsp_index == 1) { /* DSP 1 is a C6713 */ @@ -2018,14 +2018,14 @@ static u16 boot_loader_test_pld(struct hpi_adapter_obj *pao, int dsp_index) data = boot_loader_read_mem32(pao, dsp_index, 0x90000010); if ((data & 0xFF) != 0xAA) - return (hpi6205_error(dsp_index, - HPI6205_ERROR_DSP_PLD)); + return hpi6205_error(dsp_index, + HPI6205_ERROR_DSP_PLD); /* 8713 - LED on */ boot_loader_write_mem32(pao, dsp_index, 0x90000000, 0x02); } } - return (0); + return 0; } /** Transfer data to or from DSP @@ -2188,8 +2188,7 @@ static u16 message_response_sequence(struct hpi_adapter_obj *pao, if (!wait_dsp_ack(phw, H620_HIF_IDLE, HPI6205_TIMEOUT)) { HPI_DEBUG_LOG(DEBUG, "timeout waiting for idle\n"); - return (hpi6205_error(0, - HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT)); + return hpi6205_error(0, HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT); } interface->u.message_buffer = *phm; /* signal we want a response */ @@ -2259,8 +2258,8 @@ static u16 message_response_sequence(struct hpi_adapter_obj *pao, HPI_DEBUG_LOG(DEBUG, "timeout waiting for idle " "(on adapter_close)\n"); - return (hpi6205_error(0, - HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT)); + return hpi6205_error(0, + HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT); } } err = hpi_validate_response(phm, phr); diff --git a/pci/asihpi/hpicmn.c b/pci/asihpi/hpicmn.c index f4efea4b6..6b666372f 100644 --- a/pci/asihpi/hpicmn.c +++ b/pci/asihpi/hpicmn.c @@ -1,7 +1,7 @@ /****************************************************************************** AudioScience HPI driver - Copyright (C) 1997-2003 AudioScience Inc. <support@audioscience.com> + Copyright (C) 1997-2010 AudioScience Inc. <support@audioscience.com> This program is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as @@ -110,13 +110,13 @@ struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index) HPI_DEBUG_LOG(VERBOSE, "Found adapter index %d\n", wAdapterIndex); */ - return (pao); + return pao; } else { /* HPI_DEBUG_LOG(VERBOSE, "No adapter index %d\n", wAdapterIndex); */ - return (NULL); + return NULL; } } diff --git a/pci/asihpi/hpidebug.c b/pci/asihpi/hpidebug.c index 6b62d772b..a2544c9fd 100644 --- a/pci/asihpi/hpidebug.c +++ b/pci/asihpi/hpidebug.c @@ -1,7 +1,7 @@ /************************************************************************ AudioScience HPI driver - Copyright (C) 1997-2003 AudioScience Inc. <support@audioscience.com> + Copyright (C) 1997-2010 AudioScience Inc. <support@audioscience.com> This program is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as @@ -42,7 +42,7 @@ int hpi_debug_level_set(int level) int hpi_debug_level_get(void) { - return (hpi_debug_level); + return hpi_debug_level; } #ifdef HPIOS_DEBUG_PRINT diff --git a/pci/asihpi/hpidspcd.c b/pci/asihpi/hpidspcd.c index a478be306..4a8935cbe 100644 --- a/pci/asihpi/hpidspcd.c +++ b/pci/asihpi/hpidspcd.c @@ -2,7 +2,7 @@ /*! AudioScience HPI driver - Copyright (C) 1997-2003 AudioScience Inc. <support@audioscience.com> + Copyright (C) 1997-2010 AudioScience Inc. <support@audioscience.com> This program is free software; you can redistribute it and/or modify it under the terms of version 2 of the GNU General Public License as @@ -128,7 +128,7 @@ error2: error1: ps_dsp_code->ps_firmware = NULL; ps_dsp_code->block_length = 0; - return (HPI_ERROR_DSP_FILE_NOT_FOUND); + return HPI_ERROR_DSP_FILE_NOT_FOUND; } /*-------------------------------------------------------------------*/ @@ -166,11 +166,11 @@ short hpi_dsp_code_read_block(size_t words_requested, { if (ps_dsp_code->word_count + words_requested > ps_dsp_code->block_length) - return (HPI_ERROR_DSP_FILE_FORMAT); + return HPI_ERROR_DSP_FILE_FORMAT; *ppblock = ((u32 *)(ps_dsp_code->ps_firmware->data)) + ps_dsp_code->word_count; ps_dsp_code->word_count += words_requested; - return (0); + return 0; } diff --git a/pci/asihpi/hpifunc.c b/pci/asihpi/hpifunc.c index 6932459f7..4e0f76df5 100644 --- a/pci/asihpi/hpifunc.c +++ b/pci/asihpi/hpifunc.c @@ -110,10 +110,10 @@ struct hpi_hsubsys *hpi_subsys_create(void hpi_send_recv(&hm, &hr); if (hr.error == 0) - return (&gh_subsys); + return &gh_subsys; } - return (NULL); + return NULL; } void hpi_subsys_free(const struct hpi_hsubsys *ph_subsys) @@ -2346,7 +2346,7 @@ u16 hpi_microphone_get_phantom_power(const struct hpi_hsubsys *ph_subsys, HPI_MICROPHONE_PHANTOM_POWER, &on_off); if (pw_on_off) *pw_on_off = (u16)on_off; - return (error); + return error; } u16 hpi_multiplexer_set_source(const struct hpi_hsubsys *ph_subsys, @@ -3617,7 +3617,7 @@ u16 hpi_async_event_wait(const struct hpi_hsubsys *ph_subsys, u32 h_async, u16 maximum_events, struct hpi_async_event *p_events, u16 *pw_number_returned) { - return (0); + return 0; } u16 hpi_async_event_get_count(const struct hpi_hsubsys *ph_subsys, |