iwl3945: replace iwl_3945_cfg with iwl_cfg (c0f20d91) · Commits · 戴 / test

drivers/net/wireless/iwlwifi/iwl-3945.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2507,7 +2507,7 @@ void iwl3945_hw_cancel_deferred_work(struct iwl3945_priv *priv)
		cancel_delayed_work(&priv->thermal_periodic);
		}

		static struct iwl_3945_cfg iwl3945_bg_cfg = {
		static struct iwl_cfg iwl3945_bg_cfg = {
		.name = "3945BG",
		.fw_name_pre = IWL3945_FW_PRE,
		.ucode_api_max = IWL3945_UCODE_API_MAX,
		@@ -2515,7 +2515,7 @@ static struct iwl_3945_cfg iwl3945_bg_cfg = {
		.sku = IWL_SKU_G,
		};

		static struct iwl_3945_cfg iwl3945_abg_cfg = {
		static struct iwl_cfg iwl3945_abg_cfg = {
		.name = "3945ABG",
		.fw_name_pre = IWL3945_FW_PRE,
		.ucode_api_max = IWL3945_UCODE_API_MAX,

+1 −1

Original line number	Diff line number	Diff line
		@@ -547,7 +547,7 @@ struct iwl3945_priv {
		struct ieee80211_hw *hw;
		struct ieee80211_channel *ieee_channels;
		struct ieee80211_rate *ieee_rates;
		struct iwl_3945_cfg cfg; / device configuration */
		struct iwl_cfg cfg; / device configuration */

		/* temporary frame storage list */
		struct list_head free_frames;

+0 −30

Original line number	Diff line number	Diff line
		@@ -205,36 +205,6 @@ struct iwl_cfg {
		const struct iwl_mod_params *mod_params;
		};

		/**
		* struct iwl_3945_cfg
		* @fw_name_pre: Firmware filename prefix. The api version and extension
		* (.ucode) will be added to filename before loading from disk. The
		* filename is constructed as fw_name_pre<api>.ucode.
		* @ucode_api_max: Highest version of uCode API supported by driver.
		* @ucode_api_min: Lowest version of uCode API supported by driver.
		*
		* We enable the driver to be backward compatible wrt API version. The
		* driver specifies which APIs it supports (with @ucode_api_max being the
		* highest and @ucode_api_min the lowest). Firmware will only be loaded if
		* it has a supported API version. The firmware's API version will be
		* stored in @iwl_priv, enabling the driver to make runtime changes based
		* on firmware version used.
		*
		* For example,
		* if (IWL_UCODE_API(priv->ucode_ver) >= 2) {
		* Driver interacts with Firmware API version >= 2.
		* } else {
		* Driver interacts with Firmware API version 1.
		* }
		*/
		struct iwl_3945_cfg {
		const char *name;
		const char *fw_name_pre;
		const unsigned int ucode_api_max;
		const unsigned int ucode_api_min;
		unsigned int sku;
		};

		/***************************
		* L i b *
		***************************/

+1 −1

Original line number	Diff line number	Diff line
		@@ -7718,7 +7718,7 @@ static int iwl3945_pci_probe(struct pci_dev pdev, const struct pci_device_id e
		int err = 0;
		struct iwl3945_priv *priv;
		struct ieee80211_hw *hw;
		struct iwl_3945_cfg cfg = (struct iwl_3945_cfg )(ent->driver_data);
		struct iwl_cfg cfg = (struct iwl_cfg )(ent->driver_data);
		unsigned long flags;

		/***********************