Skip to content

Commit

Permalink
libata: Switch most of the remaining SFF drivers to ata_sff_port_start
Browse files Browse the repository at this point in the history
This avoids allocating DMA buffers if not needed but at the moment is
mostly just a neatness item.

Signed-off-by: Alan Cox <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>
  • Loading branch information
Alan-Cox authored and Jeff Garzik committed Oct 12, 2007
1 parent ac8869d commit 81ad183
Show file tree
Hide file tree
Showing 38 changed files with 61 additions and 61 deletions.
2 changes: 1 addition & 1 deletion drivers/ata/ata_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ static struct ata_port_operations generic_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static int all_generic_ide; /* Set to claim all devices */
Expand Down
8 changes: 4 additions & 4 deletions drivers/ata/pata_ali.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ static struct ata_port_operations ali_early_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/*
Expand Down Expand Up @@ -366,7 +366,7 @@ static struct ata_port_operations ali_20_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/*
Expand Down Expand Up @@ -403,7 +403,7 @@ static struct ata_port_operations ali_c2_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/*
Expand Down Expand Up @@ -439,7 +439,7 @@ static struct ata_port_operations ali_c5_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};


Expand Down
12 changes: 6 additions & 6 deletions drivers/ata/pata_amd.c
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ static struct ata_port_operations amd33_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static struct ata_port_operations amd66_port_ops = {
Expand Down Expand Up @@ -394,7 +394,7 @@ static struct ata_port_operations amd66_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static struct ata_port_operations amd100_port_ops = {
Expand Down Expand Up @@ -427,7 +427,7 @@ static struct ata_port_operations amd100_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static struct ata_port_operations amd133_port_ops = {
Expand Down Expand Up @@ -460,7 +460,7 @@ static struct ata_port_operations amd133_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static struct ata_port_operations nv100_port_ops = {
Expand Down Expand Up @@ -493,7 +493,7 @@ static struct ata_port_operations nv100_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static struct ata_port_operations nv133_port_ops = {
Expand Down Expand Up @@ -526,7 +526,7 @@ static struct ata_port_operations nv133_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
Expand Down
4 changes: 2 additions & 2 deletions drivers/ata/pata_artop.c
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ static const struct ata_port_operations artop6210_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static const struct ata_port_operations artop6260_ops = {
Expand Down Expand Up @@ -392,7 +392,7 @@ static const struct ata_port_operations artop6260_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};


Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_atiixp.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ static struct ata_port_operations atiixp_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static int atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id)
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_cmd640.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ static int cmd640_port_start(struct ata_port *ap)
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
struct cmd640_reg *timing;

int ret = ata_port_start(ap);
int ret = ata_sff_port_start(ap);
if (ret < 0)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_cs5520.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ static struct ata_port_operations cs5520_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_cs5530.c
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ static struct ata_port_operations cs5530_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static const struct dmi_system_id palmax_dmi_table[] = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_cs5535.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ static struct ata_port_operations cs5535_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/**
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_cypress.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ static struct ata_port_operations cy82c693_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static int cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_efar.c
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ static const struct ata_port_operations efar_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};


Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_hpt366.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ static struct ata_port_operations hpt366_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/**
Expand Down
8 changes: 4 additions & 4 deletions drivers/ata/pata_hpt37x.c
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ static struct ata_port_operations hpt370_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/*
Expand Down Expand Up @@ -710,7 +710,7 @@ static struct ata_port_operations hpt370a_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/*
Expand Down Expand Up @@ -748,7 +748,7 @@ static struct ata_port_operations hpt372_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/*
Expand Down Expand Up @@ -786,7 +786,7 @@ static struct ata_port_operations hpt374_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/**
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_hpt3x2n.c
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ static struct ata_port_operations hpt3x2n_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/**
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_hpt3x3.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ static struct ata_port_operations hpt3x3_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/**
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_isapnp.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static struct ata_port_operations isapnp_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/**
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_it8213.c
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ static const struct ata_port_operations it8213_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};


Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_it821x.c
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ static int it821x_port_start(struct ata_port *ap)
struct it821x_dev *itdev;
u8 conf;

int ret = ata_port_start(ap);
int ret = ata_sff_port_start(ap);
if (ret < 0)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_marvell.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static const struct ata_port_operations marvell_ops = {
.irq_on = ata_irq_on,

/* Generic PATA PCI ATA helpers */
.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};


Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_mpiix.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ static struct ata_port_operations mpiix_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static int mpiix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_netcell.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ static const struct ata_port_operations netcell_ops = {
.irq_on = ata_irq_on,

/* Generic PATA PCI ATA helpers */
.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};


Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_ns87410.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ static struct ata_port_operations ns87410_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static int ns87410_init_one(struct pci_dev *dev, const struct pci_device_id *id)
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_oldpiix.c
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ static const struct ata_port_operations oldpiix_pata_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};


Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_opti.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ static struct ata_port_operations opti_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id)
Expand Down
4 changes: 2 additions & 2 deletions drivers/ata/pata_optidma.c
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ static struct ata_port_operations optidma_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static struct ata_port_operations optiplus_port_ops = {
Expand Down Expand Up @@ -432,7 +432,7 @@ static struct ata_port_operations optiplus_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/**
Expand Down
4 changes: 2 additions & 2 deletions drivers/ata/pata_pdc2027x.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ static struct ata_port_operations pdc2027x_pata100_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static struct ata_port_operations pdc2027x_pata133_ops = {
Expand Down Expand Up @@ -206,7 +206,7 @@ static struct ata_port_operations pdc2027x_pata133_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static struct ata_port_info pdc2027x_port_info[] = {
Expand Down
4 changes: 2 additions & 2 deletions drivers/ata/pata_pdc202xx_old.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ static struct ata_port_operations pdc2024x_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static struct ata_port_operations pdc2026x_port_ops = {
Expand Down Expand Up @@ -308,7 +308,7 @@ static struct ata_port_operations pdc2026x_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)
Expand Down
4 changes: 2 additions & 2 deletions drivers/ata/pata_qdi.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ static struct ata_port_operations qdi6500_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

static struct ata_port_operations qdi6580_port_ops = {
Expand All @@ -218,7 +218,7 @@ static struct ata_port_operations qdi6580_port_ops = {
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,

.port_start = ata_port_start,
.port_start = ata_sff_port_start,
};

/**
Expand Down
Loading

0 comments on commit 81ad183

Please sign in to comment.