target/linux/ipq806x/patches/0121-ahci_platform-Drop-unused-ahci_platform_data-members.patch

   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
   5  members
   6
   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
   9 around.
  10
  11 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  12 Signed-off-by: Tejun Heo <tj@kernel.org>
  13 ---
  14  drivers/ata/ahci_platform.c   |   10 +---------
  15  include/linux/ahci_platform.h |    3 ---
  16  2 files changed, 1 insertion(+), 12 deletions(-)
  17
  18 --- a/drivers/ata/ahci_platform.c
  19 +++ b/drivers/ata/ahci_platform.c
  20 @@ -384,7 +384,6 @@ static int ahci_probe(struct platform_de
  21  {
  22         struct device *dev = &pdev->dev;
  23         struct ahci_platform_data *pdata = dev_get_platdata(dev);
  24 -       const struct ata_port_info *pi_template;
  25         struct ahci_host_priv *hpriv;
  26         int rc;
  27
  28 @@ -408,14 +407,7 @@ static int ahci_probe(struct platform_de
  29                         goto disable_resources;
  30         }
  31
  32 -       if (pdata && pdata->ata_port_info)
  33 -               pi_template = pdata->ata_port_info;
  34 -       else
  35 -               pi_template = &ahci_port_info;
  36 -
  37 -       rc = ahci_platform_init_host(pdev, hpriv, pi_template,
  38 -                                    pdata ? pdata->force_port_map : 0,
  39 -                                    pdata ? pdata->mask_port_map  : 0);
  40 +       rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info, 0, 0);
  41         if (rc)
  42                 goto pdata_exit;
  43
  44 --- a/include/linux/ahci_platform.h
  45 +++ b/include/linux/ahci_platform.h
  46 @@ -33,9 +33,6 @@ struct ahci_platform_data {
  47         void (*exit)(struct device *dev);
  48         int (*suspend)(struct device *dev);
  49         int (*resume)(struct device *dev);
  50 -       const struct ata_port_info *ata_port_info;
  51 -       unsigned int force_port_map;
  52 -       unsigned int mask_port_map;
  53  };
  54
  55  int ahci_platform_enable_clks(struct ahci_host_priv *hpriv);