"Grumbach, Emmanuel" <[email protected]> writes: >> Emmanuel Grumbach <[email protected]> writes: >> >> > diff --git a/drivers/net/wireless/iwlwifi/iwl-8000.c >> > b/drivers/net/wireless/iwlwifi/iwl-8000.c >> > index 4ae8ba6..e435148 100644 >> > --- a/drivers/net/wireless/iwlwifi/iwl-8000.c >> > +++ b/drivers/net/wireless/iwlwifi/iwl-8000.c >> > @@ -81,7 +81,7 @@ >> > #define IWL8000_NVM_VERSION 0x0a1d >> > #define IWL8000_TX_POWER_VERSION 0xffff /* meaningless */ >> > >> > -#define IWL8000_FW_PRE "iwlwifi-8000-" >> > +#define IWL8000_FW_PRE "iwlwifi-8000" >> > #define IWL8000_MODULE_FIRMWARE(api) IWL8000_FW_PRE >> __stringify(api) ".ucode" >> >> Isn't this going to create a misleading MODULE_FIRMWARE entry, matching >> neither of the firmware variants? >> >> > Yes probably - OTOH, this device is far from being on the shelves. By the > time it will hit the shelves, we will have removed all the hacks for the > early steps of the hardware. > Ideas to make it better?
Not exactly elegant, but I would just have duplicated the macros for each new hardware revision. E.g: #define IWL8000_MODULE_FIRMWARE(api) IWL8000_FW_PRE "-" __stringify(api) ".ucode" #define IWL8000B_MODULE_FIRMWARE(api) IWL8000_FW_PRE "B-" __stringify(api) ".ucode" MODULE_FIRMWARE(IWL8000_MODULE_FIRMWARE(IWL8000_UCODE_API_OK)); MODULE_FIRMWARE(IWL8000B_MODULE_FIRMWARE(IWL8000_UCODE_API_OK)); Or maybe make the revision part of the macro or something. > Good to know that someone is actually looking at the patches I take care to > send :) Always looking for new goodies to try out :-) The temperature sensor readout was one this time. Although I would have preferred it as a proper hwmon device instead of a debugfs file. Has this been discussed? Bjørn -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
