libata: stop overloading port_info->private_data

port_info->private_data is currently used for two purposes - to record
private data about the port_info or to specify host->private_data to
use when allocating ata_host.

This overloading is confusing and counter-intuitive in that
port_info->private_data becomes host->private_data instead of
port->private_data.  In addition, port_info and host don't correspond
to each other 1-to-1.  Currently, the first non-NULL
port_info->private_data is used.

This patch makes port_info->private_data just be what it is -
private_data for the port_info where LLD can jot down extra info.
libata no longer sets host->private_data to the first non-NULL
port_info->private_data, @host_priv argument is added to
ata_pci_init_one() instead.  LLDs which use ata_pci_init_one() can use
this argument to pass in pointer to host private data.  LLDs which
don't should use init-register model anyway and can initialize
host->private_data directly.

Adding @host_priv instead of using init-register model for LLDs which
use ata_pci_init_one() is suggested by Alan Cox.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>

1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index e66bb85ad3d1..f4092cbd566f 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -442,8 +442,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 .udma_mask = ATA_UDMA6, /* FIXME: should check north bridge */
                 .port_ops = &via_port_ops
         };
-        struct ata_port_info type;
-        const struct ata_port_info *ppi[] = { &type, NULL };
+        const struct ata_port_info *ppi[] = { NULL, NULL };
         struct pci_dev *isa = NULL;
         const struct via_isa_bridge *config;
         static int printed_version;
@@ -491,25 +490,25 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         switch(config->flags & VIA_UDMA) {
                 case VIA_UDMA_NONE:
                         if (config->flags & VIA_NO_UNMASK)
-                                type = via_mwdma_info_borked;
+                                ppi[0] = &via_mwdma_info_borked;
                         else
-                                type = via_mwdma_info;
+                                ppi[0] = &via_mwdma_info;
                         break;
                 case VIA_UDMA_33:
-                        type = via_udma33_info;
+                        ppi[0] = &via_udma33_info;
                         break;
                 case VIA_UDMA_66:
-                        type = via_udma66_info;
+                        ppi[0] = &via_udma66_info;
                         /* The 66 MHz devices require we enable the clock */
                         pci_read_config_dword(pdev, 0x50, &timing);
                         timing |= 0x80008;
                         pci_write_config_dword(pdev, 0x50, timing);
                         break;
                 case VIA_UDMA_100:
-                        type = via_udma100_info;
+                        ppi[0] = &via_udma100_info;
                         break;
                 case VIA_UDMA_133:
-                        type = via_udma133_info;
+                        ppi[0] = &via_udma133_info;
                         break;
                 default:
                         WARN_ON(1);
@@ -524,9 +523,7 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         /* We have established the device type, now fire it up */
-        type.private_data = (void *)config;
-
-        return ata_pci_init_one(pdev, ppi, &via_sht);
+        return ata_pci_init_one(pdev, ppi, &via_sht, (void *)config);
 }
 
 #ifdef CONFIG_PM