ahci_platform: Drop unused ahci_platform_data members

These members are not used anywhere, and in the future we want
ahci_platform_data to go away entirely so there is no reason to keep these
around.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index 8fab4bf9042a31c86d44d8520338f03346807d86..db24d2a080512b5ec96ce85b7f6de30b1ecbad10 100644 (file)
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -384,7 +384,6 @@ static int ahci_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct ahci_platform_data *pdata = dev_get_platdata(dev);
-       const struct ata_port_info *pi_template;
        struct ahci_host_priv *hpriv;
        int rc;
 
@@ -408,14 +407,7 @@ static int ahci_probe(struct platform_device *pdev)
                        goto disable_resources;
        }
 
-       if (pdata && pdata->ata_port_info)
-               pi_template = pdata->ata_port_info;
-       else
-               pi_template = &ahci_port_info;
-
-       rc = ahci_platform_init_host(pdev, hpriv, pi_template,
-                                    pdata ? pdata->force_port_map : 0,
-                                    pdata ? pdata->mask_port_map  : 0);
+       rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info, 0, 0);
        if (rc)
                goto pdata_exit;
 

diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h
index 542f2686eb1d8569329ff040d9386d044a3842e2..1f16d502600c5d887dbb54fea12440bd7bf9692a 100644 (file)
--- a/include/linux/ahci_platform.h
+++ b/include/linux/ahci_platform.h
@@ -33,9 +33,6 @@ struct ahci_platform_data {
        void (*exit)(struct device *dev);
        int (*suspend)(struct device *dev);
        int (*resume)(struct device *dev);
-       const struct ata_port_info *ata_port_info;
-       unsigned int force_port_map;
-       unsigned int mask_port_map;
 };
 
 int ahci_platform_enable_clks(struct ahci_host_priv *hpriv);