1 From 438df60c6bff1b12a407fefcfb8a2e5d9b29ac6a Mon Sep 17 00:00:00 2001
2 From: Hans de Goede <hdegoede@redhat.com>
3 Date: Sat, 22 Feb 2014 17:22:55 +0100
4 Subject: [PATCH 121/182] ahci_platform: Drop unused ahci_platform_data
7 These members are not used anywhere, and in the future we want
8 ahci_platform_data to go away entirely so there is no reason to keep these
11 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
12 Signed-off-by: Tejun Heo <tj@kernel.org>
14 drivers/ata/ahci_platform.c | 10 +---------
15 include/linux/ahci_platform.h | 3 ---
16 2 files changed, 1 insertion(+), 12 deletions(-)
18 diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
19 index 8fab4bf..db24d2a 100644
20 --- a/drivers/ata/ahci_platform.c
21 +++ b/drivers/ata/ahci_platform.c
22 @@ -384,7 +384,6 @@ static int ahci_probe(struct platform_device *pdev)
24 struct device *dev = &pdev->dev;
25 struct ahci_platform_data *pdata = dev_get_platdata(dev);
26 - const struct ata_port_info *pi_template;
27 struct ahci_host_priv *hpriv;
30 @@ -408,14 +407,7 @@ static int ahci_probe(struct platform_device *pdev)
31 goto disable_resources;
34 - if (pdata && pdata->ata_port_info)
35 - pi_template = pdata->ata_port_info;
37 - pi_template = &ahci_port_info;
39 - rc = ahci_platform_init_host(pdev, hpriv, pi_template,
40 - pdata ? pdata->force_port_map : 0,
41 - pdata ? pdata->mask_port_map : 0);
42 + rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info, 0, 0);
46 diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h
47 index 542f268..1f16d50 100644
48 --- a/include/linux/ahci_platform.h
49 +++ b/include/linux/ahci_platform.h
50 @@ -33,9 +33,6 @@ struct ahci_platform_data {
51 void (*exit)(struct device *dev);
52 int (*suspend)(struct device *dev);
53 int (*resume)(struct device *dev);
54 - const struct ata_port_info *ata_port_info;
55 - unsigned int force_port_map;
56 - unsigned int mask_port_map;
59 int ahci_platform_enable_clks(struct ahci_host_priv *hpriv);