iwlwifi: remove ucode virtual functions

[mv-sheeva.git] / drivers / net / wireless / iwlwifi / iwl-agn-ucode.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
index c3e3283426a914c6b426fe46862e080cfb920353..637286c396fe9c7cf992ba3c748362f74d130a81 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
@@ -182,55 +182,6 @@ int iwlagn_load_ucode(struct iwl_priv *priv)
        return ret;
 }
 
-#define IWL_UCODE_GET(item)                                            \
-static u32 iwlagn_ucode_get_##item(const struct iwl_ucode_header *ucode,\
-                                   u32 api_ver)                        \
-{                                                                      \
-       if (api_ver <= 2)                                               \
-               return le32_to_cpu(ucode->u.v1.item);                   \
-       return le32_to_cpu(ucode->u.v2.item);                           \
-}
-
-static u32 iwlagn_ucode_get_header_size(u32 api_ver)
-{
-       if (api_ver <= 2)
-               return UCODE_HEADER_SIZE(1);
-       return UCODE_HEADER_SIZE(2);
-}
-
-static u32 iwlagn_ucode_get_build(const struct iwl_ucode_header *ucode,
-                                  u32 api_ver)
-{
-       if (api_ver <= 2)
-               return 0;
-       return le32_to_cpu(ucode->u.v2.build);
-}
-
-static u8 *iwlagn_ucode_get_data(const struct iwl_ucode_header *ucode,
-                                 u32 api_ver)
-{
-       if (api_ver <= 2)
-               return (u8 *) ucode->u.v1.data;
-       return (u8 *) ucode->u.v2.data;
-}
-
-IWL_UCODE_GET(inst_size);
-IWL_UCODE_GET(data_size);
-IWL_UCODE_GET(init_size);
-IWL_UCODE_GET(init_data_size);
-IWL_UCODE_GET(boot_size);
-
-struct iwl_ucode_ops iwlagn_ucode = {
-       .get_header_size = iwlagn_ucode_get_header_size,
-       .get_build = iwlagn_ucode_get_build,
-       .get_inst_size = iwlagn_ucode_get_inst_size,
-       .get_data_size = iwlagn_ucode_get_data_size,
-       .get_init_size = iwlagn_ucode_get_init_size,
-       .get_init_data_size = iwlagn_ucode_get_init_data_size,
-       .get_boot_size = iwlagn_ucode_get_boot_size,
-       .get_data = iwlagn_ucode_get_data,
-};
-
 /*
  *  Calibration
  */