Commit 1528fbb5 authored by Eliot Blennerhassett's avatar Eliot Blennerhassett Committed by Takashi Iwai

ALSA: asihpi - Checkpatch line lengths etc.

Signed-off-by: default avatarEliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 14652e67
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
#define HPI_HIF_ERROR_MASK 0x4000 #define HPI_HIF_ERROR_MASK 0x4000
/* HPI6000 specific error codes */ /* HPI6000 specific error codes */
#define HPI6000_ERROR_BASE 900 /* not actually used anywhere */ #define HPI6000_ERROR_BASE 900 /* not actually used anywhere */
/* operational/messaging errors */ /* operational/messaging errors */
#define HPI6000_ERROR_MSG_RESP_IDLE_TIMEOUT 901 #define HPI6000_ERROR_MSG_RESP_IDLE_TIMEOUT 901
......
...@@ -46,17 +46,19 @@ static struct hpi_adapters_list adapters; ...@@ -46,17 +46,19 @@ static struct hpi_adapters_list adapters;
u16 hpi_validate_response(struct hpi_message *phm, struct hpi_response *phr) u16 hpi_validate_response(struct hpi_message *phm, struct hpi_response *phr)
{ {
if (phr->type != HPI_TYPE_RESPONSE) { if (phr->type != HPI_TYPE_RESPONSE) {
HPI_DEBUG_LOG(ERROR, "header type %d invalid", phr->type); HPI_DEBUG_LOG(ERROR, "header type %d invalid\n", phr->type);
return HPI_ERROR_INVALID_RESPONSE; return HPI_ERROR_INVALID_RESPONSE;
} }
if (phr->object != phm->object) { if (phr->object != phm->object) {
HPI_DEBUG_LOG(ERROR, "header object %d invalid", phr->object); HPI_DEBUG_LOG(ERROR, "header object %d invalid\n",
phr->object);
return HPI_ERROR_INVALID_RESPONSE; return HPI_ERROR_INVALID_RESPONSE;
} }
if (phr->function != phm->function) { if (phr->function != phm->function) {
HPI_DEBUG_LOG(ERROR, "header type %d invalid", phr->function); HPI_DEBUG_LOG(ERROR, "header type %d invalid\n",
phr->function);
return HPI_ERROR_INVALID_RESPONSE; return HPI_ERROR_INVALID_RESPONSE;
} }
...@@ -114,7 +116,7 @@ struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index) ...@@ -114,7 +116,7 @@ struct hpi_adapter_obj *hpi_find_adapter(u16 adapter_index)
struct hpi_adapter_obj *pao = NULL; struct hpi_adapter_obj *pao = NULL;
if (adapter_index >= HPI_MAX_ADAPTERS) { if (adapter_index >= HPI_MAX_ADAPTERS) {
HPI_DEBUG_LOG(VERBOSE, "find_adapter invalid index %d ", HPI_DEBUG_LOG(VERBOSE, "find_adapter invalid index %d\n",
adapter_index); adapter_index);
return NULL; return NULL;
} }
...@@ -203,9 +205,10 @@ static unsigned int control_cache_alloc_check(struct hpi_control_cache *pC) ...@@ -203,9 +205,10 @@ static unsigned int control_cache_alloc_check(struct hpi_control_cache *pC)
pC->adap_idx); pC->adap_idx);
return 0; return 0;
} }
/* ? This is a severe error, the cache is probably /* The cache is invalid.
corrupted. Minimum valid entry size is * Minimum valid entry size is
sizeof(struct hpi_control_cache_info) */ * sizeof(struct hpi_control_cache_info)
*/
HPI_DEBUG_LOG(ERROR, HPI_DEBUG_LOG(ERROR,
"adap %d zero size cache entry %d\n", "adap %d zero size cache entry %d\n",
pC->adap_idx, i); pC->adap_idx, i);
...@@ -226,9 +229,10 @@ static unsigned int control_cache_alloc_check(struct hpi_control_cache *pC) ...@@ -226,9 +229,10 @@ static unsigned int control_cache_alloc_check(struct hpi_control_cache *pC)
info->control_index, info->control_type, info->control_index, info->control_type,
info->size_in32bit_words); info->size_in32bit_words);
/* quit loop early if whole cache has been scanned. */ /* quit loop early if whole cache has been scanned.
/* pC->dwControlCount is the maximum possible entries, */ * dwControlCount is the maximum possible entries
/* but some may not be in the cache at all */ * but some may be absent from the cache
*/
if (byte_count >= pC->cache_size_in_bytes) if (byte_count >= pC->cache_size_in_bytes)
break; break;
/* have seen last control index */ /* have seen last control index */
...@@ -238,15 +242,15 @@ static unsigned int control_cache_alloc_check(struct hpi_control_cache *pC) ...@@ -238,15 +242,15 @@ static unsigned int control_cache_alloc_check(struct hpi_control_cache *pC)
if (byte_count != pC->cache_size_in_bytes) if (byte_count != pC->cache_size_in_bytes)
HPI_DEBUG_LOG(WARNING, HPI_DEBUG_LOG(WARNING,
"adap %d bytecount %d != cache size %d", "adap %d bytecount %d != cache size %d\n",
pC->adap_idx, byte_count, pC->adap_idx, byte_count,
pC->cache_size_in_bytes); pC->cache_size_in_bytes);
else else
HPI_DEBUG_LOG(DEBUG, HPI_DEBUG_LOG(DEBUG,
"adap %d cache good, bytecount == cache size = %d", "adap %d cache good, bytecount == cache size = %d\n",
pC->adap_idx, byte_count); pC->adap_idx, byte_count);
pC->init = cached; pC->init = (u16)cached;
} }
return pC->init; return pC->init;
} }
...@@ -430,7 +434,6 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache, ...@@ -430,7 +434,6 @@ short hpi_check_control_cache(struct hpi_control_cache *p_cache,
case HPI_CONTROL_SILENCEDETECTOR: case HPI_CONTROL_SILENCEDETECTOR:
if (phm->u.c.attribute == HPI_SILENCEDETECTOR_STATE) { if (phm->u.c.attribute == HPI_SILENCEDETECTOR_STATE) {
phr->u.c.param1 = pC->u.silence.state; phr->u.c.param1 = pC->u.silence.state;
/*? phr->u.c.dwParam2 = pC->u.silence.dwCount; */
} else } else
found = 0; found = 0;
break; break;
......
...@@ -48,7 +48,7 @@ int hpi_debug_level_get(void) ...@@ -48,7 +48,7 @@ int hpi_debug_level_get(void)
void hpi_debug_message(struct hpi_message *phm, char *sz_fileline) void hpi_debug_message(struct hpi_message *phm, char *sz_fileline)
{ {
if (phm) { if (phm) {
printk("HPI_MSG%d,%d,%d,%d,%d\n", phm->version, printk(KERN_DEBUG "HPI_MSG%d,%d,%d,%d,%d\n", phm->version,
phm->adapter_index, phm->obj_index, phm->function, phm->adapter_index, phm->obj_index, phm->function,
phm->u.c.attribute); phm->u.c.attribute);
} }
......
...@@ -80,17 +80,17 @@ void hpi_debug_data(u16 *pdata, u32 len); ...@@ -80,17 +80,17 @@ void hpi_debug_data(u16 *pdata, u32 len);
#define HPI_DEBUG_MESSAGE(level, phm) \ #define HPI_DEBUG_MESSAGE(level, phm) \
do { \ do { \
if (hpi_debug_level >= HPI_DEBUG_LEVEL_##level) { \ if (hpi_debug_level >= HPI_DEBUG_LEVEL_##level) { \
hpi_debug_message(phm,HPI_DEBUG_FLAG_##level \ hpi_debug_message(phm, HPI_DEBUG_FLAG_##level \
FILE_LINE __stringify(level)); \ FILE_LINE __stringify(level)); \
} \ } \
} while (0) } while (0)
#define HPI_DEBUG_RESPONSE(phr) \ #define HPI_DEBUG_RESPONSE(phr) \
do { \ do { \
if (((hpi_debug_level >= HPI_DEBUG_LEVEL_DEBUG) && (phr->error)) ||\ if (((hpi_debug_level >= HPI_DEBUG_LEVEL_DEBUG) && \
(phr->error)) ||\
(hpi_debug_level >= HPI_DEBUG_LEVEL_VERBOSE)) \ (hpi_debug_level >= HPI_DEBUG_LEVEL_VERBOSE)) \
printk(KERN_DEBUG\ printk(KERN_DEBUG "HPI_RES%d,%d,%d\n", \
"HPI_RES%d,%d,%d\n", \
phr->version, phr->error, phr->specific_error); \ phr->version, phr->error, phr->specific_error); \
} while (0) } while (0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment