From 92ffeb633d7df9947f394e653727dd21c0316d26 Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Sat, 14 May 2011 15:12:02 +0000 Subject: [PATCH] Fix the eeprom set API method to return HAL_STATUS. The code assumed it could return HAL_OK, HAL_EINVAL and other HAL_STATUS types; so it shouldn't be declared as returning HAL_BOOL. This commit was brought to you by the Clang compiler. Submitted by: Matthew Fleming --- sys/dev/ath/ath_hal/ah_eeprom_9287.c | 2 +- sys/dev/ath/ath_hal/ah_eeprom_v1.c | 2 +- sys/dev/ath/ath_hal/ah_eeprom_v14.c | 2 +- sys/dev/ath/ath_hal/ah_eeprom_v3.c | 2 +- sys/dev/ath/ath_hal/ah_eeprom_v4k.c | 2 +- sys/dev/ath/ath_hal/ah_internal.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/ath/ath_hal/ah_eeprom_9287.c b/sys/dev/ath/ath_hal/ah_eeprom_9287.c index ed87ca318f4..e8c5e54f1b9 100644 --- a/sys/dev/ath/ath_hal/ah_eeprom_9287.c +++ b/sys/dev/ath/ath_hal/ah_eeprom_9287.c @@ -126,7 +126,7 @@ v9287EepromGet(struct ath_hal *ah, int param, void *val) #undef CHAN_B_IDX } -static HAL_BOOL +static HAL_STATUS v9287EepromSet(struct ath_hal *ah, int param, int v) { HAL_EEPROM_9287 *ee = AH_PRIVATE(ah)->ah_eeprom; diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v1.c b/sys/dev/ath/ath_hal/ah_eeprom_v1.c index 828b90b7d5f..8b4664fc980 100644 --- a/sys/dev/ath/ath_hal/ah_eeprom_v1.c +++ b/sys/dev/ath/ath_hal/ah_eeprom_v1.c @@ -68,7 +68,7 @@ v1EepromGet(struct ath_hal *ah, int param, void *val) } } -static HAL_BOOL +static HAL_STATUS v1EepromSet(struct ath_hal *ah, int param, int v) { return HAL_EINVAL; diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v14.c b/sys/dev/ath/ath_hal/ah_eeprom_v14.c index 034495a5d64..0f8a72a6f46 100644 --- a/sys/dev/ath/ath_hal/ah_eeprom_v14.c +++ b/sys/dev/ath/ath_hal/ah_eeprom_v14.c @@ -148,7 +148,7 @@ v14EepromGet(struct ath_hal *ah, int param, void *val) #undef CHAN_B_IDX } -static HAL_BOOL +static HAL_STATUS v14EepromSet(struct ath_hal *ah, int param, int v) { HAL_EEPROM_v14 *ee = AH_PRIVATE(ah)->ah_eeprom; diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v3.c b/sys/dev/ath/ath_hal/ah_eeprom_v3.c index 89a23c9f9fd..3a7b0cc2221 100644 --- a/sys/dev/ath/ath_hal/ah_eeprom_v3.c +++ b/sys/dev/ath/ath_hal/ah_eeprom_v3.c @@ -1665,7 +1665,7 @@ legacyEepromGet(struct ath_hal *ah, int param, void *val) return HAL_EINVAL; } -static HAL_BOOL +static HAL_STATUS legacyEepromSet(struct ath_hal *ah, int param, int v) { HAL_EEPROM *ee = AH_PRIVATE(ah)->ah_eeprom; diff --git a/sys/dev/ath/ath_hal/ah_eeprom_v4k.c b/sys/dev/ath/ath_hal/ah_eeprom_v4k.c index c050b53df5f..36a6e736f21 100644 --- a/sys/dev/ath/ath_hal/ah_eeprom_v4k.c +++ b/sys/dev/ath/ath_hal/ah_eeprom_v4k.c @@ -116,7 +116,7 @@ v4kEepromGet(struct ath_hal *ah, int param, void *val) #undef CHAN_B_IDX } -static HAL_BOOL +static HAL_STATUS v4kEepromSet(struct ath_hal *ah, int param, int v) { HAL_EEPROM_v4k *ee = AH_PRIVATE(ah)->ah_eeprom; diff --git a/sys/dev/ath/ath_hal/ah_internal.h b/sys/dev/ath/ath_hal/ah_internal.h index 3cfc7e625d6..b4cc8172454 100644 --- a/sys/dev/ath/ath_hal/ah_internal.h +++ b/sys/dev/ath/ath_hal/ah_internal.h @@ -269,7 +269,7 @@ struct ath_hal_private { uint16_t ah_eeversion; /* EEPROM version */ void (*ah_eepromDetach)(struct ath_hal *); HAL_STATUS (*ah_eepromGet)(struct ath_hal *, int, void *); - HAL_BOOL (*ah_eepromSet)(struct ath_hal *, int, int); + HAL_STATUS (*ah_eepromSet)(struct ath_hal *, int, int); uint16_t (*ah_getSpurChan)(struct ath_hal *, int, HAL_BOOL); HAL_BOOL (*ah_eepromDiag)(struct ath_hal *, int request, const void *args, uint32_t argsize,