aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-sff.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-02-23 02:26:06 -0500
committerJeff Garzik <jgarzik@redhat.com>2010-03-01 14:58:46 -0500
commit16ea0fc98d53c72cb4e1a9edcb685a87e3a81430 (patch)
tree1a799ce01f8ea2b3a425631e791b946cb94285b1 /drivers/ata/libata-sff.c
parentcb6643e1c38b6bd5c1594f0a45d8cf6943a6f934 (diff)
libata: Pass host flags into the pci helper
This allows parallel scan and the like to be set without having to stop using the existing full helper functions. This patch merely adds the argument and fixes up the callers. It doesn't undo the special cases already in the tree or add any new parallel callers. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/libata-sff.c')
-rw-r--r--drivers/ata/libata-sff.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index c2661ea70330..02441fd57e9e 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -3037,6 +3037,7 @@ EXPORT_SYMBOL_GPL(ata_pci_sff_activate_host);
3037 * @ppi: array of port_info, must be enough for two ports 3037 * @ppi: array of port_info, must be enough for two ports
3038 * @sht: scsi_host_template to use when registering the host 3038 * @sht: scsi_host_template to use when registering the host
3039 * @host_priv: host private_data 3039 * @host_priv: host private_data
3040 * @hflag: host flags
3040 * 3041 *
3041 * This is a helper function which can be called from a driver's 3042 * This is a helper function which can be called from a driver's
3042 * xxx_init_one() probe function if the hardware uses traditional 3043 * xxx_init_one() probe function if the hardware uses traditional
@@ -3057,8 +3058,8 @@ EXPORT_SYMBOL_GPL(ata_pci_sff_activate_host);
3057 * Zero on success, negative on errno-based value on error. 3058 * Zero on success, negative on errno-based value on error.
3058 */ 3059 */
3059int ata_pci_sff_init_one(struct pci_dev *pdev, 3060int ata_pci_sff_init_one(struct pci_dev *pdev,
3060 const struct ata_port_info * const *ppi, 3061 const struct ata_port_info * const *ppi,
3061 struct scsi_host_template *sht, void *host_priv) 3062 struct scsi_host_template *sht, void *host_priv, int hflag)
3062{ 3063{
3063 struct device *dev = &pdev->dev; 3064 struct device *dev = &pdev->dev;
3064 const struct ata_port_info *pi = NULL; 3065 const struct ata_port_info *pi = NULL;
@@ -3093,6 +3094,7 @@ int ata_pci_sff_init_one(struct pci_dev *pdev,
3093 if (rc) 3094 if (rc)
3094 goto out; 3095 goto out;
3095 host->private_data = host_priv; 3096 host->private_data = host_priv;
3097 host->flags |= hflag;
3096 3098
3097 pci_set_master(pdev); 3099 pci_set_master(pdev);
3098 rc = ata_pci_sff_activate_host(host, ata_sff_interrupt, sht); 3100 rc = ata_pci_sff_activate_host(host, ata_sff_interrupt, sht);