diff options
| author | Pavan Kunapuli <pkunapuli@nvidia.com> | 2010-07-23 21:29:36 +0530 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-07-23 20:27:58 -0700 |
| commit | 4127dd812a018655f73a2dd214fd86cd530388b9 (patch) | |
| tree | 11b5d96721a6a4925d000130c292ba9cf8d12778 | |
| parent | 02c0a803376731f8ad3a1330db61c44c3177e5a9 (diff) | |
odmquery:remove extra check of sdio3 is_removable
In odm query, returning the is_removable prop of sdio3
from the static array. The redundant check is removed.
This is causing locking issues between kernel and nvrm.
Bug 711837
Change-Id: I9d49a0f65ebb1de79d091badb0f316798c63c1cf
Reviewed-on: http://git-master/r/4340
Reviewed-by: Ramachandrudu Kandhala <rkandhala@nvidia.com>
Tested-by: Ramachandrudu Kandhala <rkandhala@nvidia.com>
Reviewed-by: Gary King <gking@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query.c b/arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query.c index 54d33a5f394a..52d112c34b39 100644 --- a/arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query.c +++ b/arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query.c @@ -1683,9 +1683,6 @@ NvOdmQueryGetUsbProperty(NvOdmIoModule OdmIoModule, const NvOdmQuerySdioInterfaceProperty* NvOdmQueryGetSdioInterfaceProperty(NvU32 Instance) { - NvU32 CustomerOption = 0; - NvU32 Personality = 0; - NvOdmServicesKeyListHandle hKeyList; static NvBool s_IsVoyagerBoard = NV_FALSE; NvOdmBoardInfo BoardInfo; static NvBool s_IsBoardInfoDone = NV_FALSE; @@ -1698,29 +1695,9 @@ const NvOdmQuerySdioInterfaceProperty* NvOdmQueryGetSdioInterfaceProperty(NvU32 s_IsBoardInfoDone = NV_TRUE; } - hKeyList = NvOdmServicesKeyListOpen(); - if (hKeyList) - { - CustomerOption = - NvOdmServicesGetKeyValue(hKeyList, - NvOdmKeyListId_ReservedBctCustomerOption); - NvOdmServicesKeyListClose(hKeyList); - Personality = - NV_DRF_VAL(TEGRA_DEVKIT, BCT_CUSTOPT, PERSONALITY, CustomerOption); - } - - if (!Personality) - Personality = TEGRA_DEVKIT_DEFAULT_PERSONALITY; - if (s_IsVoyagerBoard) return &s_NvOdmQuerySdioInterfaceProperty_Voyager[Instance]; - if (Personality == TEGRA_DEVKIT_BCT_CUSTOPT_0_PERSONALITY_75 || - Personality == TEGRA_DEVKIT_BCT_CUSTOPT_0_PERSONALITY_15 || - Personality == TEGRA_DEVKIT_BCT_CUSTOPT_0_PERSONALITY_05 || - Personality == TEGRA_DEVKIT_BCT_CUSTOPT_0_PERSONALITY_C3) - s_NvOdmQuerySdioInterfaceProperty_Whistler[2].IsCardRemovable = NV_TRUE; - return &s_NvOdmQuerySdioInterfaceProperty_Whistler[Instance]; } |