lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: asihpi - Update error codes.

Browse Source 
Some error codes had duplicate meanings. Just use one.

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Eliot Blennerhassett
2011-02-10 17:26:03 +13:00
committed by Takashi Iwai
parent 1528fbb5dc
commit deb21a2334
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sound/pci/asihpi/hpi6205.c
View File

@@ -38,7 +38,7 @@
/*****************************************************************************/ /*****************************************************************************/
/* HPI6205 specific error codes */ /* HPI6205 specific error codes */
#define HPI6205_ERROR_BASE 1000 /* not actually used anywhere */ #define HPI6205_ERROR_BASE 1000 /* not actually used anywhere */
/* operational/messaging errors */ /* operational/messaging errors */
#define HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT 1015 #define HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT 1015
@@ -293,7 +293,7 @@ static void outstream_message(struct hpi_adapter_obj *pao,
{ {
if (phm->obj_index >= HPI_MAX_STREAMS) { if (phm->obj_index >= HPI_MAX_STREAMS) {
phr->error = HPI_ERROR_INVALID_STREAM; phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
HPI_DEBUG_LOG(WARNING, HPI_DEBUG_LOG(WARNING,
"Message referencing invalid stream %d " "Message referencing invalid stream %d "
"on adapter index %d\n", phm->obj_index, "on adapter index %d\n", phm->obj_index,
@@ -337,7 +337,7 @@ static void instream_message(struct hpi_adapter_obj *pao,
{ {
if (phm->obj_index >= HPI_MAX_STREAMS) { if (phm->obj_index >= HPI_MAX_STREAMS) {
phr->error = HPI_ERROR_INVALID_STREAM; phr->error = HPI_ERROR_INVALID_OBJ_INDEX;
HPI_DEBUG_LOG(WARNING, HPI_DEBUG_LOG(WARNING,
"Message referencing invalid stream %d " "Message referencing invalid stream %d "
"on adapter index %d\n", phm->obj_index, "on adapter index %d\n", phm->obj_index,
@@ -864,6 +864,7 @@ static void outstream_host_buffer_allocate(struct hpi_adapter_obj *pao,
status->dSP_index = 0; status->dSP_index = 0;
status->host_index = status->dSP_index; status->host_index = status->dSP_index;
status->size_in_bytes = phm->u.d.u.buffer.buffer_size; status->size_in_bytes = phm->u.d.u.buffer.buffer_size;
status->auxiliary_data_available = 0;
hw_message(pao, phm, phr); hw_message(pao, phm, phr);
@@ -995,8 +996,8 @@ static void outstream_write(struct hpi_adapter_obj *pao,
/* /*
* This version relies on the DSP code triggering an OStream buffer * This version relies on the DSP code triggering an OStream buffer
* update immediately following a SET_FORMAT call. The host has * update immediately following a SET_FORMAT call. The host has
* already written data into the BBM buffer, but the DSP won't know about * already written data into the BBM buffer, but the DSP won't know
* it until dwHostIndex is adjusted. * about it until dwHostIndex is adjusted.
*/ */
if (phw->flag_outstream_just_reset[phm->obj_index]) { if (phw->flag_outstream_just_reset[phm->obj_index]) {
/* Format can only change after reset. Must tell DSP. */ /* Format can only change after reset. Must tell DSP. */
@@ -1140,6 +1141,7 @@ static void instream_host_buffer_allocate(struct hpi_adapter_obj *pao,
status->dSP_index = 0; status->dSP_index = 0;
status->host_index = status->dSP_index; status->host_index = status->dSP_index;
status->size_in_bytes = phm->u.d.u.buffer.buffer_size; status->size_in_bytes = phm->u.d.u.buffer.buffer_size;
status->auxiliary_data_available = 0;
hw_message(pao, phm, phr); hw_message(pao, phm, phr);
if (phr->error if (phr->error
@@ -1982,7 +1984,7 @@ static short hpi6205_transfer_data(struct hpi_adapter_obj *pao, u8 *p_data,
struct bus_master_interface *interface = phw->p_interface_buffer; struct bus_master_interface *interface = phw->p_interface_buffer;
if (!p_data) if (!p_data)
return HPI_ERROR_INVALID_DATA_TRANSFER; return HPI_ERROR_INVALID_DATA_POINTER;
data_size &= ~3L; /* round data_size down to nearest 4 bytes */ data_size &= ~3L; /* round data_size down to nearest 4 bytes */
@@ -2122,8 +2124,7 @@ static u16 message_response_sequence(struct hpi_adapter_obj *pao,
message_count++; message_count++;
if (phm->size > sizeof(interface->u)) { if (phm->size > sizeof(interface->u)) {
/* really MESSAGE buffer too small */ phr->error = HPI_ERROR_MESSAGE_BUFFER_TOO_SMALL;
phr->error = HPI_ERROR_RESPONSE_BUFFER_TOO_SMALL;
phr->specific_error = sizeof(interface->u); phr->specific_error = sizeof(interface->u);
phr->size = sizeof(struct hpi_response_header); phr->size = sizeof(struct hpi_response_header);
HPI_DEBUG_LOG(ERROR, HPI_DEBUG_LOG(ERROR,