iwlagn: simplify the bus architecture

Call iwl_probe with a ready iwl_bus struct. This means that the bus layer
assigns the irq, dev and iwl_bus_ops pointers to iwl_bus before giving it to
iwl_probe.

The device specific struct is allocated together with the common iwl_bus struct
by the bus specific layer. The pointer to the aggregate struct is passed to the
upper layer that holds a pointer to iwl_bus instead of an embedded iw_bus.
The private data given to the PCI subsystem is now iwl_bus and not iwl_priv.

Provide bus_* inliners on the way in order  to simplify the syntax.

Rename iwl-pci.h -> iwl-bus.h since it is bus agnostic and represent the
external of the bus layer.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

1 files changed, 29 insertions, 35 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
index 74911348a2ee..66448895f7ba 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -63,11 +63,10 @@
 #include <linux/pci.h>
 #include <linux/pci-aspm.h>
 
-#include "iwl-pci.h"
+#include "iwl-bus.h"
 #include "iwl-agn.h"
 #include "iwl-core.h"
 #include "iwl-io.h"
-#include "iwl-trans.h"
 
 /* PCI registers */
 #define PCI_CFG_RETRY_TIMEOUT   0x041
@@ -132,19 +131,9 @@ static void iwl_pci_apm_config(struct iwl_bus *bus)
         }
 }
 
-static void iwl_pci_set_drv_data(struct iwl_bus *bus, void *drv_priv)
+static void iwl_pci_set_drv_data(struct iwl_bus *bus, void *drv_data)
 {
-        pci_set_drvdata(IWL_BUS_GET_PCI_DEV(bus), drv_priv);
-}
-
-static struct device *iwl_pci_get_dev(const struct iwl_bus *bus)
-{
-        return &(IWL_BUS_GET_PCI_DEV(bus)->dev);
-}
-
-static unsigned int iwl_pci_get_irq(const struct iwl_bus *bus)
-{
-        return IWL_BUS_GET_PCI_DEV(bus)->irq;
+        bus->priv = drv_data;
 }
 
 static void iwl_pci_get_hw_id(struct iwl_bus *bus, char buf[],
@@ -176,8 +165,6 @@ static struct iwl_bus_ops pci_ops = {
         .get_pm_support = iwl_pci_is_pm_supported,
         .apm_config = iwl_pci_apm_config,
         .set_drv_data = iwl_pci_set_drv_data,
-        .get_dev = iwl_pci_get_dev,
-        .get_irq = iwl_pci_get_irq,
         .get_hw_id = iwl_pci_get_hw_id,
         .write8 = iwl_pci_write8,
         .write32 = iwl_pci_write32,
@@ -383,18 +370,20 @@ MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);
 static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
-        struct iwl_pci_bus *bus;
+        struct iwl_bus *bus;
+        struct iwl_pci_bus *pci_bus;
         u16 pci_cmd;
         int err;
 
-        bus = kzalloc(sizeof(*bus), GFP_KERNEL);
+        bus = kzalloc(sizeof(*bus) + sizeof(*pci_bus), GFP_KERNEL);
         if (!bus) {
                 pr_err("Couldn't allocate iwl_pci_bus");
                 err = -ENOMEM;
                 goto out_no_pci;
         }
 
-        bus->pci_dev = pdev;
+        pci_bus = IWL_BUS_GET_PCI_BUS(bus);
+        pci_bus->pci_dev = pdev;
 
         /* W/A - seems to solve weird behavior. We need to remove this if we
          * don't want to stay in L1 all the time. This wastes a lot of power */
@@ -429,8 +418,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto out_pci_disable_device;
         }
 
-        bus->hw_base = pci_iomap(pdev, 0, 0);
-        if (!bus->hw_base) {
+        pci_bus->hw_base = pci_iomap(pdev, 0, 0);
+        if (!pci_bus->hw_base) {
                 pr_err("pci_iomap failed");
                 err = -ENODEV;
                 goto out_pci_release_regions;
@@ -438,7 +427,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         pr_info("pci_resource_len = 0x%08llx\n",
                 (unsigned long long) pci_resource_len(pdev, 0));
-        pr_info("pci_resource_base = %p\n", bus->hw_base);
+        pr_info("pci_resource_base = %p\n", pci_bus->hw_base);
 
         pr_info("HW Revision ID = 0x%X\n", pdev->revision);
 
@@ -460,7 +449,13 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 pci_write_config_word(pdev, PCI_COMMAND, pci_cmd);
         }
 
-        err = iwl_probe((void *) bus, &pci_ops, cfg);
+        pci_set_drvdata(pdev, bus);
+
+        bus->dev = &pdev->dev;
+        bus->irq = pdev->irq;
+        bus->ops = &pci_ops;
+
+        err = iwl_probe(bus, cfg);
         if (err)
                 goto out_disable_msi;
         return 0;
@@ -468,7 +463,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 out_disable_msi:
         pci_disable_msi(pdev);
 out_iounmap:
-        pci_iounmap(pdev, bus->hw_base);
+        pci_iounmap(pdev, pci_bus->hw_base);
 out_pci_release_regions:
         pci_set_drvdata(pdev, NULL);
         pci_release_regions(pdev);
@@ -479,9 +474,9 @@ out_no_pci:
         return err;
 }
 
-static void iwl_pci_down(void *bus)
+static void iwl_pci_down(struct iwl_bus *bus)
 {
-        struct iwl_pci_bus *pci_bus = (struct iwl_pci_bus *) bus;
+        struct iwl_pci_bus *pci_bus = (struct iwl_pci_bus *) bus->bus_specific;
 
         pci_disable_msi(pci_bus->pci_dev);
         pci_iounmap(pci_bus->pci_dev, pci_bus->hw_base);
@@ -489,17 +484,16 @@ static void iwl_pci_down(void *bus)
         pci_disable_device(pci_bus->pci_dev);
         pci_set_drvdata(pci_bus->pci_dev, NULL);
 
-        kfree(pci_bus);
+        kfree(bus);
 }
 
 static void __devexit iwl_pci_remove(struct pci_dev *pdev)
 {
-        struct iwl_priv *priv = pci_get_drvdata(pdev);
-        void *bus_specific = priv->bus.bus_specific;
+        struct iwl_bus *bus = pci_get_drvdata(pdev);
 
-        iwl_remove(priv);
+        iwl_remove(bus->priv);
 
-        iwl_pci_down(bus_specific);
+        iwl_pci_down(bus);
 }
 
 #ifdef CONFIG_PM
@@ -507,15 +501,15 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev)
 static int iwl_pci_suspend(struct device *device)
 {
         struct pci_dev *pdev = to_pci_dev(device);
-        struct iwl_priv *priv = pci_get_drvdata(pdev);
+        struct iwl_bus *bus = pci_get_drvdata(pdev);
 
-        return iwl_suspend(priv);
+        return iwl_suspend(bus->priv);
 }
 
 static int iwl_pci_resume(struct device *device)
 {
         struct pci_dev *pdev = to_pci_dev(device);
-        struct iwl_priv *priv = pci_get_drvdata(pdev);
+        struct iwl_bus *bus = pci_get_drvdata(pdev);
 
         /*
          * We disable the RETRY_TIMEOUT register (0x41) to keep
@@ -523,7 +517,7 @@ static int iwl_pci_resume(struct device *device)
          */
         pci_write_config_byte(pdev, PCI_CFG_RETRY_TIMEOUT, 0x00);
 
-        return iwl_resume(priv);
+        return iwl_resume(bus->priv);
 }
 
 static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);