From 438df60c6bff1b12a407fefcfb8a2e5d9b29ac6a Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sat, 22 Feb 2014 17:22:55 +0100
Subject: [PATCH 121/182] 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>
---
 drivers/ata/ahci_platform.c   |   10 +---------
 include/linux/ahci_platform.h |    3 ---
 2 files changed, 1 insertion(+), 12 deletions(-)

--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -384,7 +384,6 @@ static int ahci_probe(struct platform_de
 {
 	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_de
 			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;
 
--- 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);
