diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-09-06 09:33:42 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-09-06 09:33:42 -0400 |
commit | 6379103e896a5e5aa707ea818588604ddd80064d (patch) | |
tree | c16212cf859e992739c36b76ecfb5b3359bcd22b /drivers/net/wireless/iwlwifi/pcie/drv.c | |
parent | c5d472212024543e32cf3eea4381ab91b9f6b812 (diff) |
iwlwifi: remove unused IDI code stubs
These stubs are from internal experimental code
and aren't needed in the driver in the kernel
so just remove them.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/drv.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/drv.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c index 89bfb43f4946..2a4675396707 100644 --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c | |||
@@ -263,8 +263,6 @@ MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids); | |||
263 | /* PCI registers */ | 263 | /* PCI registers */ |
264 | #define PCI_CFG_RETRY_TIMEOUT 0x041 | 264 | #define PCI_CFG_RETRY_TIMEOUT 0x041 |
265 | 265 | ||
266 | #ifndef CONFIG_IWLWIFI_IDI | ||
267 | |||
268 | static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | 266 | static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
269 | { | 267 | { |
270 | const struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data); | 268 | const struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data); |
@@ -307,8 +305,6 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev) | |||
307 | pci_set_drvdata(pdev, NULL); | 305 | pci_set_drvdata(pdev, NULL); |
308 | } | 306 | } |
309 | 307 | ||
310 | #endif /* CONFIG_IWLWIFI_IDI */ | ||
311 | |||
312 | #ifdef CONFIG_PM_SLEEP | 308 | #ifdef CONFIG_PM_SLEEP |
313 | 309 | ||
314 | static int iwl_pci_suspend(struct device *device) | 310 | static int iwl_pci_suspend(struct device *device) |
@@ -353,15 +349,6 @@ static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); | |||
353 | 349 | ||
354 | #endif | 350 | #endif |
355 | 351 | ||
356 | #ifdef CONFIG_IWLWIFI_IDI | ||
357 | /* | ||
358 | * Defined externally in iwl-idi.c | ||
359 | */ | ||
360 | int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent); | ||
361 | void __devexit iwl_pci_remove(struct pci_dev *pdev); | ||
362 | |||
363 | #endif /* CONFIG_IWLWIFI_IDI */ | ||
364 | |||
365 | static struct pci_driver iwl_pci_driver = { | 352 | static struct pci_driver iwl_pci_driver = { |
366 | .name = DRV_NAME, | 353 | .name = DRV_NAME, |
367 | .id_table = iwl_hw_card_ids, | 354 | .id_table = iwl_hw_card_ids, |