libata: clean up scsi_host_templates and ata_port_operations, take #3
Subsystems (4)
PATCH 1/1 libata: clean up scsi_host_templates and ata_port_operations, take #3
Hello, all.
This is the third take of cleanup-sht-ops patchset. As the name suggests it reorganizes and cleans up scsi_host_template and ata_port_operation tables used by libata core and low level drivers.
Please read the head message of the first take[F] for more info. Changes from the last take[L] are...
* Updated to fit the current upstream-fixes.
* pata_scc thaw change applied.
* pata_rb500_cf newly converted.
* Updated to accomodate drivers w/o any reset method available.
The following drivers need specific platform to build, so they need verification. If you work on one of the following drivers, please verify that the driver builds and works fine. It would be best if you can verify that the sht and ops don't change by the fifth and sixth patches using the method I'll write in another message.
* pata_at32
* pata_bf54x
* pata_icside
* pata_ixp4xx_cf
* pata_mpc52xx
* pata_scc
* sata_fsl
* pata_rb500_cf
This patchset is on top of
upstream-fixes (3db691daa4f6c4b899e144ea54a65738402c94e3)
+ [1] prefer-hardreset patchset, take#3 (the subject line is wrong)
+ [2] devres-implement-pcim_iomap_regions_request_all
+ [3] ahci-request-all-PCI-BARs
+ [4] libata-PCI-device-should-be-powered-up-before-being-accessed
This patchset is available as GIT branch.
http://git.kernel.org/?p=linux/kernel/git/tj/libata-dev.git;a=shortlog;h=cleanup-sht-opsgit://git.kernel.org/pub/scm/linux/kernel/git/tj/libata-dev.git cleanup-sht-ops
The verification method is the same as before[B].
Thanks.
--
tejun
[F] http://thread.gmane.org/gmane.linux.ide/27785
[L] http://thread.gmane.org/gmane.linux.ide/28335
[1] http://thread.gmane.org/gmane.linux.ide/29642
[2] http://article.gmane.org/gmane.linux.ide/29653
[3] http://article.gmane.org/gmane.linux.ide/29654
[4] http://article.gmane.org/gmane.linux.ide/29655
[B] http://article.gmane.org/gmane.linux.ide/28357
PATCH 1/9 libata: reorganize ata_port_operations
Over the time, ops in ata_port_operations has become a bit confusing. Reorganize. SFF/BMDMA ops are separated into separate a group as they will be taken out of ata_port_operations later.
Signed-off-by Tejun Heo <[email protected]>
--- include/linux/libata.h | 117 +++++++++++++++++++++++++----------------------- 1 files changed, 61 insertions(+), 56 deletions(-)
include/linux/libata.h +61 -56
@@ -663,69 +663,74 @@ struct ata_port { };struct ata_port_operations { -void (*dev_config) (struct ata_device *); +/* +* Command execution +*/ +int (*qc_defer)(struct ata_queued_cmd *qc); +int (*check_atapi_dma)(struct ata_queued_cmd *qc); +void (*qc_prep)(struct ata_queued_cmd *qc); +unsigned int (*qc_issue)(struct ata_queued_cmd *qc); -void (*set_piomode) (struct ata_port *,struct ata_device *); -void (*set_dmamode) (struct ata_port *,struct ata_device *); -unsigned long (*mode_filter) (struct ata_device *,unsigned long ); +/* +* Configuration and exception handling +*/ +int (*cable_detect)(struct ata_port *ap); +unsigned long (*mode_filter)(struct ata_device *dev,unsigned long xfer_mask); +void (*set_piomode)(struct ata_port *ap,struct ata_device *dev); +void (*set_dmamode)(struct ata_port *ap,struct ata_device *dev); +int (*set_mode)(struct ata_link *link,struct ata_device **r_failed_dev); -void (*tf_load) (struct ata_port *ap,const struct ata_taskfile *tf); -void (*tf_read) (struct ata_port *ap,struct ata_taskfile *tf); +void (*dev_config)(struct ata_device *dev); -void (*exec_command)(struct ata_port *ap,const struct ata_taskfile *tf); +void (*freeze)(struct ata_port *ap); +void (*thaw)(struct ata_port *ap); +void (*error_handler)(struct ata_port *ap); +void (*post_internal_cmd)(struct ata_queued_cmd *qc); + +/* +* Optional features +*/ +int (*scr_read)(struct ata_port *ap,unsigned int sc_reg,u32 *val); +int (*scr_write)(struct ata_port *ap,unsigned int sc_reg,u32 val); +void (*pmp_attach)(struct ata_port *ap); +void (*pmp_detach)(struct ata_port *ap); +int (*enable_pm)(struct ata_port *ap,enum link_pm policy); +void (*disable_pm)(struct ata_port *ap); + +/* +* Start, stop, suspend and resume +*/ +int (*port_suspend)(struct ata_port *ap,pm_message_t mesg); +int (*port_resume)(struct ata_port *ap); +int (*port_start)(struct ata_port *ap); +void (*port_stop)(struct ata_port *ap); +void (*host_stop)(struct ata_host *host); + +/* +* SFF / taskfile oriented ops +*/ +void (*dev_select)(struct ata_port *ap,unsigned int device);u8 (*check_status)(struct ata_port *ap);u8 (*check_altstatus)(struct ata_port *ap); -void (*dev_select)(struct ata_port *ap,unsigned int device); - -void (*phy_reset) (struct ata_port *ap);/* obsolete */ -int (*set_mode) (struct ata_link *link,struct ata_device **r_failed_dev); - -int (*cable_detect) (struct ata_port *ap); - -int (*check_atapi_dma) (struct ata_queued_cmd *qc); - -void (*bmdma_setup) (struct ata_queued_cmd *qc); -void (*bmdma_start) (struct ata_queued_cmd *qc); - -unsigned int (*data_xfer) (struct ata_device *dev,unsigned char *buf, -unsigned int buflen,int rw); - -int (*qc_defer) (struct ata_queued_cmd *qc); -void (*qc_prep) (struct ata_queued_cmd *qc); -unsigned int (*qc_issue) (struct ata_queued_cmd *qc); - -/* port multiplier */ -void (*pmp_attach) (struct ata_port *ap); -void (*pmp_detach) (struct ata_port *ap); - -/* Error handlers. ->error_handler overrides ->eng_timeout and -* indicates that new-style EH is in place. +void (*tf_load)(struct ata_port *ap,const struct ata_taskfile *tf); +void (*tf_read)(struct ata_port *ap,struct ata_taskfile *tf); +void (*exec_command)(struct ata_port *ap,const struct ata_taskfile *tf); +unsigned int (*data_xfer)(struct ata_device *dev,unsigned char *buf, +unsigned int buflen,int rw); +u8 (*irq_on)(struct ata_port *); + +void (*irq_clear)(struct ata_port *); +void (*bmdma_setup)(struct ata_queued_cmd *qc); +void (*bmdma_start)(struct ata_queued_cmd *qc); +void (*bmdma_stop)(struct ata_queued_cmd *qc); +u8 (*bmdma_status)(struct ata_port *ap); + +/* +* Obsolete */ -void (*eng_timeout) (struct ata_port *ap);/* obsolete */ - -void (*freeze) (struct ata_port *ap); -void (*thaw) (struct ata_port *ap); -void (*error_handler) (struct ata_port *ap); -void (*post_internal_cmd) (struct ata_queued_cmd *qc); - +void (*phy_reset)(struct ata_port *ap); +void (*eng_timeout)(struct ata_port *ap);irq_handler_t irq_handler; -void (*irq_clear) (struct ata_port *); -u8 (*irq_on) (struct ata_port *); - -int (*scr_read) (struct ata_port *ap,unsigned int sc_reg,u32 *val); -int (*scr_write) (struct ata_port *ap,unsigned int sc_reg,u32 val); - -int (*port_suspend) (struct ata_port *ap,pm_message_t mesg); -int (*port_resume) (struct ata_port *ap); -int (*enable_pm) (struct ata_port *ap,enum link_pm policy); -void (*disable_pm) (struct ata_port *ap); -int (*port_start) (struct ata_port *ap); -void (*port_stop) (struct ata_port *ap); - -void (*host_stop) (struct ata_host *host); - -void (*bmdma_stop) (struct ata_queued_cmd *qc); -u8 (*bmdma_status) (struct ata_port *ap); };struct ata_port_info {
Signature · 1 line
1.5.2.4
PATCH 2/9 libata: implement and use ata_noop_irq_clear()
In reply to Tejun Heo->irq_clear() is used to clear IRQ bit of a SFF controller and isn't useful for drivers which don't use libata SFF HSM implementation. However, it's a required callback and many drivers implement their own noop version as placeholder. This patch implements ata_noop_irq_clear and use it to replace those custom placeholders.
Also, SFF drivers which don't support BMDMA don't need to use ata_bmdma_irq_clear(). It becomes noop if BMDMA address isn't initialized. Convert them to use ata_noop_irq_clear().
Signed-off-by Tejun Heo <[email protected]>
--- drivers/ata/ahci.c | 12 +++--------- drivers/ata/libata-core.c | 1 + drivers/ata/libata-sff.c | 8 ++++++++ drivers/ata/pata_ali.c | 2 +- drivers/ata/pata_at32.c | 7 +------ drivers/ata/pata_icside.c | 7 +------ drivers/ata/pata_isapnp.c | 2 +- drivers/ata/pata_ixp4xx_cf.c | 2 +- drivers/ata/pata_legacy.c | 22 +++++++++++----------- drivers/ata/pata_mpc52xx.c | 2 +- drivers/ata/pata_mpiix.c | 2 +- drivers/ata/pata_ns87410.c | 2 +- drivers/ata/pata_pcmcia.c | 4 ++-- drivers/ata/pata_platform.c | 2 +- drivers/ata/pata_qdi.c | 4 ++-- drivers/ata/pata_rb500_cf.c | 6 +----- drivers/ata/pata_winbond.c | 2 +- drivers/ata/pdc_adma.c | 8 +------- drivers/ata/sata_fsl.c | 7 +------ drivers/ata/sata_inic162x.c | 7 +------ drivers/ata/sata_mv.c | 11 +++-------- drivers/ata/sata_qstor.c | 8 +------- drivers/ata/sata_sil24.c | 8 +------- include/linux/libata.h | 1 + 24 files changed, 47 insertions(+), 90 deletions(-)
drivers/ata/ahci.c +3 -9
@@ -240,7 +240,6 @@ static int ahci_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val);static int ahci_scr_write (struct ata_port *ap,unsigned int sc_reg,u32 val);static int ahci_init_one (struct pci_dev *pdev,const struct pci_device_id *ent);static unsigned int ahci_qc_issue (struct ata_queued_cmd *qc); -static void ahci_irq_clear (struct ata_port *ap);static int ahci_port_start (struct ata_port *ap);static void ahci_port_stop (struct ata_port *ap);static void ahci_tf_read (struct ata_port *ap,struct ata_taskfile *tf);
@@ -303,7 +302,7 @@ static const struct ata_port_operations ahci_ops = { .qc_prep = ahci_qc_prep, .qc_issue = ahci_qc_issue, - .irq_clear = ahci_irq_clear, + .irq_clear = ata_noop_irq_clear, .scr_read = ahci_scr_read, .scr_write = ahci_scr_write,
@@ -339,7 +338,7 @@ static const struct ata_port_operations ahci_vt8251_ops = { .qc_prep = ahci_qc_prep, .qc_issue = ahci_qc_issue, - .irq_clear = ahci_irq_clear, + .irq_clear = ata_noop_irq_clear, .scr_read = ahci_scr_read, .scr_write = ahci_scr_write,
@@ -373,7 +372,7 @@ static const struct ata_port_operations ahci_p5wdh_ops = { .qc_prep = ahci_qc_prep, .qc_issue = ahci_qc_issue, - .irq_clear = ahci_irq_clear, + .irq_clear = ata_noop_irq_clear, .scr_read = ahci_scr_read, .scr_write = ahci_scr_write,
@@ -1744,11 +1743,6 @@ static void ahci_port_intr(struct ata_port *ap) } } -static void ahci_irq_clear (struct ata_port *ap) -{ -/* TODO */ -} -static irqreturn_t ahci_interrupt (int irq,void *dev_instance) {struct ata_host *host = dev_instance;
drivers/ata/libata-core.c +1 -0
@@ -7775,6 +7775,7 @@ EXPORT_SYMBOL_GPL(ata_noop_qc_prep);EXPORT_SYMBOL_GPL (ata_bmdma_setup);EXPORT_SYMBOL_GPL (ata_bmdma_start);EXPORT_SYMBOL_GPL (ata_bmdma_irq_clear); +EXPORT_SYMBOL_GPL (ata_noop_irq_clear);EXPORT_SYMBOL_GPL (ata_bmdma_status);EXPORT_SYMBOL_GPL (ata_bmdma_stop);EXPORT_SYMBOL_GPL (ata_bmdma_freeze);
drivers/ata/libata-sff.c +8 -0
@@ -303,6 +303,14 @@ void ata_bmdma_irq_clear(struct ata_port *ap) }/** +* ata_noop_irq_clear - Noop placeholder for irq_clear +* @ap: Port associated with this ATA transaction. +*/ +void ata_noop_irq_clear (struct ata_port *ap) +{ +} + +/** * ata_bmdma_status - Read PCI IDE BMDMA status * @ap: Port associated with this ATA transaction. *
drivers/ata/pata_ali.c +1 -1
@@ -342,7 +342,7 @@ static struct ata_port_operations ali_early_port_ops = { .data_xfer = ata_data_xfer, .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
drivers/ata/pata_at32.c +1 -6
@@ -166,11 +166,6 @@ static void pata_at32_set_piomode(struct ata_port *ap, struct ata_device *adev) } } -static void pata_at32_irq_clear (struct ata_port *ap) -{ -/* No DMA controller yet */ -} -static struct scsi_host_template at32_sht = { .module =THIS_MODULE , .name =DRV_NAME ,
@@ -208,7 +203,7 @@ static struct ata_port_operations at32_port_ops = { .data_xfer = ata_data_xfer, - .irq_clear = pata_at32_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
drivers/ata/pata_icside.c +1 -6
@@ -322,11 +322,6 @@ static struct scsi_host_template pata_icside_sht = { .bios_param = ata_std_bios_param, }; -/* wish this was exported from libata-core */ -static void ata_dummy_noret (struct ata_port *port) -{ -} -static void pata_icside_postreset (struct ata_link *link,unsigned int *classes) {struct ata_port *ap = link->ap;
@@ -380,7 +375,7 @@ static struct ata_port_operations pata_icside_port_ops = { .error_handler = pata_icside_error_handler, .post_internal_cmd = pata_icside_bmdma_stop, - .irq_clear = ata_dummy_noret, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .bmdma_stop = pata_icside_bmdma_stop,
drivers/ata/pata_isapnp.c +1 -1
@@ -55,7 +55,7 @@ static struct ata_port_operations isapnp_port_ops = { .data_xfer = ata_data_xfer, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
drivers/ata/pata_ixp4xx_cf.c +1 -1
@@ -126,7 +126,7 @@ static struct ata_port_operations ixp4xx_port_ops = { .cable_detect = ata_cable_40wire, .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_port_start,
drivers/ata/pata_legacy.c +11 -11
@@ -252,7 +252,7 @@ static struct ata_port_operations simple_port_ops = { .data_xfer = ata_data_xfer_noirq, .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
@@ -279,7 +279,7 @@ static struct ata_port_operations legacy_port_ops = { .data_xfer = ata_data_xfer_noirq, .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
@@ -393,7 +393,7 @@ static struct ata_port_operations pdc20230_port_ops = { .data_xfer = pdc_data_xfer_vlb, .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
@@ -447,7 +447,7 @@ static struct ata_port_operations ht6560a_port_ops = { .data_xfer = ata_data_xfer, /* Check vlb/noirq */ .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
@@ -512,7 +512,7 @@ static struct ata_port_operations ht6560b_port_ops = { .data_xfer = ata_data_xfer, /* FIXME: Check 32bit and noirq */ .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
@@ -633,7 +633,7 @@ static struct ata_port_operations opti82c611a_port_ops = { .data_xfer = ata_data_xfer, .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
@@ -765,7 +765,7 @@ static struct ata_port_operations opti82c46x_port_ops = { .data_xfer = ata_data_xfer, .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
@@ -950,7 +950,7 @@ static struct ata_port_operations qdi6500_port_ops = { .data_xfer = vlb32_data_xfer, .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
@@ -977,7 +977,7 @@ static struct ata_port_operations qdi6580_port_ops = { .data_xfer = vlb32_data_xfer, .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
@@ -1004,7 +1004,7 @@ static struct ata_port_operations qdi6580dp_port_ops = { .data_xfer = vlb32_data_xfer, .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
@@ -1095,7 +1095,7 @@ static struct ata_port_operations winbond_port_ops = { .data_xfer = vlb32_data_xfer, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
drivers/ata/pata_mpc52xx.c +1 -1
@@ -296,7 +296,7 @@ static struct ata_port_operations mpc52xx_ata_port_ops = { .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot, .data_xfer = ata_data_xfer, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_port_start, };
drivers/ata/pata_mpiix.c +1 -1
@@ -187,7 +187,7 @@ static struct ata_port_operations mpiix_port_ops = { .qc_issue = mpiix_qc_issue_prot, .data_xfer = ata_data_xfer, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
drivers/ata/pata_ns87410.c +1 -1
@@ -182,7 +182,7 @@ static struct ata_port_operations ns87410_port_ops = { .data_xfer = ata_data_xfer, .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
drivers/ata/pata_pcmcia.c +2 -2
@@ -164,7 +164,7 @@ static struct ata_port_operations pcmcia_port_ops = { .data_xfer = ata_data_xfer_noirq, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
@@ -189,7 +189,7 @@ static struct ata_port_operations pcmcia_8bit_port_ops = { .data_xfer = ata_data_xfer_8bit, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
drivers/ata/pata_platform.c +1 -1
@@ -86,7 +86,7 @@ static struct ata_port_operations pata_platform_port_ops = { .data_xfer = ata_data_xfer_noirq, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_dummy_ret0,
drivers/ata/pata_qdi.c +2 -2
@@ -191,7 +191,7 @@ static struct ata_port_operations qdi6500_port_ops = { .data_xfer = qdi_data_xfer, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
@@ -217,7 +217,7 @@ static struct ata_port_operations qdi6580_port_ops = { .data_xfer = qdi_data_xfer, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
drivers/ata/pata_rb500_cf.c +1 -5
@@ -117,10 +117,6 @@ static irqreturn_t rb500_pata_irq_handler(int irq, void *dev_instance)return IRQ_HANDLED ; } -static void rb500_pata_irq_clear (struct ata_port *ap) -{ -} -static int rb500_pata_port_start (struct ata_port *ap) {return 0 ;
@@ -144,7 +140,7 @@ static struct ata_port_operations rb500_pata_port_ops = { .error_handler = ata_bmdma_error_handler, .irq_handler = rb500_pata_irq_handler, - .irq_clear = rb500_pata_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = rb500_pata_port_start,
drivers/ata/pata_winbond.c +1 -1
@@ -159,7 +159,7 @@ static struct ata_port_operations winbond_port_ops = { .data_xfer = winbond_data_xfer, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
drivers/ata/pdc_adma.c +1 -7
@@ -138,7 +138,6 @@ static unsigned int adma_qc_issue(struct ata_queued_cmd *qc);static int adma_check_atapi_dma (struct ata_queued_cmd *qc);static void adma_bmdma_stop (struct ata_queued_cmd *qc);static u8 adma_bmdma_status (struct ata_port *ap); -static void adma_irq_clear (struct ata_port *ap);static void adma_freeze (struct ata_port *ap);static void adma_thaw (struct ata_port *ap);static void adma_error_handler (struct ata_port *ap);
@@ -174,7 +173,7 @@ static const struct ata_port_operations adma_ata_ops = { .freeze = adma_freeze, .thaw = adma_thaw, .error_handler = adma_error_handler, - .irq_clear = adma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = adma_port_start, .port_stop = adma_port_stop,
@@ -223,11 +222,6 @@ static u8 adma_bmdma_status(struct ata_port *ap)return 0 ; } -static void adma_irq_clear (struct ata_port *ap) -{ -/* nothing */ -} -static void adma_reset_engine (struct ata_port *ap) {void __iomem *chan =ADMA_PORT_REGS (ap);
drivers/ata/sata_fsl.c +1 -6
@@ -933,11 +933,6 @@ static void sata_fsl_post_internal_cmd(struct ata_queued_cmd *qc) } } -static void sata_fsl_irq_clear (struct ata_port *ap) -{ -/* unused */ -} -static void sata_fsl_error_intr (struct ata_port *ap) {struct ata_link *link = &ap->link;
@@ -1223,7 +1218,7 @@ static const struct ata_port_operations sata_fsl_ops = { .qc_prep = sata_fsl_qc_prep, .qc_issue = sata_fsl_qc_issue, - .irq_clear = sata_fsl_irq_clear, + .irq_clear = ata_noop_irq_clear, .scr_read = sata_fsl_scr_read, .scr_write = sata_fsl_scr_write,
drivers/ata/sata_inic162x.c +1 -6
@@ -266,11 +266,6 @@ static u8 inic_bmdma_status(struct ata_port *ap)return ATA_DMA_INTR ; } -static void inic_irq_clear (struct ata_port *ap) -{ -/* noop */ -} -static void inic_host_intr (struct ata_port *ap) {void __iomem *port_base =inic_port_base (ap);
@@ -555,7 +550,7 @@ static struct ata_port_operations inic_port_ops = { .bmdma_stop = inic_bmdma_stop, .bmdma_status = inic_bmdma_status, - .irq_clear = inic_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .qc_prep = ata_qc_prep,
drivers/ata/sata_mv.c +3 -8
@@ -461,7 +461,6 @@ struct mv_hw_ops {void (*reset_bus)(struct ata_host *host,void __iomem *mmio); }; -static void mv_irq_clear (struct ata_port *ap);static int mv_scr_read (struct ata_port *ap,unsigned int sc_reg_in,u32 *val);static int mv_scr_write (struct ata_port *ap,unsigned int sc_reg_in,u32 val);static int mv5_scr_read (struct ata_port *ap,unsigned int sc_reg_in,u32 *val);
@@ -564,7 +563,7 @@ static const struct ata_port_operations mv5_ops = { .qc_issue = mv_qc_issue, .data_xfer = ata_data_xfer, - .irq_clear = mv_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .error_handler = mv_error_handler,
@@ -592,7 +591,7 @@ static const struct ata_port_operations mv6_ops = { .qc_issue = mv_qc_issue, .data_xfer = ata_data_xfer, - .irq_clear = mv_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .error_handler = mv_error_handler,
@@ -620,7 +619,7 @@ static const struct ata_port_operations mv_iie_ops = { .qc_issue = mv_qc_issue, .data_xfer = ata_data_xfer, - .irq_clear = mv_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .error_handler = mv_error_handler,
@@ -801,10 +800,6 @@ static inline int mv_get_hc_count(unsigned long port_flags)return ((port_flags &MV_FLAG_DUAL_HC ) ?2 :1 ); } -static void mv_irq_clear (struct ata_port *ap) -{ -} -static void mv_set_edma_ptrs (void __iomem *port_mmio,struct mv_host_priv *hpriv,struct mv_port_priv *pp)
drivers/ata/sata_qstor.c +1 -7
@@ -121,7 +121,6 @@ static unsigned int qs_qc_issue(struct ata_queued_cmd *qc);static int qs_check_atapi_dma (struct ata_queued_cmd *qc);static void qs_bmdma_stop (struct ata_queued_cmd *qc);static u8 qs_bmdma_status (struct ata_port *ap); -static void qs_irq_clear (struct ata_port *ap);static void qs_freeze (struct ata_port *ap);static void qs_thaw (struct ata_port *ap);static void qs_error_handler (struct ata_port *ap);
@@ -157,7 +156,7 @@ static const struct ata_port_operations qs_ata_ops = { .freeze = qs_freeze, .thaw = qs_thaw, .error_handler = qs_error_handler, - .irq_clear = qs_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .scr_read = qs_scr_read, .scr_write = qs_scr_write,
@@ -211,11 +210,6 @@ static u8 qs_bmdma_status(struct ata_port *ap)return 0 ; } -static void qs_irq_clear (struct ata_port *ap) -{ -/* nothing */ -} -static inline void qs_enter_reg_mode (struct ata_port *ap) {u8 __iomem *chan =qs_mmio_base (ap->host) + (ap->port_no *0x4000 );
drivers/ata/sata_sil24.c +1 -7
@@ -348,7 +348,6 @@ static void sil24_tf_read(struct ata_port *ap, struct ata_taskfile *tf);static int sil24_qc_defer (struct ata_queued_cmd *qc);static void sil24_qc_prep (struct ata_queued_cmd *qc);static unsigned int sil24_qc_issue (struct ata_queued_cmd *qc); -static void sil24_irq_clear (struct ata_port *ap);static void sil24_pmp_attach (struct ata_port *ap);static void sil24_pmp_detach (struct ata_port *ap);static void sil24_freeze (struct ata_port *ap);
@@ -416,7 +415,7 @@ static const struct ata_port_operations sil24_ops = { .qc_prep = sil24_qc_prep, .qc_issue = sil24_qc_issue, - .irq_clear = sil24_irq_clear, + .irq_clear = ata_noop_irq_clear, .scr_read = sil24_scr_read, .scr_write = sil24_scr_write,
@@ -921,11 +920,6 @@ static unsigned int sil24_qc_issue(struct ata_queued_cmd *qc)return 0 ; } -static void sil24_irq_clear (struct ata_port *ap) -{ -/* unused */ -} -static void sil24_pmp_attach (struct ata_port *ap) {sil24_config_pmp (ap,1 );
include/linux/libata.h +1 -0
@@ -893,6 +893,7 @@ extern void ata_bmdma_start(struct ata_queued_cmd *qc);extern void ata_bmdma_stop (struct ata_queued_cmd *qc);extern u8 ata_bmdma_status (struct ata_port *ap);extern void ata_bmdma_irq_clear (struct ata_port *ap); +extern void ata_noop_irq_clear (struct ata_port *ap);extern void ata_bmdma_freeze (struct ata_port *ap);extern void ata_bmdma_thaw (struct ata_port *ap); extern void ata_bmdma_drive_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
Signature · 1 line
1.5.2.4
PATCH 3/9 libata: normalize port_info, port_operations and sht tables
In reply to Tejun HeoOver the time, port info, ops and sht structures developed quite a bit of inconsistencies. This patch updates drivers.
* Enable/disable_pm callbacks added to all ahci ops tables.
* Every driver for SFF controllers now uses ata_sff_port_start() instead of ata_port_start() unless the driver has custom implementation.
* Every driver for SFF controllers now uses ata_pci_default_filter() unless the driver has custom implementation.
* Removed an odd port_info->sht initialization from ata_piix.c. Likely a merge byproduct.
* A port which has ATA_FLAG_SATA set doesn't need to set cable_detect to ata_cable_sata(). Remove it from via and mv port ops.
* Some drivers had unnecessary .max_sectors initialization which is ignored and was missing .slave_destroy callback. Fixed.
* Removed unnecessary sht initializations port_info's.
* Removed onsolete scsi device suspend/resume callbacks from pata_bf54x.
* No reason to set ata_pci_default_filter() and bmdma functions for PIO-only drivers. Remove those callbacks and replace ata_bmdma_irq_clear with ata_noop_irq_clear.
* pata_platform sets port_start to ata_dummy_ret0. port_start can just be set to NULL.
* sata_fsl supports NCQ but was missing qc_defer. Fixed.
* pata_rb600_cf implements dummy port_start. Removed.
Signed-off-by Tejun Heo <[email protected]>
--- drivers/ata/ahci.c | 8 ++++++++ drivers/ata/ata_generic.c | 1 + drivers/ata/ata_piix.c | 13 +++++++------ drivers/ata/pata_artop.c | 1 + drivers/ata/pata_bf54x.c | 1 - drivers/ata/pata_cmd64x.c | 6 +++--- drivers/ata/pata_cs5520.c | 1 + drivers/ata/pata_cs5536.c | 2 +- drivers/ata/pata_hpt3x3.c | 1 - drivers/ata/pata_it8213.c | 2 +- drivers/ata/pata_ixp4xx_cf.c | 3 +-- drivers/ata/pata_jmicron.c | 3 ++- drivers/ata/pata_marvell.c | 1 + drivers/ata/pata_mpc52xx.c | 4 ++-- drivers/ata/pata_netcell.c | 1 + drivers/ata/pata_opti.c | 7 +------ drivers/ata/pata_optidma.c | 2 ++ drivers/ata/pata_platform.c | 4 ---- drivers/ata/pata_rb500_cf.c | 9 +-------- drivers/ata/pata_rz1000.c | 7 +------ drivers/ata/sata_fsl.c | 1 + drivers/ata/sata_mv.c | 6 ------ drivers/ata/sata_nv.c | 11 ++++++++--- drivers/ata/sata_sil.c | 3 ++- drivers/ata/sata_sis.c | 3 ++- drivers/ata/sata_svw.c | 3 ++- drivers/ata/sata_uli.c | 3 ++- drivers/ata/sata_via.c | 12 ++++++++---- drivers/ata/sata_vsc.c | 3 ++- 29 files changed, 62 insertions(+), 60 deletions(-)
drivers/ata/ahci.c +8 -0
@@ -332,6 +332,8 @@ static const struct ata_port_operations ahci_vt8251_ops = { .check_altstatus = ahci_check_status, .dev_select = ata_noop_dev_select, + .dev_config = ahci_dev_config, + .tf_read = ahci_tf_read, .qc_defer = sata_pmp_qc_defer_cmd_switch,
@@ -356,6 +358,8 @@ static const struct ata_port_operations ahci_vt8251_ops = { .port_suspend = ahci_port_suspend, .port_resume = ahci_port_resume, #endif + .enable_pm = ahci_enable_alpm, + .disable_pm = ahci_disable_alpm, .port_start = ahci_port_start, .port_stop = ahci_port_stop,
@@ -366,6 +370,8 @@ static const struct ata_port_operations ahci_p5wdh_ops = { .check_altstatus = ahci_check_status, .dev_select = ata_noop_dev_select, + .dev_config = ahci_dev_config, + .tf_read = ahci_tf_read, .qc_defer = sata_pmp_qc_defer_cmd_switch,
@@ -390,6 +396,8 @@ static const struct ata_port_operations ahci_p5wdh_ops = { .port_suspend = ahci_port_suspend, .port_resume = ahci_port_resume, #endif + .enable_pm = ahci_enable_alpm, + .disable_pm = ahci_disable_alpm, .port_start = ahci_port_start, .port_stop = ahci_port_stop,
drivers/ata/ata_generic.c +1 -0
@@ -114,6 +114,7 @@ static struct scsi_host_template generic_sht = {static struct ata_port_operations generic_port_ops = { .set_mode = generic_set_mode, + .mode_filter = ata_pci_default_filter, .tf_load = ata_tf_load, .tf_read = ata_tf_read,
drivers/ata/ata_piix.c +7 -6
@@ -336,7 +336,7 @@ static const struct ata_port_operations piix_pata_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 ich_pata_ops = {
@@ -367,7 +367,7 @@ static const struct ata_port_operations ich_pata_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 piix_sata_ops = {
@@ -385,6 +385,7 @@ static const struct ata_port_operations piix_sata_ops = { .qc_issue = ata_qc_issue_prot, .data_xfer = ata_data_xfer, + .mode_filter = ata_pci_default_filter, .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, .error_handler = ata_bmdma_error_handler,
@@ -393,7 +394,7 @@ static const struct ata_port_operations piix_sata_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 piix_vmw_ops = {
@@ -425,7 +426,7 @@ static const struct ata_port_operations piix_vmw_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 piix_sidpr_sata_ops = {
@@ -446,6 +447,7 @@ static const struct ata_port_operations piix_sidpr_sata_ops = { .scr_read = piix_sidpr_scr_read, .scr_write = piix_sidpr_scr_write, + .mode_filter = ata_pci_default_filter, .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, .error_handler = piix_sidpr_error_handler,
@@ -454,7 +456,7 @@ static const struct ata_port_operations piix_sidpr_sata_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 piix_map_db ich5_map_db = {
@@ -683,7 +685,6 @@ static struct ata_port_info piix_port_info[] = { [piix_pata_vmw] = { - .sht = &piix_sht, .flags = PIIX_PATA_FLAGS, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
drivers/ata/pata_artop.c +1 -0
@@ -367,6 +367,7 @@ static const struct ata_port_operations artop6210_ops = {static const struct ata_port_operations artop6260_ops = { .set_piomode = artop6260_set_piomode, .set_dmamode = artop6260_set_dmamode, + .mode_filter = ata_pci_default_filter, .tf_load = ata_tf_load, .tf_read = ata_tf_read,
drivers/ata/pata_bf54x.c +0 -1
@@ -1409,7 +1409,6 @@ static const struct ata_port_operations bfin_pata_ops = {static struct ata_port_info bfin_port_info[] = { { - .sht = &bfin_sht, .flags =ATA_FLAG_SLAVE_POSS |ATA_FLAG_MMIO |ATA_FLAG_NO_LEGACY ,
drivers/ata/pata_cmd64x.c +3 -3
@@ -313,7 +313,7 @@ static struct ata_port_operations cmd64x_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 cmd646r1_port_ops = {
@@ -346,7 +346,7 @@ static struct ata_port_operations cmd646r1_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 cmd648_port_ops = {
@@ -379,7 +379,7 @@ static struct ata_port_operations cmd648_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 cmd64x_init_one (struct pci_dev *pdev,const struct pci_device_id *id)
drivers/ata/pata_cs5520.c +1 -0
@@ -160,6 +160,7 @@ static struct scsi_host_template cs5520_sht = {static struct ata_port_operations cs5520_port_ops = { .set_piomode = cs5520_set_piomode, .set_dmamode = cs5520_set_dmamode, + .mode_filter = ata_pci_default_filter, .tf_load = ata_tf_load, .tf_read = ata_tf_read,
drivers/ata/pata_cs5536.c +1 -1
@@ -269,7 +269,7 @@ static struct ata_port_operations cs5536_port_ops = { .irq_clear = ata_bmdma_irq_clear, .irq_on = ata_irq_on, - .port_start = ata_port_start, + .port_start = ata_sff_port_start, };/**
drivers/ata/pata_hpt3x3.c +0 -1
@@ -189,7 +189,6 @@ static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id) {static int printed_version;static const struct ata_port_info info = { - .sht = &hpt3x3_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , #if defined(CONFIG_PATA_HPT3X3_DMA)
drivers/ata/pata_it8213.c +1 -1
@@ -250,13 +250,13 @@ static struct scsi_host_template it8213_sht = { .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, .sg_tablesize = LIBATA_MAX_PRD, - .max_sectors = ATA_MAX_SECTORS, .cmd_per_lun = ATA_SHT_CMD_PER_LUN, .emulated = ATA_SHT_EMULATED, .use_clustering = ATA_SHT_USE_CLUSTERING, .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
drivers/ata/pata_ixp4xx_cf.c +1 -2
@@ -107,7 +107,6 @@ static struct scsi_host_template ixp4xx_sht = {static struct ata_port_operations ixp4xx_port_ops = { .set_mode = ixp4xx_set_mode, - .mode_filter = ata_pci_default_filter, .tf_load = ata_tf_load, .tf_read = ata_tf_read,
@@ -129,7 +128,7 @@ static struct ata_port_operations ixp4xx_port_ops = { .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, - .port_start = ata_port_start, + .port_start = ata_sff_port_start, }; static void ixp4xx_setup_port(struct ata_port *ap,
drivers/ata/pata_jmicron.c +2 -1
@@ -148,6 +148,7 @@ static const struct ata_port_operations jmicron_ops = { .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, + .mode_filter = ata_pci_default_filter, .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, .error_handler = jmicron_error_handler,
@@ -168,7 +169,7 @@ static const struct ata_port_operations jmicron_ops = { .irq_on = ata_irq_on,/* Generic PATA PCI ATA helpers */ - .port_start = ata_port_start, + .port_start = ata_sff_port_start, };
drivers/ata/pata_marvell.c +1 -0
@@ -118,6 +118,7 @@ static const struct ata_port_operations marvell_ops = { .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, + .mode_filter = ata_pci_default_filter, .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, .error_handler = marvell_error_handler,
drivers/ata/pata_mpc52xx.c +2 -2
@@ -272,13 +272,13 @@ static struct scsi_host_template mpc52xx_ata_sht = { .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, .sg_tablesize = LIBATA_MAX_PRD, - .max_sectors = ATA_MAX_SECTORS, .cmd_per_lun = ATA_SHT_CMD_PER_LUN, .emulated = ATA_SHT_EMULATED, .use_clustering = ATA_SHT_USE_CLUSTERING, .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, + .slave_destroy = ata_scsi_slave_destroy, .bios_param = ata_std_bios_param, };
@@ -298,7 +298,7 @@ static struct ata_port_operations mpc52xx_ata_port_ops = { .data_xfer = ata_data_xfer, .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, - .port_start = ata_port_start, + .port_start = ata_sff_port_start, }; static int __devinit
drivers/ata/pata_netcell.c +1 -0
@@ -47,6 +47,7 @@ static const struct ata_port_operations netcell_ops = { .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, + .mode_filter = ata_pci_default_filter, .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, .error_handler = ata_bmdma_error_handler,
drivers/ata/pata_opti.c +1 -6
@@ -196,18 +196,13 @@ static struct ata_port_operations opti_port_ops = { .post_internal_cmd = ata_bmdma_post_internal_cmd, .cable_detect = ata_cable_40wire, - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot, .data_xfer = ata_data_xfer, .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
drivers/ata/pata_optidma.c +2 -0
@@ -370,6 +370,7 @@ static struct scsi_host_template optidma_sht = {static struct ata_port_operations optidma_port_ops = { .set_piomode = optidma_set_pio_mode, .set_dmamode = optidma_set_dma_mode, + .mode_filter = ata_pci_default_filter, .tf_load = ata_tf_load, .tf_read = ata_tf_read,
@@ -404,6 +405,7 @@ static struct ata_port_operations optidma_port_ops = {static struct ata_port_operations optiplus_port_ops = { .set_piomode = optiplus_set_pio_mode, .set_dmamode = optiplus_set_dma_mode, + .mode_filter = ata_pci_default_filter, .tf_load = ata_tf_load, .tf_read = ata_tf_read,
drivers/ata/pata_platform.c +0 -4
@@ -46,8 +46,6 @@ static int pata_platform_set_mode(struct ata_link *link, struct ata_device **unureturn 0 ; } -static int ata_dummy_ret0 (struct ata_port *ap) {return 0 ; } -static struct scsi_host_template pata_platform_sht = { .module =THIS_MODULE , .name =DRV_NAME ,
@@ -88,8 +86,6 @@ static struct ata_port_operations pata_platform_port_ops = { .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, - - .port_start = ata_dummy_ret0, }; static void pata_platform_setup_port(struct ata_ioports *ioaddr,
drivers/ata/pata_rb500_cf.c +1 -8
@@ -117,11 +117,6 @@ static irqreturn_t rb500_pata_irq_handler(int irq, void *dev_instance)return IRQ_HANDLED ; } -static int rb500_pata_port_start (struct ata_port *ap) -{ -return 0 ; -} -static struct ata_port_operations rb500_pata_port_ops = { .tf_load = ata_tf_load, .tf_read = ata_tf_read,
@@ -138,12 +133,10 @@ static struct ata_port_operations rb500_pata_port_ops = { .freeze = rb500_pata_freeze, .thaw = rb500_pata_thaw, .error_handler = ata_bmdma_error_handler, + .post_internal_cmd = ata_bmdma_post_internal_cmd, - .irq_handler = rb500_pata_irq_handler, .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, - - .port_start = rb500_pata_port_start, };/* ------------------------------------------------------------------------ */
drivers/ata/pata_rz1000.c +1 -6
@@ -79,11 +79,6 @@ static struct ata_port_operations rz1000_port_ops = { .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot,
@@ -96,7 +91,7 @@ static struct ata_port_operations rz1000_port_ops = { .cable_detect = ata_cable_40wire, .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, + .irq_clear = ata_noop_irq_clear, .irq_on = ata_irq_on, .port_start = ata_sff_port_start,
drivers/ata/sata_fsl.c +1 -0
@@ -1216,6 +1216,7 @@ static const struct ata_port_operations sata_fsl_ops = { .tf_read = sata_fsl_tf_read, + .qc_defer = ata_std_qc_defer, .qc_prep = sata_fsl_qc_prep, .qc_issue = sata_fsl_qc_issue, .irq_clear = ata_noop_irq_clear,
drivers/ata/sata_mv.c +0 -6
@@ -557,8 +557,6 @@ static const struct ata_port_operations mv5_ops = { .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, - .cable_detect = ata_cable_sata, - .qc_prep = mv_qc_prep, .qc_issue = mv_qc_issue, .data_xfer = ata_data_xfer,
@@ -585,8 +583,6 @@ static const struct ata_port_operations mv6_ops = { .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, - .cable_detect = ata_cable_sata, - .qc_prep = mv_qc_prep, .qc_issue = mv_qc_issue, .data_xfer = ata_data_xfer,
@@ -613,8 +609,6 @@ static const struct ata_port_operations mv_iie_ops = { .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, - .cable_detect = ata_cable_sata, - .qc_prep = mv_qc_prep_iie, .qc_issue = mv_qc_issue, .data_xfer = ata_data_xfer,
drivers/ata/sata_nv.c +8 -3
@@ -452,6 +452,7 @@ static const struct ata_port_operations nv_generic_ops = { .bmdma_status = ata_bmdma_status, .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot, + .mode_filter = ata_pci_default_filter, .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, .error_handler = nv_error_handler,
@@ -461,7 +462,7 @@ static const struct ata_port_operations nv_generic_ops = { .irq_on = ata_irq_on, .scr_read = nv_scr_read, .scr_write = nv_scr_write, - .port_start = ata_port_start, + .port_start = ata_sff_port_start, };static const struct ata_port_operations nv_nf2_ops = {
@@ -476,6 +477,7 @@ static const struct ata_port_operations nv_nf2_ops = { .bmdma_status = ata_bmdma_status, .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot, + .mode_filter = ata_pci_default_filter, .freeze = nv_nf2_freeze, .thaw = nv_nf2_thaw, .error_handler = nv_error_handler,
@@ -485,7 +487,7 @@ static const struct ata_port_operations nv_nf2_ops = { .irq_on = ata_irq_on, .scr_read = nv_scr_read, .scr_write = nv_scr_write, - .port_start = ata_port_start, + .port_start = ata_sff_port_start, };static const struct ata_port_operations nv_ck804_ops = {
@@ -500,6 +502,7 @@ static const struct ata_port_operations nv_ck804_ops = { .bmdma_status = ata_bmdma_status, .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot, + .mode_filter = ata_pci_default_filter, .freeze = nv_ck804_freeze, .thaw = nv_ck804_thaw, .error_handler = nv_error_handler,
@@ -509,7 +512,7 @@ static const struct ata_port_operations nv_ck804_ops = { .irq_on = ata_irq_on, .scr_read = nv_scr_read, .scr_write = nv_scr_write, - .port_start = ata_port_start, + .port_start = ata_sff_port_start, .host_stop = nv_ck804_host_stop, };
@@ -527,6 +530,7 @@ static const struct ata_port_operations nv_adma_ops = { .qc_defer = ata_std_qc_defer, .qc_prep = nv_adma_qc_prep, .qc_issue = nv_adma_qc_issue, + .mode_filter = ata_pci_default_filter, .freeze = nv_adma_freeze, .thaw = nv_adma_thaw, .error_handler = nv_adma_error_handler,
@@ -558,6 +562,7 @@ static const struct ata_port_operations nv_swncq_ops = { .qc_defer = ata_std_qc_defer, .qc_prep = nv_swncq_qc_prep, .qc_issue = nv_swncq_qc_issue, + .mode_filter = ata_pci_default_filter, .freeze = nv_mcp55_freeze, .thaw = nv_mcp55_thaw, .error_handler = nv_swncq_error_handler,
drivers/ata/sata_sil.c +2 -1
@@ -192,6 +192,7 @@ static const struct ata_port_operations sil_ops = { .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, .set_mode = sil_set_mode, + .mode_filter = ata_pci_default_filter, .bmdma_setup = ata_bmdma_setup, .bmdma_start = ata_bmdma_start, .bmdma_stop = ata_bmdma_stop,
@@ -207,7 +208,7 @@ static const struct ata_port_operations sil_ops = { .irq_on = ata_irq_on, .scr_read = sil_scr_read, .scr_write = sil_scr_write, - .port_start = ata_port_start, + .port_start = ata_sff_port_start, };static const struct ata_port_info sil_port_info[] = {
drivers/ata/sata_sis.c +2 -1
@@ -116,6 +116,7 @@ static const struct ata_port_operations sis_ops = { .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot, .data_xfer = ata_data_xfer, + .mode_filter = ata_pci_default_filter, .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, .error_handler = ata_bmdma_error_handler,
@@ -124,7 +125,7 @@ static const struct ata_port_operations sis_ops = { .irq_on = ata_irq_on, .scr_read = sis_scr_read, .scr_write = sis_scr_write, - .port_start = ata_port_start, + .port_start = ata_sff_port_start, };static const struct ata_port_info sis_port_info = {
drivers/ata/sata_svw.c +2 -1
@@ -362,6 +362,7 @@ static const struct ata_port_operations k2_sata_ops = { .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot, .data_xfer = ata_data_xfer, + .mode_filter = ata_pci_default_filter, .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, .error_handler = ata_bmdma_error_handler,
@@ -370,7 +371,7 @@ static const struct ata_port_operations k2_sata_ops = { .irq_on = ata_irq_on, .scr_read = k2_sata_scr_read, .scr_write = k2_sata_scr_write, - .port_start = ata_port_start, + .port_start = ata_sff_port_start, };static const struct ata_port_info k2_port_info[] = {
drivers/ata/sata_uli.c +2 -1
@@ -108,6 +108,7 @@ static const struct ata_port_operations uli_ops = { .qc_issue = ata_qc_issue_prot, .data_xfer = ata_data_xfer, + .mode_filter = ata_pci_default_filter, .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, .error_handler = ata_bmdma_error_handler,
@@ -119,7 +120,7 @@ static const struct ata_port_operations uli_ops = { .scr_read = uli_scr_read, .scr_write = uli_scr_write, - .port_start = ata_port_start, + .port_start = ata_sff_port_start, };static const struct ata_port_info uli_port_info = {
drivers/ata/sata_via.c +8 -4
@@ -118,6 +118,8 @@ static struct scsi_host_template svia_sht = { };static const struct ata_port_operations vt6420_sata_ops = { + .mode_filter = ata_pci_default_filter, + .tf_load = ata_tf_load, .tf_read = ata_tf_read, .check_status = ata_check_status,
@@ -141,12 +143,13 @@ static const struct ata_port_operations vt6420_sata_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 vt6421_pata_ops = { .set_piomode = vt6421_set_pio_mode, .set_dmamode = vt6421_set_dma_mode, + .mode_filter = ata_pci_default_filter, .tf_load = ata_tf_load, .tf_read = ata_tf_read,
@@ -172,10 +175,12 @@ static const struct ata_port_operations vt6421_pata_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 vt6421_sata_ops = { + .mode_filter = ata_pci_default_filter, + .tf_load = ata_tf_load, .tf_read = ata_tf_read, .check_status = ata_check_status,
@@ -195,7 +200,6 @@ static const struct ata_port_operations vt6421_sata_ops = { .thaw = ata_bmdma_thaw, .error_handler = ata_bmdma_error_handler, .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = ata_cable_sata, .irq_clear = ata_bmdma_irq_clear, .irq_on = ata_irq_on,
@@ -203,7 +207,7 @@ static const struct ata_port_operations vt6421_sata_ops = { .scr_read = svia_scr_read, .scr_write = svia_scr_write, - .port_start = ata_port_start, + .port_start = ata_sff_port_start, };static const struct ata_port_info vt6420_port_info = {
drivers/ata/sata_vsc.c +2 -1
@@ -331,6 +331,7 @@ static const struct ata_port_operations vsc_sata_ops = { .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot, .data_xfer = ata_data_xfer, + .mode_filter = ata_pci_default_filter, .freeze = vsc_freeze, .thaw = vsc_thaw, .error_handler = ata_bmdma_error_handler,
@@ -339,7 +340,7 @@ static const struct ata_port_operations vsc_sata_ops = { .irq_on = ata_irq_on, .scr_read = vsc_sata_scr_read, .scr_write = vsc_sata_scr_write, - .port_start = ata_port_start, + .port_start = ata_sff_port_start, }; static void __devinit vsc_sata_setup_port(struct ata_ioports *port,
Signature · 1 line
1.5.2.4
PATCH 4/9 libata: implement and use SHT initializers
In reply to Tejun Heolibata lets low level drivers build scsi_host_template and register it to the SCSI layer. This allows low level drivers high level of flexibility but also burdens them with lots of boilerplate entries.
This patch implements SHT initializers which can be used to initialize all the boilerplate entries in a sht. Three variants of them are implemented - BASE, BMDMA and NCQ - for different types of drivers. Note that entries can be overriden by putting individual initializers after the helper macro.
All sht tables are identical before and after this patch.
Signed-off-by Tejun Heo <[email protected]>
--- drivers/ata/ahci.c | 15 +--------- drivers/ata/ata_generic.c | 16 +---------- drivers/ata/ata_piix.c | 16 +---------- drivers/ata/pata_acpi.c | 17 +----------- drivers/ata/pata_ali.c | 16 +---------- drivers/ata/pata_amd.c | 16 +---------- drivers/ata/pata_artop.c | 16 +---------- drivers/ata/pata_at32.c | 16 +---------- drivers/ata/pata_atiixp.c | 15 +--------- drivers/ata/pata_bf54x.c | 14 +--------- drivers/ata/pata_cmd640.c | 16 +---------- drivers/ata/pata_cmd64x.c | 16 +---------- drivers/ata/pata_cs5520.c | 15 +--------- drivers/ata/pata_cs5530.c | 17 +---------- drivers/ata/pata_cs5535.c | 16 +---------- drivers/ata/pata_cs5536.c | 16 +---------- drivers/ata/pata_cypress.c | 16 +---------- drivers/ata/pata_efar.c | 16 +---------- drivers/ata/pata_hpt366.c | 16 +---------- drivers/ata/pata_hpt37x.c | 16 +---------- drivers/ata/pata_hpt3x2n.c | 16 +---------- drivers/ata/pata_hpt3x3.c | 16 +---------- drivers/ata/pata_icside.c | 14 +--------- drivers/ata/pata_isapnp.c | 16 +---------- drivers/ata/pata_it8213.c | 16 +---------- drivers/ata/pata_it821x.c | 16 +---------- drivers/ata/pata_ixp4xx_cf.c | 16 +---------- drivers/ata/pata_jmicron.c | 17 +----------- drivers/ata/pata_legacy.c | 16 +---------- drivers/ata/pata_marvell.c | 17 +----------- drivers/ata/pata_mpc52xx.c | 16 +---------- drivers/ata/pata_mpiix.c | 16 +---------- drivers/ata/pata_netcell.c | 17 +----------- drivers/ata/pata_ninja32.c | 16 +---------- drivers/ata/pata_ns87410.c | 16 +---------- drivers/ata/pata_ns87415.c | 16 +---------- drivers/ata/pata_oldpiix.c | 16 +---------- drivers/ata/pata_opti.c | 16 +---------- drivers/ata/pata_optidma.c | 16 +---------- drivers/ata/pata_pcmcia.c | 16 +---------- drivers/ata/pata_pdc2027x.c | 16 +---------- drivers/ata/pata_pdc202xx_old.c | 16 +---------- drivers/ata/pata_platform.c | 16 +---------- drivers/ata/pata_qdi.c | 16 +---------- drivers/ata/pata_radisys.c | 16 +---------- drivers/ata/pata_rb500_cf.c | 17 +----------- drivers/ata/pata_rz1000.c | 16 +---------- drivers/ata/pata_sc1200.c | 17 +---------- drivers/ata/pata_scc.c | 16 +---------- drivers/ata/pata_serverworks.c | 16 +---------- drivers/ata/pata_sil680.c | 16 +---------- drivers/ata/pata_sis.c | 16 +---------- drivers/ata/pata_sl82c105.c | 16 +---------- drivers/ata/pata_triflex.c | 16 +---------- drivers/ata/pata_via.c | 16 +---------- drivers/ata/pata_winbond.c | 16 +---------- drivers/ata/pdc_adma.c | 14 +--------- drivers/ata/sata_fsl.c | 14 +--------- drivers/ata/sata_inic162x.c | 16 +---------- drivers/ata/sata_mv.c | 28 +----------------- drivers/ata/sata_nv.c | 42 ++-------------------------- drivers/ata/sata_promise.c | 14 +--------- drivers/ata/sata_qstor.c | 14 +--------- drivers/ata/sata_sil.c | 16 +---------- drivers/ata/sata_sil24.c | 14 +--------- drivers/ata/sata_sis.c | 16 +---------- drivers/ata/sata_svw.c | 16 +---------- drivers/ata/sata_sx4.c | 14 +--------- drivers/ata/sata_uli.c | 16 +---------- drivers/ata/sata_via.c | 16 +---------- drivers/ata/sata_vsc.c | 16 +---------- include/linux/libata.h | 57 +++++++++++++++++++++++++++++++++++++++ 72 files changed, 133 insertions(+), 1086 deletions(-)
drivers/ata/ahci.c +1 -14
@@ -58,7 +58,6 @@ enum {AHCI_MAX_PORTS =32 ,AHCI_MAX_SG =168 ,/* hardware max is 64K */ AHCI_DMA_BOUNDARY =0xffffffff , -AHCI_USE_CLUSTERING =1 ,AHCI_MAX_CMDS =32 ,AHCI_CMD_SZ =32 , AHCI_CMD_SLOT_SZ = AHCI_MAX_CMDS * AHCI_CMD_SZ,
@@ -270,22 +269,10 @@ static struct class_device_attribute *ahci_shost_attrs[] = { };static struct scsi_host_template ahci_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .change_queue_depth = ata_scsi_change_queue_depth, +ATA_NCQ_SHT (DRV_NAME ), .can_queue =AHCI_MAX_CMDS -1 , - .this_id =ATA_SHT_THIS_ID , .sg_tablesize =AHCI_MAX_SG , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =AHCI_USE_CLUSTERING , - .proc_name =DRV_NAME , .dma_boundary =AHCI_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, .shost_attrs = ahci_shost_attrs, };
drivers/ata/ata_generic.c +1 -15
@@ -95,21 +95,7 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused) }static struct scsi_host_template generic_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations generic_port_ops = {
drivers/ata/ata_piix.c +1 -15
@@ -291,21 +291,7 @@ static struct pci_driver piix_pci_driver = { };static struct scsi_host_template piix_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations piix_pata_ops = {
drivers/ata/pata_acpi.c +1 -16
@@ -232,22 +232,7 @@ static int pacpi_port_start(struct ata_port *ap) }static struct scsi_host_template pacpi_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, -/* Use standard CHS mapping rules */ - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations pacpi_ops = {
drivers/ata/pata_ali.c +1 -15
@@ -301,21 +301,7 @@ static int ali_check_atapi_dma(struct ata_queued_cmd *qc) }static struct scsi_host_template ali_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };/*
drivers/ata/pata_amd.c +1 -15
@@ -353,21 +353,7 @@ static void nv_host_stop(struct ata_host *host) }static struct scsi_host_template amd_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations amd33_port_ops = {
drivers/ata/pata_artop.c +1 -15
@@ -314,21 +314,7 @@ static void artop6260_set_dmamode (struct ata_port *ap, struct ata_device *adev) }static struct scsi_host_template artop_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations artop6210_ops = {
drivers/ata/pata_at32.c +1 -15
@@ -167,21 +167,7 @@ static void pata_at32_set_piomode(struct ata_port *ap, struct ata_device *adev) }static struct scsi_host_template at32_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_PIO_SHT (DRV_NAME ), };static struct ata_port_operations at32_port_ops = {
drivers/ata/pata_atiixp.c +1 -14
@@ -221,21 +221,8 @@ static void atiixp_bmdma_stop(struct ata_queued_cmd *qc) }static struct scsi_host_template atiixp_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , +ATA_BMDMA_SHT (DRV_NAME ), .sg_tablesize =LIBATA_DUMB_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, };static struct ata_port_operations atiixp_port_ops = {
drivers/ata/pata_bf54x.c +1 -13
@@ -1357,21 +1357,9 @@ static int bfin_port_start(struct ata_port *ap) }static struct scsi_host_template bfin_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , +ATA_BASE_SHT (DRV_NAME ), .sg_tablesize =SG_NONE , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, };static const struct ata_port_operations bfin_pata_ops = {
drivers/ata/pata_cmd640.c +1 -15
@@ -166,21 +166,7 @@ static int cmd640_port_start(struct ata_port *ap) }static struct scsi_host_template cmd640_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations cmd640_port_ops = {
drivers/ata/pata_cmd64x.c +1 -15
@@ -266,21 +266,7 @@ static void cmd646r1_bmdma_stop(struct ata_queued_cmd *qc) }static struct scsi_host_template cmd64x_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations cmd64x_port_ops = {
drivers/ata/pata_cs5520.c +1 -14
@@ -140,21 +140,8 @@ static void cs5520_set_piomode(struct ata_port *ap, struct ata_device *adev) }static struct scsi_host_template cs5520_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , +ATA_BMDMA_SHT (DRV_NAME ), .sg_tablesize =LIBATA_DUMB_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, };static struct ata_port_operations cs5520_port_ops = {
drivers/ata/pata_cs5530.c +2 -15
@@ -161,21 +161,8 @@ static unsigned int cs5530_qc_issue_prot(struct ata_queued_cmd *qc) }static struct scsi_host_template cs5530_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_DUMB_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), + .sg_tablesize =LIBATA_DUMB_MAX_PRD , };static struct ata_port_operations cs5530_port_ops = {
drivers/ata/pata_cs5535.c +1 -15
@@ -158,21 +158,7 @@ static void cs5535_set_dmamode(struct ata_port *ap, struct ata_device *adev) }static struct scsi_host_template cs5535_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations cs5535_port_ops = {
drivers/ata/pata_cs5536.c +1 -15
@@ -221,21 +221,7 @@ static void cs5536_set_dmamode(struct ata_port *ap, struct ata_device *adev) }static struct scsi_host_template cs5536_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations cs5536_port_ops = {
drivers/ata/pata_cypress.c +1 -15
@@ -110,21 +110,7 @@ static void cy82c693_set_dmamode(struct ata_port *ap, struct ata_device *adev) }static struct scsi_host_template cy82c693_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations cy82c693_port_ops = {
drivers/ata/pata_efar.c +1 -15
@@ -233,21 +233,7 @@ static void efar_set_dmamode (struct ata_port *ap, struct ata_device *adev) }static struct scsi_host_template efar_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations efar_ops = {
drivers/ata/pata_hpt366.c +1 -15
@@ -290,21 +290,7 @@ static void hpt366_set_dmamode(struct ata_port *ap, struct ata_device *adev) }static struct scsi_host_template hpt36x_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };/*
drivers/ata/pata_hpt37x.c +1 -15
@@ -619,21 +619,7 @@ static void hpt37x_bmdma_stop(struct ata_queued_cmd *qc)static struct scsi_host_template hpt37x_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };/*
drivers/ata/pata_hpt3x2n.c +1 -15
@@ -339,21 +339,7 @@ static unsigned int hpt3x2n_qc_issue_prot(struct ata_queued_cmd *qc) }static struct scsi_host_template hpt3x2n_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };/*
drivers/ata/pata_hpt3x3.c +1 -15
@@ -102,21 +102,7 @@ static int hpt3x3_atapi_dma(struct ata_queued_cmd *qc) }static struct scsi_host_template hpt3x3_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations hpt3x3_port_ops = {
drivers/ata/pata_icside.c +1 -13
@@ -305,21 +305,9 @@ static int icside_dma_init(struct pata_icside_info *info)static struct scsi_host_template pata_icside_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , +ATA_BASE_SHT (DRV_NAME ), .sg_tablesize =PATA_ICSIDE_MAX_SG , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , .dma_boundary = ~0 ,/* no dma boundaries */ - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, };static void pata_icside_postreset (struct ata_link *link,unsigned int *classes)
drivers/ata/pata_isapnp.c +1 -15
@@ -20,21 +20,7 @@#define DRV_VERSION "0.2.2"static struct scsi_host_template isapnp_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_PIO_SHT (DRV_NAME ), };static struct ata_port_operations isapnp_port_ops = {
drivers/ata/pata_it8213.c +1 -15
@@ -243,21 +243,7 @@ static void it8213_set_dmamode (struct ata_port *ap, struct ata_device *adev) }static struct scsi_host_template it8213_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations it8213_ops = {
drivers/ata/pata_it821x.c +1 -15
@@ -632,21 +632,7 @@ static int it821x_port_start(struct ata_port *ap) }static struct scsi_host_template it821x_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations it821x_smart_port_ops = {
drivers/ata/pata_ixp4xx_cf.c +1 -15
@@ -88,21 +88,7 @@ static unsigned int ixp4xx_mmio_data_xfer(struct ata_device *dev, }static struct scsi_host_template ixp4xx_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_PIO_SHT (DRV_NAME ), };static struct ata_port_operations ixp4xx_port_ops = {
drivers/ata/pata_jmicron.c +1 -16
@@ -122,22 +122,7 @@ static void jmicron_error_handler(struct ata_port *ap)/* No PIO or DMA methods needed for this device */ static struct scsi_host_template jmicron_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, -/* Use standard CHS mapping rules */ - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations jmicron_ops = {
drivers/ata/pata_legacy.c +1 -15
@@ -208,21 +208,7 @@ static int legacy_set_mode(struct ata_link *link, struct ata_device **unused) }static struct scsi_host_template legacy_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_PIO_SHT (DRV_NAME ), };/*
drivers/ata/pata_marvell.c +1 -16
@@ -92,22 +92,7 @@ static void marvell_error_handler(struct ata_port *ap)/* No PIO or DMA methods needed for this device */ static struct scsi_host_template marvell_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, -/* Use standard CHS mapping rules */ - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations marvell_ops = {
drivers/ata/pata_mpc52xx.c +1 -15
@@ -265,21 +265,7 @@ mpc52xx_ata_error_handler(struct ata_port *ap)static struct scsi_host_template mpc52xx_ata_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_PIO_SHT (DRV_NAME ), };static struct ata_port_operations mpc52xx_ata_port_ops = {
drivers/ata/pata_mpiix.c +1 -15
@@ -151,21 +151,7 @@ static unsigned int mpiix_qc_issue_prot(struct ata_queued_cmd *qc) }static struct scsi_host_template mpiix_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_PIO_SHT (DRV_NAME ), };static struct ata_port_operations mpiix_port_ops = {
drivers/ata/pata_netcell.c +1 -16
@@ -21,22 +21,7 @@/* No PIO or DMA methods needed for this device */ static struct scsi_host_template netcell_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, -/* Use standard CHS mapping rules */ - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations netcell_ops = {
drivers/ata/pata_ninja32.c +1 -15
@@ -79,21 +79,7 @@ static void ninja32_dev_select(struct ata_port *ap, unsigned int device) }static struct scsi_host_template ninja32_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations ninja32_port_ops = {
drivers/ata/pata_ns87410.c +1 -15
@@ -144,21 +144,7 @@ static unsigned int ns87410_qc_issue_prot(struct ata_queued_cmd *qc) }static struct scsi_host_template ns87410_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_PIO_SHT (DRV_NAME ), };static struct ata_port_operations ns87410_port_ops = {
drivers/ata/pata_ns87415.c +1 -15
@@ -366,21 +366,7 @@ static const struct ata_port_operations ns87415_pata_ops = { };static struct scsi_host_template ns87415_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };
drivers/ata/pata_oldpiix.c +1 -15
@@ -220,21 +220,7 @@ static unsigned int oldpiix_qc_issue_prot(struct ata_queued_cmd *qc)static struct scsi_host_template oldpiix_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations oldpiix_pata_ops = {
drivers/ata/pata_opti.c +1 -15
@@ -165,21 +165,7 @@ static void opti_set_piomode(struct ata_port *ap, struct ata_device *adev) }static struct scsi_host_template opti_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_PIO_SHT (DRV_NAME ), };static struct ata_port_operations opti_port_ops = {
drivers/ata/pata_optidma.c +1 -15
@@ -350,21 +350,7 @@ static int optidma_set_mode(struct ata_link *link, struct ata_device **r_failed) }static struct scsi_host_template optidma_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations optidma_port_ops = {
drivers/ata/pata_pcmcia.c +1 -15
@@ -128,21 +128,7 @@ static unsigned int ata_data_xfer_8bit(struct ata_device *dev,static struct scsi_host_template pcmcia_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_PIO_SHT (DRV_NAME ), };static struct ata_port_operations pcmcia_port_ops = {
drivers/ata/pata_pdc2027x.c +1 -15
@@ -129,21 +129,7 @@ static struct pci_driver pdc2027x_pci_driver = { };static struct scsi_host_template pdc2027x_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations pdc2027x_pata100_ops = {
drivers/ata/pata_pdc202xx_old.c +1 -15
@@ -262,21 +262,7 @@ static int pdc2026x_check_atapi_dma(struct ata_queued_cmd *qc) }static struct scsi_host_template pdc202xx_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations pdc2024x_port_ops = {
drivers/ata/pata_platform.c +1 -15
@@ -47,21 +47,7 @@ static int pata_platform_set_mode(struct ata_link *link, struct ata_device **unu }static struct scsi_host_template pata_platform_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_PIO_SHT (DRV_NAME ), };static struct ata_port_operations pata_platform_port_ops = {
drivers/ata/pata_qdi.c +1 -15
@@ -154,21 +154,7 @@ static unsigned int qdi_data_xfer(struct ata_device *dev, unsigned char *buf, }static struct scsi_host_template qdi_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_PIO_SHT (DRV_NAME ), };static struct ata_port_operations qdi6500_port_ops = {
drivers/ata/pata_radisys.c +1 -15
@@ -185,21 +185,7 @@ static unsigned int radisys_qc_issue_prot(struct ata_queued_cmd *qc)static struct scsi_host_template radisys_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations radisys_pata_ops = {
drivers/ata/pata_rb500_cf.c +1 -16
@@ -142,22 +142,7 @@ static struct ata_port_operations rb500_pata_port_ops = {/* ------------------------------------------------------------------------ */ static struct scsi_host_template rb500_pata_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, - .proc_name =DRV_NAME , - - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .dma_boundary =ATA_DMA_BOUNDARY , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , +ATA_PIO_SHT (DRV_NAME ), };/* ------------------------------------------------------------------------ */
drivers/ata/pata_rz1000.c +1 -15
@@ -53,21 +53,7 @@ static int rz1000_set_mode(struct ata_link *link, struct ata_device **unused)static struct scsi_host_template rz1000_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_PIO_SHT (DRV_NAME ), };static struct ata_port_operations rz1000_port_ops = {
drivers/ata/pata_sc1200.c +2 -15
@@ -179,21 +179,8 @@ static unsigned int sc1200_qc_issue_prot(struct ata_queued_cmd *qc) }static struct scsi_host_template sc1200_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_DUMB_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), + .sg_tablesize =LIBATA_DUMB_MAX_PRD , };static struct ata_port_operations sc1200_port_ops = {
drivers/ata/pata_scc.c +1 -15
@@ -968,21 +968,7 @@ static void scc_port_stop (struct ata_port *ap) }static struct scsi_host_template scc_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations scc_pata_ops = {
drivers/ata/pata_serverworks.c +1 -15
@@ -298,21 +298,7 @@ static void serverworks_set_dmamode(struct ata_port *ap, struct ata_device *adev }static struct scsi_host_template serverworks_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations serverworks_osb4_port_ops = {
drivers/ata/pata_sil680.c +1 -15
@@ -192,21 +192,7 @@ static void sil680_set_dmamode(struct ata_port *ap, struct ata_device *adev) }static struct scsi_host_template sil680_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations sil680_port_ops = {
drivers/ata/pata_sis.c +1 -15
@@ -514,21 +514,7 @@ static void sis_133_set_dmamode (struct ata_port *ap, struct ata_device *adev) }static struct scsi_host_template sis_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations sis_133_ops = {
drivers/ata/pata_sl82c105.c +1 -15
@@ -235,21 +235,7 @@ static int sl82c105_qc_defer(struct ata_queued_cmd *qc) }static struct scsi_host_template sl82c105_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations sl82c105_port_ops = {
drivers/ata/pata_triflex.c +1 -15
@@ -180,21 +180,7 @@ static void triflex_bmdma_stop(struct ata_queued_cmd *qc) }static struct scsi_host_template triflex_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations triflex_port_ops = {
drivers/ata/pata_via.c +1 -15
@@ -335,21 +335,7 @@ static void via_set_dmamode(struct ata_port *ap, struct ata_device *adev) }static struct scsi_host_template via_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static struct ata_port_operations via_port_ops = {
drivers/ata/pata_winbond.c +1 -15
@@ -122,21 +122,7 @@ static unsigned int winbond_data_xfer(struct ata_device *dev, }static struct scsi_host_template winbond_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_PIO_SHT (DRV_NAME ), };static struct ata_port_operations winbond_port_ops = {
drivers/ata/pdc_adma.c +1 -13
@@ -143,21 +143,9 @@ static void adma_thaw(struct ata_port *ap);static void adma_error_handler (struct ata_port *ap);static struct scsi_host_template adma_ata_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, - .proc_name =DRV_NAME , - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , +ATA_BASE_SHT (DRV_NAME ), .sg_tablesize =LIBATA_MAX_PRD , .dma_boundary =ADMA_DMA_BOUNDARY , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .use_clustering =ENABLE_CLUSTERING , - .emulated =ATA_SHT_EMULATED , };static const struct ata_port_operations adma_ata_ops = {
drivers/ata/sata_fsl.c +1 -13
@@ -1191,22 +1191,10 @@ static int sata_fsl_init_controller(struct ata_host *host)* scsi mid-layer and libata interface structures */ static struct scsi_host_template sata_fsl_sht = { - .module =THIS_MODULE , - .name ="sata_fsl" , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .change_queue_depth = ata_scsi_change_queue_depth, +ATA_NCQ_SHT ("sata_fsl" ), .can_queue =SATA_FSL_QUEUE_DEPTH , - .this_id =ATA_SHT_THIS_ID , .sg_tablesize =SATA_FSL_MAX_PRD_USABLE , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name ="sata_fsl" , .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, };static const struct ata_port_operations sata_fsl_ops = {
drivers/ata/sata_inic162x.c +1 -15
@@ -109,21 +109,7 @@ struct inic_port_priv { };static struct scsi_host_template inic_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const int scr_map[] = {
drivers/ata/sata_mv.c +2 -26
@@ -514,40 +514,16 @@ static int __mv_stop_dma(struct ata_port *ap);* PRDs for 64K boundaries in mv_fill_sg(). */ static struct scsi_host_template mv5_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , +ATA_BASE_SHT (DRV_NAME ), .sg_tablesize =MV_MAX_SG_CT /2 , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =1 , - .proc_name =DRV_NAME , .dma_boundary =MV_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, };static struct scsi_host_template mv6_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .change_queue_depth = ata_scsi_change_queue_depth, +ATA_NCQ_SHT (DRV_NAME ), .can_queue =MV_MAX_Q_DEPTH -1 , - .this_id =ATA_SHT_THIS_ID , .sg_tablesize =MV_MAX_SG_CT /2 , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =1 , - .proc_name =DRV_NAME , .dma_boundary =MV_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, };static const struct ata_port_operations mv5_ops = {
drivers/ata/sata_nv.c +3 -39
62 lines not on this page · raw message
drivers/ata/sata_promise.c +1 -13
@@ -153,21 +153,9 @@ static int pdc_pata_cable_detect(struct ata_port *ap);static int pdc_sata_cable_detect (struct ata_port *ap);static struct scsi_host_template pdc_ata_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , +ATA_BASE_SHT (DRV_NAME ), .sg_tablesize =PDC_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, };static const struct ata_port_operations pdc_sata_ops = {
drivers/ata/sata_qstor.c +1 -13
@@ -126,21 +126,9 @@ static void qs_thaw(struct ata_port *ap);static void qs_error_handler (struct ata_port *ap);static struct scsi_host_template qs_ata_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , +ATA_BASE_SHT (DRV_NAME ), .sg_tablesize =QS_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ENABLE_CLUSTERING , - .proc_name =DRV_NAME , .dma_boundary =QS_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, };static const struct ata_port_operations qs_ata_ops = {
drivers/ata/sata_sil.c +1 -15
@@ -167,21 +167,7 @@ static struct pci_driver sil_pci_driver = { };static struct scsi_host_template sil_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations sil_ops = {
drivers/ata/sata_sil24.c +1 -13
@@ -384,22 +384,10 @@ static struct pci_driver sil24_pci_driver = { };static struct scsi_host_template sil24_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .change_queue_depth = ata_scsi_change_queue_depth, +ATA_NCQ_SHT (DRV_NAME ), .can_queue =SIL24_MAX_CMDS , - .this_id =ATA_SHT_THIS_ID , .sg_tablesize =SIL24_MAX_SGE , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, };static const struct ata_port_operations sil24_ops = {
drivers/ata/sata_sis.c +1 -15
@@ -86,21 +86,7 @@ static struct pci_driver sis_pci_driver = { };static struct scsi_host_template sis_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations sis_ops = {
drivers/ata/sata_svw.c +1 -15
@@ -327,24 +327,10 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,static struct scsi_host_template k2_sata_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, +ATA_BMDMA_SHT (DRV_NAME ), #ifdef CONFIG_PPC_OF .proc_info = k2_sata_proc_info, #endif - .bios_param = ata_std_bios_param, };
drivers/ata/sata_sx4.c +1 -13
@@ -236,21 +236,9 @@ static unsigned int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc);static struct scsi_host_template pdc_sata_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , +ATA_BASE_SHT (DRV_NAME ), .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, };static const struct ata_port_operations pdc_20621_ops = {
drivers/ata/sata_uli.c +1 -15
@@ -76,21 +76,7 @@ static struct pci_driver uli_pci_driver = { };static struct scsi_host_template uli_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations uli_ops = {
drivers/ata/sata_via.c +1 -15
@@ -100,21 +100,7 @@ static struct pci_driver svia_pci_driver = { };static struct scsi_host_template svia_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };static const struct ata_port_operations vt6420_sata_ops = {
drivers/ata/sata_vsc.c +1 -15
@@ -300,21 +300,7 @@ out:static struct scsi_host_template vsc_sata_sht = { - .module =THIS_MODULE , - .name =DRV_NAME , - .ioctl = ata_scsi_ioctl, - .queuecommand = ata_scsi_queuecmd, - .can_queue =ATA_DEF_QUEUE , - .this_id =ATA_SHT_THIS_ID , - .sg_tablesize =LIBATA_MAX_PRD , - .cmd_per_lun =ATA_SHT_CMD_PER_LUN , - .emulated =ATA_SHT_EMULATED , - .use_clustering =ATA_SHT_USE_CLUSTERING , - .proc_name =DRV_NAME , - .dma_boundary =ATA_DMA_BOUNDARY , - .slave_configure = ata_scsi_slave_config, - .slave_destroy = ata_scsi_slave_destroy, - .bios_param = ata_std_bios_param, +ATA_BMDMA_SHT (DRV_NAME ), };
include/linux/libata.h +57 -0
63 lines not on this page · raw message
Signature · 1 line
1.5.2.4
PATCH 5/9 libata: implement and use ops inheritance
In reply to Tejun Heolibata lets low level drivers build ata_port_operations table and register it with libata core layer. This allows low level drivers high level of flexibility but also burdens them with lots of boilerplate entries.
This becomes worse for drivers which support related similar controllers which differ slightly. They share most of the operations except for a few. However, the driver still needs to list all operations for each variant. This results in large number of duplicate entries, which is not only inefficient but also error-prone as it becomes very difficult to tell what the actual differences are.
This duplicate boilerplates all over the low level drivers also make updating the core layer exteremely difficult and error-prone. When compounded with multi-branched development model, it ends up accumulating inconsistencies over time. Some of those inconsistencies cause immediate problems and fixed. Others just remain there dormant making maintenance increasingly difficult.
To rectify the problem, this patch implements ata_port_operations inheritance. To allow LLDs to easily re-use their own ops tables overriding only specific methods, this patch implements poor man's class inheritance. An ops table has ->inherits field which can be set to any ops table as long as it doesn't create a loop. When the host is started, the inheritance chain is followed and any operation which isn't specified is taken from the nearest ancestor which has it specified. This operation is called finalization and done only once per an ops table and the LLD doesn't have to do anything special about it other than making the ops table non-const such that libata can update it.
libata provides four base ops tables lower drivers can inherit from - base, sata, pmp, sff and bmdma. To avoid overriding these ops accidentaly, these ops are declared const and LLDs should always inherit these instead of using them directly.
After finalization, all the ops table are identical before and after the patch except for setting .irq_handler to ata_interrupt in drivers which didn't use to. The .irq_handler doesn't have any actual effect and the field will soon be removed by later patch.
* sata_sx4 is still using old style EH and currently doesn't take advantage of ops inheritance.
Signed-off-by Tejun Heo <[email protected]>
--- drivers/ata/ahci.c | 94 ++------------- drivers/ata/ata_generic.c | 31 +----- drivers/ata/ata_piix.c | 149 ++-------------------- drivers/ata/libata-core.c | 113 +++++++++++++++++- drivers/ata/pata_acpi.c | 35 +----- drivers/ata/pata_ali.c | 122 ++---------------- drivers/ata/pata_amd.c | 191 ++++------------------------- drivers/ata/pata_artop.c | 61 +-------- drivers/ata/pata_at32.c | 23 +--- drivers/ata/pata_atiixp.c | 32 +---- drivers/ata/pata_bf54x.c | 4 +- drivers/ata/pata_cmd640.c | 33 +---- drivers/ata/pata_cmd64x.c | 96 ++------------- drivers/ata/pata_cs5520.c | 29 +---- drivers/ata/pata_cs5530.c | 31 +---- drivers/ata/pata_cs5535.c | 31 +----- drivers/ata/pata_cs5536.c | 31 +----- drivers/ata/pata_cypress.c | 31 +----- drivers/ata/pata_efar.c | 30 +---- drivers/ata/pata_hpt366.c | 32 +----- drivers/ata/pata_hpt37x.c | 122 ++----------------- drivers/ata/pata_hpt3x2n.c | 32 +---- drivers/ata/pata_hpt3x3.c | 33 +----- drivers/ata/pata_icside.c | 32 ++---- drivers/ata/pata_isapnp.c | 21 +--- drivers/ata/pata_it8213.c | 31 +---- drivers/ata/pata_it821x.c | 57 ++-------- drivers/ata/pata_ixp4xx_cf.c | 23 +--- drivers/ata/pata_jmicron.c | 31 +----- drivers/ata/pata_legacy.c | 260 +++------------------------------------ drivers/ata/pata_marvell.c | 33 +----- drivers/ata/pata_mpc52xx.c | 18 +-- drivers/ata/pata_mpiix.c | 23 +--- drivers/ata/pata_netcell.c | 32 +----- drivers/ata/pata_ninja32.c | 30 +---- drivers/ata/pata_ns87410.c | 25 +---- drivers/ata/pata_ns87415.c | 68 ++--------- drivers/ata/pata_oldpiix.c | 31 +---- drivers/ata/pata_opti.c | 23 +--- drivers/ata/pata_optidma.c | 63 +--------- drivers/ata/pata_pcmcia.c | 48 +------- drivers/ata/pata_pdc2027x.c | 56 +-------- drivers/ata/pata_pdc202xx_old.c | 75 +++--------- drivers/ata/pata_platform.c | 24 +--- drivers/ata/pata_qdi.c | 47 +------- drivers/ata/pata_radisys.c | 32 +---- drivers/ata/pata_rb500_cf.c | 16 +--- drivers/ata/pata_rz1000.c | 25 +---- drivers/ata/pata_sc1200.c | 33 +----- drivers/ata/pata_scc.c | 7 +- drivers/ata/pata_serverworks.c | 63 +--------- drivers/ata/pata_sil680.c | 30 +---- drivers/ata/pata_sis.c | 177 +++------------------------ drivers/ata/pata_sl82c105.c | 34 +----- drivers/ata/pata_triflex.c | 32 +---- drivers/ata/pata_via.c | 61 +--------- drivers/ata/pata_winbond.c | 25 +---- drivers/ata/pdc_adma.c | 19 ++-- drivers/ata/sata_fsl.c | 5 +- drivers/ata/sata_inic162x.c | 19 +--- drivers/ata/sata_mv.c | 66 ++--------- drivers/ata/sata_nv.c | 113 +++-------------- drivers/ata/sata_promise.c | 64 +++-------- drivers/ata/sata_qstor.c | 20 ++-- drivers/ata/sata_sil.c | 21 +--- drivers/ata/sata_sil24.c | 20 +-- drivers/ata/sata_sis.c | 23 +--- drivers/ata/sata_svw.c | 18 +--- drivers/ata/sata_sx4.c | 3 +- drivers/ata/sata_uli.c | 28 +---- drivers/ata/sata_via.c | 88 +------------ drivers/ata/sata_vsc.c | 19 +--- include/linux/libata.h | 23 +++- 73 files changed, 523 insertions(+), 2998 deletions(-)
drivers/ata/ahci.c +11 -83
@@ -276,118 +276,46 @@ static struct scsi_host_template ahci_sht = { .shost_attrs = ahci_shost_attrs, }; -static const struct ata_port_operations ahci_ops = { +static struct ata_port_operations ahci_ops = { + .inherits = &sata_pmp_port_ops, + .check_status = ahci_check_status, .check_altstatus = ahci_check_status, - .dev_select = ata_noop_dev_select, - - .dev_config = ahci_dev_config, .tf_read = ahci_tf_read, - .qc_defer = sata_pmp_qc_defer_cmd_switch, .qc_prep = ahci_qc_prep, .qc_issue = ahci_qc_issue, - .irq_clear = ata_noop_irq_clear, - - .scr_read = ahci_scr_read, - .scr_write = ahci_scr_write, - .freeze = ahci_freeze, .thaw = ahci_thaw, - .error_handler = ahci_error_handler, .post_internal_cmd = ahci_post_internal_cmd, - - .pmp_attach = ahci_pmp_attach, - .pmp_detach = ahci_pmp_detach, - -#ifdef CONFIG_PM - .port_suspend = ahci_port_suspend, - .port_resume = ahci_port_resume, -#endif - .enable_pm = ahci_enable_alpm, - .disable_pm = ahci_disable_alpm, - - .port_start = ahci_port_start, - .port_stop = ahci_port_stop, -}; - -static const struct ata_port_operations ahci_vt8251_ops = { - .check_status = ahci_check_status, - .check_altstatus = ahci_check_status, - .dev_select = ata_noop_dev_select, - .dev_config = ahci_dev_config, - .tf_read = ahci_tf_read, - - .qc_defer = sata_pmp_qc_defer_cmd_switch, - .qc_prep = ahci_qc_prep, - .qc_issue = ahci_qc_issue, - - .irq_clear = ata_noop_irq_clear, - .scr_read = ahci_scr_read, .scr_write = ahci_scr_write, - - .freeze = ahci_freeze, - .thaw = ahci_thaw, - - .error_handler = ahci_vt8251_error_handler, - .post_internal_cmd = ahci_post_internal_cmd, - .pmp_attach = ahci_pmp_attach, .pmp_detach = ahci_pmp_detach, + .enable_pm = ahci_enable_alpm, + .disable_pm = ahci_disable_alpm, #ifdef CONFIG_PM .port_suspend = ahci_port_suspend, .port_resume = ahci_port_resume, #endif - .enable_pm = ahci_enable_alpm, - .disable_pm = ahci_disable_alpm, - .port_start = ahci_port_start, .port_stop = ahci_port_stop, }; -static const struct ata_port_operations ahci_p5wdh_ops = { - .check_status = ahci_check_status, - .check_altstatus = ahci_check_status, - .dev_select = ata_noop_dev_select, - - .dev_config = ahci_dev_config, - - .tf_read = ahci_tf_read, - - .qc_defer = sata_pmp_qc_defer_cmd_switch, - .qc_prep = ahci_qc_prep, - .qc_issue = ahci_qc_issue, - - .irq_clear = ata_noop_irq_clear, - - .scr_read = ahci_scr_read, - .scr_write = ahci_scr_write, - - .freeze = ahci_freeze, - .thaw = ahci_thaw, +static struct ata_port_operations ahci_vt8251_ops = { + .inherits = &ahci_ops, + .error_handler = ahci_vt8251_error_handler, +}; +static struct ata_port_operations ahci_p5wdh_ops = { + .inherits = &ahci_ops, .error_handler = ahci_p5wdh_error_handler, - .post_internal_cmd = ahci_post_internal_cmd, - - .pmp_attach = ahci_pmp_attach, - .pmp_detach = ahci_pmp_detach, - -#ifdef CONFIG_PM - .port_suspend = ahci_port_suspend, - .port_resume = ahci_port_resume, -#endif - .enable_pm = ahci_enable_alpm, - .disable_pm = ahci_disable_alpm, - - .port_start = ahci_port_start, - .port_stop = ahci_port_stop, };#define AHCI_HFLAGS (flags) .private_data = (void *)(flags)
drivers/ata/ata_generic.c +2 -29
@@ -99,36 +99,9 @@ static struct scsi_host_template generic_sht = { };static struct ata_port_operations generic_port_ops = { - .set_mode = generic_set_mode, - .mode_filter = ata_pci_default_filter, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - - .data_xfer = ata_data_xfer, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, + .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, - - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, + .set_mode = generic_set_mode, };static int all_generic_ide;/* Set to claim all devices */
drivers/ata/ata_piix.c +14 -135
169 lines not on this page · raw message
drivers/ata/libata-core.c +111 -2
152 lines not on this page · raw message
drivers/ata/pata_acpi.c +5 -30
@@ -235,39 +235,14 @@ static struct scsi_host_template pacpi_sht = { ATA_BMDMA_SHT(DRV_NAME), }; -static const struct ata_port_operations pacpi_ops = { +static struct ata_port_operations pacpi_ops = { + .inherits = &ata_bmdma_port_ops, + .qc_issue = pacpi_qc_issue_prot, + .cable_detect = pacpi_cable_detect, + .mode_filter = pacpi_mode_filter, .set_piomode = pacpi_set_piomode, .set_dmamode = pacpi_set_dmamode, - .mode_filter = pacpi_mode_filter, - -/* Task file is PCI ATA format, use helpers */ - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, .error_handler = pacpi_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = pacpi_cable_detect, - -/* BMDMA handling is PCI ATA format, use helpers */ - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - .qc_prep = ata_qc_prep, - .qc_issue = pacpi_qc_issue_prot, - .data_xfer = ata_data_xfer, - -/* Timeout handling */ - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - -/* Generic PATA PCI ATA helpers */ .port_start = pacpi_port_start, };
drivers/ata/pata_ali.c +12 -110
154 lines not on this page · raw message
drivers/ata/pata_amd.c +22 -169
226 lines not on this page · raw message
drivers/ata/pata_artop.c +6 -55
75 lines not on this page · raw message
drivers/ata/pata_at32.c +2 -21
@@ -171,28 +171,9 @@ static struct scsi_host_template at32_sht = { };static struct ata_port_operations at32_port_ops = { - .set_piomode = pata_at32_set_piomode, - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .exec_command = ata_exec_command, - .check_status = ata_check_status, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, + .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, - - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - - .data_xfer = ata_data_xfer, - - .irq_clear = ata_noop_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, + .set_piomode = pata_at32_set_piomode, }; static int __init pata_at32_init_one(struct device *dev,
drivers/ata/pata_atiixp.c +6 -26
@@ -226,36 +226,16 @@ static struct scsi_host_template atiixp_sht = { };static struct ata_port_operations atiixp_port_ops = { - .set_piomode = atiixp_set_piomode, - .set_dmamode = atiixp_set_dmamode, - .mode_filter = ata_pci_default_filter, - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = atiixp_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = atiixp_cable_detect, + .inherits = &ata_bmdma_port_ops, - .bmdma_setup = ata_bmdma_setup, + .qc_prep = ata_dumb_qc_prep, .bmdma_start = atiixp_bmdma_start, .bmdma_stop = atiixp_bmdma_stop, - .bmdma_status = ata_bmdma_status, - - .qc_prep = ata_dumb_qc_prep, - .qc_issue = ata_qc_issue_prot, - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, + .cable_detect = atiixp_cable_detect, + .set_piomode = atiixp_set_piomode, + .set_dmamode = atiixp_set_dmamode, + .error_handler = atiixp_error_handler, };static int atiixp_init_one (struct pci_dev *dev,const struct pci_device_id *id)
drivers/ata/pata_bf54x.c +2 -2
@@ -1363,6 +1363,8 @@ static struct scsi_host_template bfin_sht = { };static const struct ata_port_operations bfin_pata_ops = { + .inherits = &ata_sff_port_ops, + .set_piomode = bfin_set_piomode, .set_dmamode = bfin_set_dmamode,
@@ -1380,14 +1382,12 @@ static const struct ata_port_operations bfin_pata_ops = { .data_xfer = bfin_data_xfer, .qc_prep = ata_noop_qc_prep, - .qc_issue = ata_qc_issue_prot, .freeze = bfin_bmdma_freeze, .thaw = bfin_bmdma_thaw, .error_handler = bfin_error_handler, .post_internal_cmd = bfin_bmdma_stop, - .irq_handler = ata_interrupt, .irq_clear = bfin_irq_clear, .irq_on = bfin_irq_on,
drivers/ata/pata_cmd640.c +5 -28
@@ -170,35 +170,12 @@ static struct scsi_host_template cmd640_sht = { };static struct ata_port_operations cmd640_port_ops = { - .set_piomode = cmd640_set_piomode, - .mode_filter = ata_pci_default_filter, - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = ata_cable_40wire, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - - .qc_prep = ata_qc_prep, - .qc_issue = cmd640_qc_issue_prot, - -/* In theory this is not needed once we kill the prefetcher */ + .inherits = &ata_bmdma_port_ops, +/* In theory xfer_noirq is not needed once we kill the prefetcher */ .data_xfer = ata_data_xfer_noirq, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - + .qc_issue = cmd640_qc_issue_prot, + .cable_detect = ata_cable_40wire, + .set_piomode = cmd640_set_piomode, .port_start = cmd640_port_start, };
drivers/ata/pata_cmd64x.c +10 -86
113 lines not on this page · raw message
drivers/ata/pata_cs5520.c +3 -26
@@ -145,34 +145,11 @@ static struct scsi_host_template cs5520_sht = { };static struct ata_port_operations cs5520_port_ops = { + .inherits = &ata_bmdma_port_ops, + .qc_prep = ata_dumb_qc_prep, + .cable_detect = ata_cable_40wire, .set_piomode = cs5520_set_piomode, .set_dmamode = cs5520_set_dmamode, - .mode_filter = ata_pci_default_filter, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = ata_cable_40wire, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - .qc_prep = ata_dumb_qc_prep, - .qc_issue = ata_qc_issue_prot, - .data_xfer = ata_data_xfer, - - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, };static int __devinit cs5520_init_one (struct pci_dev *pdev,const struct pci_device_id *id)
drivers/ata/pata_cs5530.c +4 -27
@@ -166,37 +166,14 @@ static struct scsi_host_template cs5530_sht = { };static struct ata_port_operations cs5530_port_ops = { - .set_piomode = cs5530_set_piomode, - .set_dmamode = cs5530_set_dmamode, - .mode_filter = ata_pci_default_filter, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = ata_cable_40wire, + .inherits = &ata_bmdma_port_ops, .qc_prep = ata_dumb_qc_prep, .qc_issue = cs5530_qc_issue_prot, - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, + .cable_detect = ata_cable_40wire, + .set_piomode = cs5530_set_piomode, + .set_dmamode = cs5530_set_dmamode, };static const struct dmi_system_id palmax_dmi_table[] = {
drivers/ata/pata_cs5535.c +2 -29
@@ -162,37 +162,10 @@ static struct scsi_host_template cs5535_sht = { };static struct ata_port_operations cs5535_port_ops = { + .inherits = &ata_bmdma_port_ops, + .cable_detect = cs5535_cable_detect, .set_piomode = cs5535_set_piomode, .set_dmamode = cs5535_set_dmamode, - .mode_filter = ata_pci_default_filter, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = cs5535_cable_detect, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, };/**
drivers/ata/pata_cs5536.c +2 -29
@@ -225,37 +225,10 @@ static struct scsi_host_template cs5536_sht = { };static struct ata_port_operations cs5536_port_ops = { + .inherits = &ata_bmdma_port_ops, + .cable_detect = cs5536_cable_detect, .set_piomode = cs5536_set_piomode, .set_dmamode = cs5536_set_dmamode, - .mode_filter = ata_pci_default_filter, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = cs5536_cable_detect, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, };/**
drivers/ata/pata_cypress.c +2 -29
@@ -114,37 +114,10 @@ static struct scsi_host_template cy82c693_sht = { };static struct ata_port_operations cy82c693_port_ops = { + .inherits = &ata_bmdma_port_ops, + .cable_detect = ata_cable_40wire, .set_piomode = cy82c693_set_piomode, .set_dmamode = cy82c693_set_dmamode, - .mode_filter = ata_pci_default_filter, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = ata_cable_40wire, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, };static int cy82c693_init_one (struct pci_dev *pdev,const struct pci_device_id *id)
drivers/ata/pata_efar.c +3 -27
@@ -236,36 +236,12 @@ static struct scsi_host_template efar_sht = { ATA_BMDMA_SHT(DRV_NAME), }; -static const struct ata_port_operations efar_ops = { +static struct ata_port_operations efar_ops = { + .inherits = &ata_bmdma_port_ops, + .cable_detect = efar_cable_detect, .set_piomode = efar_set_piomode, .set_dmamode = efar_set_dmamode, - .mode_filter = ata_pci_default_filter, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, .error_handler = efar_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = efar_cable_detect, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, };
drivers/ata/pata_hpt366.c +3 -29
@@ -298,37 +298,11 @@ static struct scsi_host_template hpt36x_sht = {*/ static struct ata_port_operations hpt366_port_ops = { + .inherits = &ata_bmdma_port_ops, + .cable_detect = hpt36x_cable_detect, + .mode_filter = hpt366_filter, .set_piomode = hpt366_set_piomode, .set_dmamode = hpt366_set_dmamode, - .mode_filter = hpt366_filter, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = hpt36x_cable_detect, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, };/**
drivers/ata/pata_hpt37x.c +11 -111
155 lines not on this page · raw message
drivers/ata/pata_hpt3x2n.c +5 -27
@@ -347,37 +347,15 @@ static struct scsi_host_template hpt3x2n_sht = {*/ static struct ata_port_operations hpt3x2n_port_ops = { - .set_piomode = hpt3x2n_set_piomode, - .set_dmamode = hpt3x2n_set_dmamode, - .mode_filter = ata_pci_default_filter, + .inherits = &ata_bmdma_port_ops, - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = hpt3x2n_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = hpt3x2n_cable_detect, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, .bmdma_stop = hpt3x2n_bmdma_stop, - .bmdma_status = ata_bmdma_status, - - .qc_prep = ata_qc_prep, .qc_issue = hpt3x2n_qc_issue_prot, - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, + .cable_detect = hpt3x2n_cable_detect, + .set_piomode = hpt3x2n_set_piomode, + .set_dmamode = hpt3x2n_set_dmamode, + .error_handler = hpt3x2n_error_handler, };/**
drivers/ata/pata_hpt3x3.c +3 -30
@@ -106,40 +106,13 @@ static struct scsi_host_template hpt3x3_sht = { };static struct ata_port_operations hpt3x3_port_ops = { + .inherits = &ata_bmdma_port_ops, + .check_atapi_dma= hpt3x3_atapi_dma, + .cable_detect = ata_cable_40wire, .set_piomode = hpt3x3_set_piomode, #if defined(CONFIG_PATA_HPT3X3_DMA) .set_dmamode = hpt3x3_set_dmamode, #endif - .mode_filter = ata_pci_default_filter, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = ata_cable_40wire, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - .check_atapi_dma= hpt3x3_atapi_dma, - - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, };/**
drivers/ata/pata_icside.c +8 -24
@@ -339,35 +339,19 @@ static void pata_icside_error_handler(struct ata_port *ap) }static struct ata_port_operations pata_icside_port_ops = { - .set_dmamode = pata_icside_set_dmamode, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .exec_command = ata_exec_command, - .check_status = ata_check_status, - .dev_select = ata_std_dev_select, - - .cable_detect = ata_cable_40wire, - - .bmdma_setup = pata_icside_bmdma_setup, - .bmdma_start = pata_icside_bmdma_start, - - .data_xfer = ata_data_xfer_noirq, - + .inherits = &ata_sff_port_ops,/* no need to build any PRD tables for DMA */ .qc_prep = ata_noop_qc_prep, - .qc_issue = ata_qc_issue_prot, + .data_xfer = ata_data_xfer_noirq, + .bmdma_setup = pata_icside_bmdma_setup, + .bmdma_start = pata_icside_bmdma_start, + .bmdma_stop = pata_icside_bmdma_stop, + .bmdma_status = pata_icside_bmdma_status, - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, + .cable_detect = ata_cable_40wire, + .set_dmamode = pata_icside_set_dmamode, .error_handler = pata_icside_error_handler, .post_internal_cmd = pata_icside_bmdma_stop, - - .irq_clear = ata_noop_irq_clear, - .irq_on = ata_irq_on, - - .bmdma_stop = pata_icside_bmdma_stop, - .bmdma_status = pata_icside_bmdma_status, }; static void __devinit
drivers/ata/pata_isapnp.c +1 -20
@@ -24,27 +24,8 @@ static struct scsi_host_template isapnp_sht = { };static struct ata_port_operations isapnp_port_ops = { - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, + .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, - - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - - .data_xfer = ata_data_xfer, - - .irq_clear = ata_noop_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, };/**
drivers/ata/pata_it8213.c +4 -27
@@ -246,36 +246,13 @@ static struct scsi_host_template it8213_sht = { ATA_BMDMA_SHT(DRV_NAME), }; -static const struct ata_port_operations it8213_ops = { + +static struct ata_port_operations it8213_ops = { + .inherits = &ata_bmdma_port_ops, + .cable_detect = it8213_cable_detect, .set_piomode = it8213_set_piomode, .set_dmamode = it8213_set_dmamode, - .mode_filter = ata_pci_default_filter, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, .error_handler = it8213_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = it8213_cable_detect, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, };
drivers/ata/pata_it821x.c +8 -49
79 lines not on this page · raw message
drivers/ata/pata_ixp4xx_cf.c +2 -21
@@ -92,29 +92,10 @@ static struct scsi_host_template ixp4xx_sht = { };static struct ata_port_operations ixp4xx_port_ops = { - .set_mode = ixp4xx_set_mode, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .exec_command = ata_exec_command, - .check_status = ata_check_status, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, + .inherits = &ata_sff_port_ops, .data_xfer = ixp4xx_mmio_data_xfer, .cable_detect = ata_cable_40wire, - - .irq_handler = ata_interrupt, - .irq_clear = ata_noop_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, + .set_mode = ixp4xx_set_mode, }; static void ixp4xx_setup_port(struct ata_port *ap,
drivers/ata/pata_jmicron.c +2 -29
@@ -125,36 +125,9 @@ static struct scsi_host_template jmicron_sht = { ATA_BMDMA_SHT(DRV_NAME), }; -static const struct ata_port_operations jmicron_ops = { -/* Task file is PCI ATA format, use helpers */ - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .mode_filter = ata_pci_default_filter, - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, +static struct ata_port_operations jmicron_ops = { + .inherits = &ata_bmdma_port_ops, .error_handler = jmicron_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - -/* BMDMA handling is PCI ATA format, use helpers */ - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - .data_xfer = ata_data_xfer, - -/* IRQ-related hooks */ - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - -/* Generic PATA PCI ATA helpers */ - .port_start = ata_sff_port_start, };
drivers/ata/pata_legacy.c +17 -243
341 lines not on this page · raw message
drivers/ata/pata_marvell.c +3 -30
@@ -95,37 +95,10 @@ static struct scsi_host_template marvell_sht = { ATA_BMDMA_SHT(DRV_NAME), }; -static const struct ata_port_operations marvell_ops = { -/* Task file is PCI ATA format, use helpers */ - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .mode_filter = ata_pci_default_filter, - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = marvell_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, +static struct ata_port_operations marvell_ops = { + .inherits = &ata_bmdma_port_ops, .cable_detect = marvell_cable_detect, - -/* BMDMA handling is PCI ATA format, use helpers */ - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - .data_xfer = ata_data_xfer, - -/* Timeout handling */ - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - -/* Generic PATA PCI ATA helpers */ - .port_start = ata_sff_port_start, + .error_handler = marvell_error_handler, };
drivers/ata/pata_mpc52xx.c +4 -14
@@ -269,22 +269,12 @@ static struct scsi_host_template mpc52xx_ata_sht = { };static struct ata_port_operations mpc52xx_ata_port_ops = { - .set_piomode = mpc52xx_ata_set_piomode, + .inherits = &ata_sff_port_ops, .dev_select = mpc52xx_ata_dev_select, - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = mpc52xx_ata_error_handler, .cable_detect = ata_cable_40wire, - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - .data_xfer = ata_data_xfer, - .irq_clear = ata_noop_irq_clear, - .irq_on = ata_irq_on, - .port_start = ata_sff_port_start, + .set_piomode = mpc52xx_ata_set_piomode, + .error_handler = mpc52xx_ata_error_handler, + .post_internal_cmd =ATA_OP_NULL , }; static int __devinit
drivers/ata/pata_mpiix.c +3 -20
@@ -155,28 +155,11 @@ static struct scsi_host_template mpiix_sht = { };static struct ata_port_operations mpiix_port_ops = { + .inherits = &ata_sff_port_ops, + .qc_issue = mpiix_qc_issue_prot, + .cable_detect = ata_cable_40wire, .set_piomode = mpiix_set_piomode, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, .error_handler = mpiix_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = ata_cable_40wire, - - .qc_prep = ata_qc_prep, - .qc_issue = mpiix_qc_issue_prot, - .data_xfer = ata_data_xfer, - - .irq_clear = ata_noop_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, };static int mpiix_init_one (struct pci_dev *dev,const struct pci_device_id *id)
drivers/ata/pata_netcell.c +2 -30
@@ -24,37 +24,9 @@ static struct scsi_host_template netcell_sht = { ATA_BMDMA_SHT(DRV_NAME), }; -static const struct ata_port_operations netcell_ops = { -/* Task file is PCI ATA format, use helpers */ - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .mode_filter = ata_pci_default_filter, - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, +static struct ata_port_operations netcell_ops = { + .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_80wire, - -/* BMDMA handling is PCI ATA format, use helpers */ - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - .data_xfer = ata_data_xfer, - -/* IRQ-related hooks */ - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - -/* Generic PATA PCI ATA helpers */ - .port_start = ata_sff_port_start, };
drivers/ata/pata_ninja32.c +2 -28
@@ -83,36 +83,10 @@ static struct scsi_host_template ninja32_sht = { };static struct ata_port_operations ninja32_port_ops = { - .set_piomode = ninja32_set_piomode, - .mode_filter = ata_pci_default_filter, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, + .inherits = &ata_bmdma_port_ops, .dev_select = ninja32_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, - .error_handler = ata_bmdma_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, .cable_detect = ata_cable_40wire, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, + .set_piomode = ninja32_set_piomode, };static int ninja32_init_one (struct pci_dev *dev,const struct pci_device_id *id)
drivers/ata/pata_ns87410.c +3 -22
@@ -148,30 +148,11 @@ static struct scsi_host_template ns87410_sht = { };static struct ata_port_operations ns87410_port_ops = { + .inherits = &ata_sff_port_ops, + .qc_issue = ns87410_qc_issue_prot, + .cable_detect = ata_cable_40wire, .set_piomode = ns87410_set_piomode, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, .error_handler = ns87410_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = ata_cable_40wire, - - .qc_prep = ata_qc_prep, - .qc_issue = ns87410_qc_issue_prot, - - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_noop_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, };static int ns87410_init_one (struct pci_dev *dev,const struct pci_device_id *id)
drivers/ata/pata_ns87415.c +12 -56
85 lines not on this page · raw message
drivers/ata/pata_oldpiix.c +4 -27
@@ -223,36 +223,13 @@ static struct scsi_host_template oldpiix_sht = { ATA_BMDMA_SHT(DRV_NAME), }; -static const struct ata_port_operations oldpiix_pata_ops = { +static struct ata_port_operations oldpiix_pata_ops = { + .inherits = &ata_bmdma_port_ops, + .qc_issue = oldpiix_qc_issue_prot, + .cable_detect = ata_cable_40wire, .set_piomode = oldpiix_set_piomode, .set_dmamode = oldpiix_set_dmamode, - .mode_filter = ata_pci_default_filter, - - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, .error_handler = oldpiix_pata_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = ata_cable_40wire, - - .bmdma_setup = ata_bmdma_setup, - .bmdma_start = ata_bmdma_start, - .bmdma_stop = ata_bmdma_stop, - .bmdma_status = ata_bmdma_status, - .qc_prep = ata_qc_prep, - .qc_issue = oldpiix_qc_issue_prot, - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_bmdma_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, };
drivers/ata/pata_opti.c +2 -21
@@ -169,29 +169,10 @@ static struct scsi_host_template opti_sht = { };static struct ata_port_operations opti_port_ops = { + .inherits = &ata_sff_port_ops, + .cable_detect = ata_cable_40wire, .set_piomode = opti_set_piomode, - .tf_load = ata_tf_load, - .tf_read = ata_tf_read, - .check_status = ata_check_status, - .exec_command = ata_exec_command, - .dev_select = ata_std_dev_select, - - .freeze = ata_bmdma_freeze, - .thaw = ata_bmdma_thaw, .error_handler = opti_error_handler, - .post_internal_cmd = ata_bmdma_post_internal_cmd, - .cable_detect = ata_cable_40wire, - - .qc_prep = ata_qc_prep, - .qc_issue = ata_qc_issue_prot, - - .data_xfer = ata_data_xfer, - - .irq_handler = ata_interrupt, - .irq_clear = ata_noop_irq_clear, - .irq_on = ata_irq_on, - - .port_start = ata_sff_port_start, };static int opti_init_one (struct pci_dev *dev,const struct pci_device_id *id)
drivers/ata/pata_optidma.c +4 -59
77 lines not on this page · raw message
drivers/ata/pata_pcmcia.c +6 -42
59 lines not on this page · raw message
drivers/ata/pata_pdc2027x.c +4 -52
70 lines not on this page · raw message
drivers/ata/pata_pdc202xx_old.c +15 -60
83 lines not on this page · raw message
drivers/ata/pata_qdi.c +4 -43
47 lines not on this page · raw message
drivers/ata/pata_serverworks.c +4 -59
63 lines not on this page · raw message
drivers/ata/pata_sis.c +16 -161
177 lines not on this page · raw message
drivers/ata/pata_via.c +3 -58
61 lines not on this page · raw message
drivers/ata/sata_mv.c +10 -56
66 lines not on this page · raw message
drivers/ata/sata_nv.c +18 -95
113 lines not on this page · raw message
drivers/ata/sata_promise.c +15 -49
64 lines not on this page · raw message
drivers/ata/sata_via.c +7 -81
88 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.5.2.4
Part of the diff is not shown here. View the raw message.
PATCH 6/9 libata: make ata_pci_init_one() not use ops->irq_handler and pi->sht
In reply to Tejun Heoata_pci_init_one() is the only function which uses ops->irq_handler and pi->sht. Other initialization functions take the same information as arguments. This causes confusion and duplicate unused entries in structures.
Make ata_pci_init_one() take sht as an argument and use ata_interrupt implicitly. All current users use ata_interrupt and if different irq handler is necessary open coding ata_pci_init_one() using ata_prepare_sff_host() and ata_activate_sff_host can be done under ten lines including error handling and driver which requires custom interrupt handler is likely to require custom initialization anyway.
As ata_pci_init_one() was the last user of ops->irq_handler, this patch also kills the field.
Signed-off-by Tejun Heo <[email protected]>
--- drivers/ata/ata_generic.c | 3 +-- drivers/ata/libata-core.c | 1 - drivers/ata/libata-sff.c | 7 ++++--- drivers/ata/pata_acpi.c | 3 +-- drivers/ata/pata_ali.c | 9 +-------- drivers/ata/pata_amd.c | 12 +----------- drivers/ata/pata_artop.c | 6 +----- drivers/ata/pata_atiixp.c | 3 +-- drivers/ata/pata_cmd640.c | 3 +-- drivers/ata/pata_cmd64x.c | 8 +------- drivers/ata/pata_cs5530.c | 4 +--- drivers/ata/pata_cs5535.c | 3 +-- drivers/ata/pata_cs5536.c | 3 +-- drivers/ata/pata_cypress.c | 3 +-- drivers/ata/pata_efar.c | 3 +-- drivers/ata/pata_hpt366.c | 3 +-- drivers/ata/pata_hpt37x.c | 8 +------- drivers/ata/pata_hpt3x2n.c | 3 +-- drivers/ata/pata_it8213.c | 3 +-- drivers/ata/pata_it821x.c | 4 +--- drivers/ata/pata_jmicron.c | 3 +-- drivers/ata/pata_marvell.c | 4 +--- drivers/ata/pata_netcell.c | 3 +-- drivers/ata/pata_ns87410.c | 3 +-- drivers/ata/pata_ns87415.c | 4 +--- drivers/ata/pata_oldpiix.c | 3 +-- drivers/ata/pata_opti.c | 3 +-- drivers/ata/pata_optidma.c | 4 +--- drivers/ata/pata_pdc202xx_old.c | 5 +---- drivers/ata/pata_radisys.c | 3 +-- drivers/ata/pata_rz1000.c | 3 +-- drivers/ata/pata_sc1200.c | 3 +-- drivers/ata/pata_serverworks.c | 6 +----- drivers/ata/pata_sil680.c | 4 +--- drivers/ata/pata_sis.c | 10 +--------- drivers/ata/pata_sl82c105.c | 4 +--- drivers/ata/pata_triflex.c | 3 +-- drivers/ata/pata_via.c | 8 +------- include/linux/libata.h | 4 ++-- 39 files changed, 42 insertions(+), 130 deletions(-)
drivers/ata/ata_generic.c +1 -2
@@ -120,7 +120,6 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id {u16 command;static const struct ata_port_info info = { - .sht = &generic_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -153,7 +152,7 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_idif (dev->vendor ==PCI_VENDOR_ID_AL )ata_pci_clear_simplex (dev); -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &generic_sht); }static struct pci_device_id ata_generic[] = {
drivers/ata/libata-core.c +0 -1
@@ -109,7 +109,6 @@ const struct ata_port_operations ata_sff_port_ops = { .irq_on = ata_irq_on, .port_start = ata_sff_port_start, - .irq_handler = ata_interrupt, };const struct ata_port_operations ata_bmdma_port_ops = {
drivers/ata/libata-sff.c +4 -3
@@ -826,6 +826,7 @@ int ata_pci_activate_sff_host(struct ata_host *host,* ata_pci_init_one - Initialize/register PCI IDE host controller * @pdev: Controller to be initialized * @ppi: array of port_info, must be enough for two ports +* @sht: scsi_host_template to use when registering the host * * This is a helper function which can be called from a driver's * xxx_init_one() probe function if the hardware uses traditional
@@ -846,7 +847,8 @@ int ata_pci_activate_sff_host(struct ata_host *host,* Zero on success, negative on errno-based value on error. */ int ata_pci_init_one (struct pci_dev *pdev, -const struct ata_port_info *const * ppi) +const struct ata_port_info *const * ppi, +struct scsi_host_template *sht) {struct device *dev = &pdev->dev;const struct ata_port_info *pi =NULL ;
@@ -882,8 +884,7 @@ int ata_pci_init_one(struct pci_dev *pdev, goto out;pci_set_master (pdev); - rc =ata_pci_activate_sff_host (host, pi->port_ops->irq_handler, - pi->sht); + rc =ata_pci_activate_sff_host (host, ata_interrupt, sht); out:if (rc ==0 )devres_remove_group (&pdev->dev,NULL );
drivers/ata/pata_acpi.c +1 -2
@@ -264,7 +264,6 @@ static struct ata_port_operations pacpi_ops = {static int pacpi_init_one (struct pci_dev *pdev,const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &pacpi_sht, .flags =ATA_FLAG_SLAVE_POSS |ATA_FLAG_SRST , .pio_mask =0x1f ,
@@ -274,7 +273,7 @@ static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &pacpi_ops, };const struct ata_port_info *ppi[] = { &info,NULL }; -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &pacpi_sht); }static const struct pci_device_id pacpi_pci_tbl[] = {
drivers/ata/pata_ali.c +1 -8
@@ -423,14 +423,12 @@ static void ali_init_chipset(struct pci_dev *pdev)static int ali_init_one (struct pci_dev *pdev,const struct pci_device_id *id) {static const struct ata_port_info info_early = { - .sht = &ali_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .port_ops = &ali_early_port_ops };/* Revision 0x20 added DMA */ static const struct ata_port_info info_20 = { - .sht = &ali_sht, .flags =ATA_FLAG_SLAVE_POSS |ATA_FLAG_PIO_LBA48 , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -438,7 +436,6 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) };/* Revision 0x20 with support logic added UDMA */ static const struct ata_port_info info_20_udma = { - .sht = &ali_sht, .flags =ATA_FLAG_SLAVE_POSS |ATA_FLAG_PIO_LBA48 , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -447,7 +444,6 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) };/* Revision 0xC2 adds UDMA66 */ static const struct ata_port_info info_c2 = { - .sht = &ali_sht, .flags =ATA_FLAG_SLAVE_POSS |ATA_FLAG_PIO_LBA48 , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -456,7 +452,6 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) };/* Revision 0xC3 is UDMA66 for now */ static const struct ata_port_info info_c3 = { - .sht = &ali_sht, .flags =ATA_FLAG_SLAVE_POSS |ATA_FLAG_PIO_LBA48 , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -465,7 +460,6 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) };/* Revision 0xC4 is UDMA100 */ static const struct ata_port_info info_c4 = { - .sht = &ali_sht, .flags =ATA_FLAG_SLAVE_POSS |ATA_FLAG_PIO_LBA48 , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -474,7 +468,6 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) };/* Revision 0xC5 is UDMA133 with LBA48 DMA */ static const struct ata_port_info info_c5 = { - .sht = &ali_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -519,7 +512,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ppi[0 ] = &info_20_udma;pci_dev_put (isa_bridge); } -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &ali_sht); }#ifdef CONFIG_PM
drivers/ata/pata_amd.c +1 -11
@@ -413,7 +413,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) {static const struct ata_port_info info[10 ] = { {/* 0: AMD 7401 */ - .sht = &amd_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,/* No SWDMA */
@@ -421,7 +420,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &amd33_port_ops }, {/* 1: Early AMD7409 - no swdma */ - .sht = &amd_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07,
@@ -429,7 +427,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &amd66_port_ops }, {/* 2: AMD 7409, no swdma errata */ - .sht = &amd_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07,
@@ -437,7 +434,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &amd66_port_ops }, {/* 3: AMD 7411 */ - .sht = &amd_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07,
@@ -445,7 +441,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &amd100_port_ops }, {/* 4: AMD 7441 */ - .sht = &amd_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07,
@@ -453,7 +448,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &amd100_port_ops }, {/* 5: AMD 8111*/ - .sht = &amd_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07,
@@ -461,7 +455,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &amd133_port_ops }, {/* 6: AMD 8111 UDMA 100 (Serenade) */ - .sht = &amd_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07,
@@ -469,7 +462,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &amd133_port_ops }, {/* 7: Nvidia Nforce */ - .sht = &amd_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07,
@@ -477,7 +469,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &nv100_port_ops }, {/* 8: Nvidia Nforce2 and later */ - .sht = &amd_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07,
@@ -485,7 +476,6 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &nv133_port_ops }, {/* 9: AMD CS5536 (Geode companion) */ - .sht = &amd_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07,
@@ -544,7 +534,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) }/* And fire it up */ -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &amd_sht); }#ifdef CONFIG_PM
drivers/ata/pata_artop.c +1 -5
@@ -352,7 +352,6 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) {static int printed_version;static const struct ata_port_info info_6210 = { - .sht = &artop_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .mwdma_mask =0x07 ,/* mwdma0-2 */
@@ -360,7 +359,6 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &artop6210_ops, };static const struct ata_port_info info_626x = { - .sht = &artop_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .mwdma_mask =0x07 ,/* mwdma0-2 */
@@ -368,7 +366,6 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &artop6260_ops, };static const struct ata_port_info info_628x = { - .sht = &artop_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .mwdma_mask =0x07 ,/* mwdma0-2 */
@@ -376,7 +373,6 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &artop6260_ops, };static const struct ata_port_info info_628x_fast = { - .sht = &artop_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .mwdma_mask =0x07 ,/* mwdma0-2 */
@@ -434,7 +430,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)BUG_ON (ppi[0 ] ==NULL ); -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &artop_sht); }static const struct pci_device_id artop_pci_tbl[] = {
drivers/ata/pata_atiixp.c +1 -2
@@ -241,7 +241,6 @@ static struct ata_port_operations atiixp_port_ops = {static int atiixp_init_one (struct pci_dev *dev,const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &atiixp_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x06 ,/* No MWDMA0 support */
@@ -249,7 +248,7 @@ static int atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id) .port_ops = &atiixp_port_ops };const struct ata_port_info *ppi[] = { &info,NULL }; -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &atiixp_sht); }static const struct pci_device_id atiixp[] = {
drivers/ata/pata_cmd640.c +1 -2
@@ -211,7 +211,6 @@ static void cmd640_hardware_init(struct pci_dev *pdev)static int cmd640_init_one (struct pci_dev *pdev,const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &cmd640_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .port_ops = &cmd640_port_ops
@@ -225,7 +224,7 @@ static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)cmd640_hardware_init (pdev); -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &cmd640_sht); }#ifdef CONFIG_PM
drivers/ata/pata_cmd64x.c +1 -7
@@ -298,21 +298,18 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)static const struct ata_port_info cmd_info[6 ] = { {/* CMD 643 - no UDMA */ - .sht = &cmd64x_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 , .port_ops = &cmd64x_port_ops }, {/* CMD 646 with broken UDMA */ - .sht = &cmd64x_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 , .port_ops = &cmd64x_port_ops }, {/* CMD 646 with working UDMA */ - .sht = &cmd64x_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -320,14 +317,12 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &cmd64x_port_ops }, {/* CMD 646 rev 1 */ - .sht = &cmd64x_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07, .port_ops = &cmd646r1_port_ops }, {/* CMD 648 */ - .sht = &cmd64x_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07,
@@ -335,7 +330,6 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &cmd648_port_ops }, {/* CMD 649 */ - .sht = &cmd64x_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07,
@@ -379,7 +373,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)pci_write_config_byte (pdev,UDIDETCR0 ,0xF0 );#endif -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &cmd64x_sht); }#ifdef CONFIG_PM
drivers/ata/pata_cs5530.c +1 -3
@@ -298,7 +298,6 @@ fail_put:static int cs5530_init_one (struct pci_dev *pdev,const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &cs5530_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -307,7 +306,6 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id) };/* The docking connector doesn't do UDMA, and it seems not MWDMA */ static const struct ata_port_info info_palmax_secondary = { - .sht = &cs5530_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .port_ops = &cs5530_port_ops
@@ -327,7 +325,7 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ppi[1 ] = &info_palmax_secondary;/* Now kick off ATA set up */ -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &cs5530_sht); }#ifdef CONFIG_PM
drivers/ata/pata_cs5535.c +1 -2
@@ -181,7 +181,6 @@ static struct ata_port_operations cs5535_port_ops = {static int cs5535_init_one (struct pci_dev *dev,const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &cs5535_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -200,7 +199,7 @@ static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)rdmsr (ATAC_CH0D1_PIO , timings, dummy);if (CS5535_BAD_PIO (timings))wrmsr (ATAC_CH0D1_PIO ,0xF7F4F7F4UL ,0 ); -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &cs5535_sht); }static const struct pci_device_id cs5535[] = {
drivers/ata/pata_cs5536.c +1 -2
@@ -241,7 +241,6 @@ static struct ata_port_operations cs5536_port_ops = {static int cs5536_init_one (struct pci_dev *dev,const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &cs5536_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -262,7 +261,7 @@ static int cs5536_init_one(struct pci_dev *dev, const struct pci_device_id *id)return -ENODEV ; } -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &cs5536_sht); }static const struct pci_device_id cs5536[] = {
drivers/ata/pata_cypress.c +1 -2
@@ -123,7 +123,6 @@ static struct ata_port_operations cy82c693_port_ops = {static int cy82c693_init_one (struct pci_dev *pdev,const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &cy82c693_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -137,7 +136,7 @@ static int cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *iif (PCI_FUNC (pdev->devfn) !=1 )return -ENODEV ; -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &cy82c693_sht); }static const struct pci_device_id cy82c693[] = {
drivers/ata/pata_efar.c +1 -2
@@ -263,7 +263,6 @@ static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) {static int printed_version;static const struct ata_port_info info = { - .sht = &efar_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .mwdma_mask =0x07 ,/* mwdma1-2 */
@@ -276,7 +275,7 @@ static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &efar_sht); }static const struct pci_device_id efar_pci_tbl[] = {
drivers/ata/pata_hpt366.c +1 -2
@@ -350,7 +350,6 @@ static void hpt36x_init_chipset(struct pci_dev *dev)static int hpt36x_init_one (struct pci_dev *dev,const struct pci_device_id *id) {static const struct ata_port_info info_hpt366 = { - .sht = &hpt36x_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -394,7 +393,7 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)break ; }/* Now kick off ATA set up */ -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &hpt36x_sht); }#ifdef CONFIG_PM
drivers/ata/pata_hpt37x.c +1 -7
@@ -783,7 +783,6 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) {/* HPT370 - UDMA100 */ static const struct ata_port_info info_hpt370 = { - .sht = &hpt37x_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -792,7 +791,6 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) };/* HPT370A - UDMA100 */ static const struct ata_port_info info_hpt370a = { - .sht = &hpt37x_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -801,7 +799,6 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) };/* HPT370 - UDMA100 */ static const struct ata_port_info info_hpt370_33 = { - .sht = &hpt37x_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -810,7 +807,6 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) };/* HPT370A - UDMA100 */ static const struct ata_port_info info_hpt370a_33 = { - .sht = &hpt37x_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -819,7 +815,6 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) };/* HPT371, 372 and friends - UDMA133 */ static const struct ata_port_info info_hpt372 = { - .sht = &hpt37x_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -828,7 +823,6 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) };/* HPT374 - UDMA100 */ static const struct ata_port_info info_hpt374 = { - .sht = &hpt37x_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -1051,7 +1045,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) port_info = *port; port_info.private_data = private_data; -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &hpt37x_sht); }static const struct pci_device_id hpt37x[] = {
drivers/ata/pata_hpt3x2n.c +1 -2
@@ -452,7 +452,6 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id) {/* HPT372N and friends - UDMA133 */ static const struct ata_port_info info = { - .sht = &hpt3x2n_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -568,7 +567,7 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id) }/* Now kick off ATA set up */ -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &hpt3x2n_sht); }static const struct pci_device_id hpt3x2n[] = {
drivers/ata/pata_it8213.c +1 -2
@@ -274,7 +274,6 @@ static int it8213_init_one (struct pci_dev *pdev, const struct pci_device_id *en {static int printed_version;static const struct ata_port_info info = { - .sht = &it8213_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .mwdma_mask =0x07 ,/* mwdma0-2 */
@@ -288,7 +287,7 @@ static int it8213_init_one (struct pci_dev *pdev, const struct pci_device_id *endev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &it8213_sht); }static const struct pci_device_id it8213_pci_tbl[] = {
drivers/ata/pata_it821x.c +1 -3
@@ -687,14 +687,12 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)u8 conf;static const struct ata_port_info info_smart = { - .sht = &it821x_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 , .port_ops = &it821x_smart_port_ops };static const struct ata_port_info info_passthru = { - .sht = &it821x_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -724,7 +722,7 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)else ppi[0 ] = &info_smart; -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &it821x_sht); }#ifdef CONFIG_PM
drivers/ata/pata_jmicron.c +1 -2
@@ -148,7 +148,6 @@ static struct ata_port_operations jmicron_ops = {static int jmicron_init_one (struct pci_dev *pdev,const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &jmicron_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,
@@ -159,7 +158,7 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i };const struct ata_port_info *ppi[] = { &info,NULL }; -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &jmicron_sht); }static const struct pci_device_id jmicron_pci_tbl[] = {
drivers/ata/pata_marvell.c +1 -3
@@ -119,7 +119,6 @@ static struct ata_port_operations marvell_ops = {static int marvell_init_one (struct pci_dev *pdev,const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &marvell_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,
@@ -129,7 +128,6 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i .port_ops = &marvell_ops, };static const struct ata_port_info info_sata = { - .sht = &marvell_sht,/* Slave possible as its magically mapped not real */ .flags =ATA_FLAG_SLAVE_POSS ,
@@ -144,7 +142,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *iif (pdev->device ==0x6101 ) ppi[1 ] = &ata_dummy_port_info; -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &marvell_sht); }static const struct pci_device_id marvell_pci_tbl[] = {
drivers/ata/pata_netcell.c +1 -2
@@ -48,7 +48,6 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *e {static int printed_version;static const struct ata_port_info info = { - .sht = &netcell_sht, .flags =ATA_FLAG_SLAVE_POSS ,/* Actually we don't really care about these as the firmware deals with it */
@@ -72,7 +71,7 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *eata_pci_clear_simplex (pdev);/* And let the library code do the work */ -return ata_pci_init_one (pdev, port_info); +return ata_pci_init_one (pdev, port_info, &netcell_sht); }static const struct pci_device_id netcell_pci_tbl[] = {
drivers/ata/pata_ns87410.c +1 -2
@@ -158,13 +158,12 @@ static struct ata_port_operations ns87410_port_ops = {static int ns87410_init_one (struct pci_dev *dev,const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &ns87410_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x0F , .port_ops = &ns87410_port_ops };const struct ata_port_info *ppi[] = { &info,NULL }; -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &ns87410_sht); }static const struct pci_device_id ns87410[] = {
drivers/ata/pata_ns87415.c +1 -3
@@ -345,7 +345,6 @@ static int ns87415_init_one (struct pci_dev *pdev, const struct pci_device_id *e {static int printed_version;static const struct ata_port_info info = { - .sht = &ns87415_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .mwdma_mask =0x07 ,/* mwdma0-2 */
@@ -355,7 +354,6 @@ static int ns87415_init_one (struct pci_dev *pdev, const struct pci_device_id *eint rc;#if defined(CONFIG_SUPERIO )static const struct ata_port_info info87560 = { - .sht = &ns87415_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */
@@ -377,7 +375,7 @@ static int ns87415_init_one (struct pci_dev *pdev, const struct pci_device_id *epci_write_config_byte (pdev,0x55 ,0xEE );/* Select PIO0 8bit clocking */ pci_write_config_byte (pdev,0x54 ,0xB7 ); -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &ns87415_sht); }static const struct pci_device_id ns87415_pci_tbl[] = {
drivers/ata/pata_oldpiix.c +1 -2
@@ -252,7 +252,6 @@ static int oldpiix_init_one (struct pci_dev *pdev, const struct pci_device_id *e {static int printed_version;static const struct ata_port_info info = { - .sht = &oldpiix_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .mwdma_mask =0x07 ,/* mwdma1-2 */
@@ -264,7 +263,7 @@ static int oldpiix_init_one (struct pci_dev *pdev, const struct pci_device_id *edev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &oldpiix_sht); }static const struct pci_device_id oldpiix_pci_tbl[] = {
drivers/ata/pata_opti.c +1 -2
@@ -178,7 +178,6 @@ static struct ata_port_operations opti_port_ops = {static int opti_init_one (struct pci_dev *dev,const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &opti_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .port_ops = &opti_port_ops
@@ -189,7 +188,7 @@ static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id)if (!printed_version++)dev_printk (KERN_DEBUG , &dev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &opti_sht); }static const struct pci_device_id opti[] = {
drivers/ata/pata_optidma.c +1 -3
@@ -414,14 +414,12 @@ done_nomsg: /* Wrong chip revision */static int optidma_init_one (struct pci_dev *dev,const struct pci_device_id *id) {static const struct ata_port_info info_82c700 = { - .sht = &optidma_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 , .port_ops = &optidma_port_ops };static const struct ata_port_info info_82c700_udma = { - .sht = &optidma_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -447,7 +445,7 @@ static int optidma_init_one(struct pci_dev *dev, const struct pci_device_id *id)if (optiplus_with_udma (dev)) ppi[0 ] = &info_82c700_udma; -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &optidma_sht); }static const struct pci_device_id optidma[] = {
drivers/ata/pata_pdc202xx_old.c +1 -4
@@ -290,7 +290,6 @@ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id {static const struct ata_port_info info[3 ] = { { - .sht = &pdc202xx_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -298,7 +297,6 @@ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id .port_ops = &pdc2024x_port_ops }, { - .sht = &pdc202xx_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07,
@@ -306,7 +304,6 @@ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id .port_ops = &pdc2026x_port_ops }, { - .sht = &pdc202xx_sht, .flags = ATA_FLAG_SLAVE_POSS, .pio_mask = 0x1f, .mwdma_mask = 0x07,
@@ -327,7 +324,7 @@ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *idreturn -ENODEV ; } } -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &pdc202xx_sht); }static const struct pci_device_id pdc202xx[] = {
drivers/ata/pata_radisys.c +1 -2
@@ -216,7 +216,6 @@ static int radisys_init_one (struct pci_dev *pdev, const struct pci_device_id *e {static int printed_version;static const struct ata_port_info info = { - .sht = &radisys_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .mwdma_mask =0x07 ,/* mwdma1-2 */
@@ -229,7 +228,7 @@ static int radisys_init_one (struct pci_dev *pdev, const struct pci_device_id *edev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &radisys_sht); }static const struct pci_device_id radisys_pci_tbl[] = {
drivers/ata/pata_rz1000.c +1 -2
@@ -89,7 +89,6 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en {static int printed_version;static const struct ata_port_info info = { - .sht = &rz1000_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .port_ops = &rz1000_port_ops
@@ -100,7 +99,7 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");if (rz1000_fifo_disable (pdev) ==0 ) -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &rz1000_sht); printk(KERN_ERR DRV_NAME ": failed to disable read-ahead on chipset..\n");/* Not safe to use so skip */
drivers/ata/pata_sc1200.c +1 -2
@@ -204,7 +204,6 @@ static struct ata_port_operations sc1200_port_ops = {static int sc1200_init_one (struct pci_dev *dev,const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &sc1200_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -214,7 +213,7 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)/* Can't enable port 2 yet, see top comments */ const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info }; -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &sc1200_sht); }static const struct pci_device_id sc1200[] = {
drivers/ata/pata_serverworks.c +1 -5
@@ -399,28 +399,24 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id {static const struct ata_port_info info[4 ] = { {/* OSB4 */ - .sht = &serverworks_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 , .udma_mask =0x07 , .port_ops = &serverworks_osb4_port_ops }, {/* OSB4 no UDMA */ - .sht = &serverworks_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 , .udma_mask =0x00 , .port_ops = &serverworks_osb4_port_ops }, {/* CSB5 */ - .sht = &serverworks_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 , .udma_mask =ATA_UDMA4 , .port_ops = &serverworks_csb_port_ops }, {/* CSB5 - later revisions*/ - .sht = &serverworks_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -465,7 +461,7 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_idif (pdev->device ==PCI_DEVICE_ID_SERVERWORKS_CSB5IDE )ata_pci_clear_simplex (pdev); -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &serverworks_sht); }#ifdef CONFIG_PM
drivers/ata/pata_sil680.c +1 -3
@@ -278,7 +278,6 @@ static int __devinit sil680_init_one(struct pci_dev *pdev, const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &sil680_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -286,7 +285,6 @@ static int __devinit sil680_init_one(struct pci_dev *pdev, .port_ops = &sil680_port_ops };static const struct ata_port_info info_slow = { - .sht = &sil680_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -360,7 +358,7 @@ static int __devinit sil680_init_one(struct pci_dev *pdev, &sil680_sht); use_ioports: -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &sil680_sht); }#ifdef CONFIG_PM
drivers/ata/pata_sis.c +1 -9
@@ -565,7 +565,6 @@ static struct ata_port_operations sis_old_ops = { };static const struct ata_port_info sis_info = { - .sht = &sis_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .mwdma_mask =0x07 ,
@@ -573,7 +572,6 @@ static const struct ata_port_info sis_info = { .port_ops = &sis_old_ops, };static const struct ata_port_info sis_info33 = { - .sht = &sis_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .mwdma_mask =0x07 ,
@@ -581,42 +579,36 @@ static const struct ata_port_info sis_info33 = { .port_ops = &sis_old_ops, };static const struct ata_port_info sis_info66 = { - .sht = &sis_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .udma_mask =ATA_UDMA4 ,/* UDMA 66 */ .port_ops = &sis_66_ops, };static const struct ata_port_info sis_info100 = { - .sht = &sis_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .udma_mask =ATA_UDMA5 , .port_ops = &sis_100_ops, };static const struct ata_port_info sis_info100_early = { - .sht = &sis_sht, .flags =ATA_FLAG_SLAVE_POSS , .udma_mask =ATA_UDMA5 , .pio_mask =0x1f ,/* pio0-4 */ .port_ops = &sis_66_ops, };static const struct ata_port_info sis_info133 = { - .sht = &sis_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .udma_mask =ATA_UDMA6 , .port_ops = &sis_133_ops, };const struct ata_port_info sis_info133_for_sata = { - .sht = &sis_sht, .flags =ATA_FLAG_SLAVE_POSS |ATA_FLAG_SRST , .pio_mask =0x1f ,/* pio0-4 */ .udma_mask =ATA_UDMA6 , .port_ops = &sis_133_for_sata_ops, };static const struct ata_port_info sis_info133_early = { - .sht = &sis_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f ,/* pio0-4 */ .udma_mask =ATA_UDMA6 ,
@@ -844,7 +836,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)sis_fixup (pdev, chipset); -return ata_pci_init_one (pdev, ppi); +return ata_pci_init_one (pdev, ppi, &sis_sht); }static const struct pci_device_id sis_pci_tbl[] = {
drivers/ata/pata_sl82c105.c +1 -3
@@ -289,14 +289,12 @@ static int sl82c105_bridge_revision(struct pci_dev *pdev)static int sl82c105_init_one (struct pci_dev *dev,const struct pci_device_id *id) {static const struct ata_port_info info_dma = { - .sht = &sl82c105_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 , .port_ops = &sl82c105_port_ops };static const struct ata_port_info info_early = { - .sht = &sl82c105_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .port_ops = &sl82c105_port_ops
@@ -325,7 +323,7 @@ static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id val |=CTRL_P0EN |CTRL_P0F16 |CTRL_P1F16 ;pci_write_config_dword (dev,0x40 , val); -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &sl82c105_sht); }static const struct pci_device_id sl82c105[] = {
drivers/ata/pata_triflex.c +1 -2
@@ -195,7 +195,6 @@ static struct ata_port_operations triflex_port_ops = {static int triflex_init_one (struct pci_dev *dev,const struct pci_device_id *id) {static const struct ata_port_info info = { - .sht = &triflex_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -207,7 +206,7 @@ static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id)if (!printed_version++)dev_printk (KERN_DEBUG , &dev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_init_one (dev, ppi); +return ata_pci_init_one (dev, ppi, &triflex_sht); }static const struct pci_device_id triflex[] = {
drivers/ata/pata_via.c +1 -7
@@ -398,7 +398,6 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) {/* Early VIA without UDMA support */ static const struct ata_port_info via_mwdma_info = { - .sht = &via_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -406,7 +405,6 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) };/* Ditto with IRQ masking required */ static const struct ata_port_info via_mwdma_info_borked = { - .sht = &via_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -414,7 +412,6 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) };/* VIA UDMA 33 devices (and borked 66) */ static const struct ata_port_info via_udma33_info = { - .sht = &via_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -423,7 +420,6 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) };/* VIA UDMA 66 devices */ static const struct ata_port_info via_udma66_info = { - .sht = &via_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -432,7 +428,6 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) };/* VIA UDMA 100 devices */ static const struct ata_port_info via_udma100_info = { - .sht = &via_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -441,7 +436,6 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id) };/* UDMA133 with bad AST (All current 133) */ static const struct ata_port_info via_udma133_info = { - .sht = &via_sht, .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =0x1f , .mwdma_mask =0x07 ,
@@ -532,7 +526,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); +return ata_pci_init_one (pdev, ppi, &via_sht); }#ifdef CONFIG_PM
include/linux/libata.h +2 -2
@@ -737,7 +737,6 @@ struct ata_port_operations {*/ void (*phy_reset)(struct ata_port *ap);void (*eng_timeout)(struct ata_port *ap); -irq_handler_t irq_handler;/* * ->inherits must be the last field and all the preceding
@@ -1017,7 +1016,8 @@ static inline int ata_acpi_cbl_80wire(struct ata_port *ap,struct pci_dev ;extern int ata_pci_init_one (struct pci_dev *pdev, -const struct ata_port_info *const * ppi); +const struct ata_port_info *const * ppi, +struct scsi_host_template *sht);extern void ata_pci_remove_one (struct pci_dev *pdev);#ifdef CONFIG_PM extern void ata_pci_device_do_suspend (struct pci_dev *pdev,pm_message_t mesg);
Signature · 1 line
1.5.2.4
PATCH 7/9 libata: stop overloading port_info->private_data
In reply to Tejun Heoport_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 <[email protected]>
Cc Alan Cox <[email protected]>
--- drivers/ata/ata_generic.c | 2 +- drivers/ata/libata-core.c | 2 -- drivers/ata/libata-sff.c | 4 +++- drivers/ata/pata_acpi.c | 18 ++---------------- drivers/ata/pata_ali.c | 2 +- drivers/ata/pata_amd.c | 27 +++++++-------------------- drivers/ata/pata_artop.c | 2 +- drivers/ata/pata_atiixp.c | 2 +- drivers/ata/pata_cmd640.c | 2 +- drivers/ata/pata_cmd64x.c | 2 +- drivers/ata/pata_cs5530.c | 2 +- drivers/ata/pata_cs5535.c | 2 +- drivers/ata/pata_cs5536.c | 2 +- drivers/ata/pata_cypress.c | 2 +- drivers/ata/pata_efar.c | 2 +- drivers/ata/pata_hpt366.c | 12 ++++++------ drivers/ata/pata_hpt37x.c | 33 ++++++++++++++------------------- drivers/ata/pata_hpt3x2n.c | 9 ++++----- drivers/ata/pata_it8213.c | 2 +- drivers/ata/pata_it821x.c | 2 +- drivers/ata/pata_jmicron.c | 18 ++---------------- drivers/ata/pata_marvell.c | 18 ++---------------- drivers/ata/pata_netcell.c | 2 +- drivers/ata/pata_ns87410.c | 2 +- drivers/ata/pata_ns87415.c | 2 +- drivers/ata/pata_oldpiix.c | 2 +- drivers/ata/pata_opti.c | 2 +- drivers/ata/pata_optidma.c | 2 +- drivers/ata/pata_pdc202xx_old.c | 2 +- drivers/ata/pata_radisys.c | 2 +- drivers/ata/pata_rz1000.c | 2 +- drivers/ata/pata_sc1200.c | 2 +- drivers/ata/pata_serverworks.c | 2 +- drivers/ata/pata_sil680.c | 2 +- drivers/ata/pata_sis.c | 8 +++----- drivers/ata/pata_sl82c105.c | 2 +- drivers/ata/pata_triflex.c | 2 +- drivers/ata/pata_via.c | 19 ++++++++----------- include/linux/libata.h | 2 +- 39 files changed, 79 insertions(+), 145 deletions(-)
drivers/ata/ata_generic.c +1 -1
@@ -152,7 +152,7 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_idif (dev->vendor ==PCI_VENDOR_ID_AL )ata_pci_clear_simplex (dev); -return ata_pci_init_one (dev, ppi, &generic_sht); +return ata_pci_init_one (dev, ppi, &generic_sht,NULL ); }static struct pci_device_id ata_generic[] = {
drivers/ata/libata-core.c +0 -2
@@ -6947,8 +6947,6 @@ struct ata_host *ata_host_alloc_pinfo(struct device *dev,if (!host->ops && (pi->port_ops != &ata_dummy_port_ops)) host->ops = pi->port_ops; -if (!host->private_data && pi->private_data) - host->private_data = pi->private_data; }return host;
drivers/ata/libata-sff.c +3 -1
@@ -827,6 +827,7 @@ int ata_pci_activate_sff_host(struct ata_host *host,* @pdev: Controller to be initialized * @ppi: array of port_info, must be enough for two ports * @sht: scsi_host_template to use when registering the host +* @host_priv: host private_data * * This is a helper function which can be called from a driver's * xxx_init_one() probe function if the hardware uses traditional
@@ -848,7 +849,7 @@ int ata_pci_activate_sff_host(struct ata_host *host,*/ int ata_pci_init_one (struct pci_dev *pdev,const struct ata_port_info *const * ppi, -struct scsi_host_template *sht) +struct scsi_host_template *sht,void *host_priv) {struct device *dev = &pdev->dev;const struct ata_port_info *pi =NULL ;
@@ -882,6 +883,7 @@ int ata_pci_init_one(struct pci_dev *pdev, rc =ata_pci_prepare_sff_host (pdev, ppi, &host);if (rc) goto out; + host->private_data = host_priv;pci_set_master (pdev); rc =ata_pci_activate_sff_host (host, ata_interrupt, sht);
drivers/ata/pata_acpi.c +2 -16
@@ -68,20 +68,6 @@ static int pacpi_cable_detect(struct ata_port *ap) }/** -* pacpi_error_handler - Setup and error handler -* @ap: Port to handle -* -* LOCKING: -* None (inherited from caller). -*/ - -static void pacpi_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, pacpi_pre_reset, ata_std_softreset,NULL , - ata_std_postreset); -} - -/** * pacpi_discover_modes - filter non ACPI modes * @adev: ATA device * @mask: proposed modes
@@ -242,7 +228,7 @@ static struct ata_port_operations pacpi_ops = { .mode_filter = pacpi_mode_filter, .set_piomode = pacpi_set_piomode, .set_dmamode = pacpi_set_dmamode, - .error_handler = pacpi_error_handler, + .prereset = pacpi_pre_reset, .port_start = pacpi_port_start, };
@@ -273,7 +259,7 @@ static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &pacpi_ops, };const struct ata_port_info *ppi[] = { &info,NULL }; -return ata_pci_init_one (pdev, ppi, &pacpi_sht); +return ata_pci_init_one (pdev, ppi, &pacpi_sht,NULL ); }static const struct pci_device_id pacpi_pci_tbl[] = {
drivers/ata/pata_ali.c +1 -1
@@ -512,7 +512,7 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ppi[0 ] = &info_20_udma;pci_dev_put (isa_bridge); } -return ata_pci_init_one (pdev, ppi, &ali_sht); +return ata_pci_init_one (pdev, ppi, &ali_sht,NULL ); }#ifdef CONFIG_PM
drivers/ata/pata_amd.c +7 -20
@@ -144,12 +144,6 @@ static int amd_pre_reset(struct ata_link *link, unsigned long deadline)return ata_std_prereset (link, deadline); } -static void amd_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, amd_pre_reset, ata_std_softreset,NULL , - ata_std_postreset); -} -static int amd_cable_detect (struct ata_port *ap) {static const u32 bitmask[2 ] = {0x03 ,0x0C };
@@ -300,13 +294,6 @@ static int nv_pre_reset(struct ata_link *link, unsigned long deadline)return ata_std_prereset (link, deadline); } -static void nv_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, nv_pre_reset, - ata_std_softreset,NULL , - ata_std_postreset); -} -/** * nv100_set_piomode - set initial PIO mode data * @ap: ATA interface
@@ -358,7 +345,7 @@ static struct scsi_host_template amd_sht = {static const struct ata_port_operations amd_base_port_ops = { .inherits = &ata_bmdma_port_ops, - .error_handler = amd_error_handler, + .prereset = amd_pre_reset, };static struct ata_port_operations amd33_port_ops = {
@@ -393,7 +380,7 @@ static const struct ata_port_operations nv_base_port_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_ignore, .mode_filter = nv_mode_filter, - .error_handler = nv_error_handler, + .prereset = nv_pre_reset, .host_stop = nv_host_stop, };
@@ -483,10 +470,10 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) .port_ops = &amd100_port_ops } }; -struct ata_port_info pi; -const struct ata_port_info *ppi[] = { &pi,NULL }; +const struct ata_port_info *ppi[] = {NULL ,NULL };static int printed_version;int type = id->driver_data; +void *hpriv =NULL ;u8 fifo;int rc;
@@ -511,7 +498,7 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)/* * Okay, type is determined now. Apply type-specific workarounds. */ - pi = info[type]; + ppi[0 ] = &info[type];if (type <3 )ata_pci_clear_simplex (pdev);
@@ -530,11 +517,11 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id)u32 udma;pci_read_config_dword (pdev,0x60 , &udma); - pi.private_data = (void *)(unsigned long )udma; + hpriv = (void *)(unsigned long )udma; }/* And fire it up */ -return ata_pci_init_one (pdev, ppi, &amd_sht); +return ata_pci_init_one (pdev, ppi, &amd_sht, hpriv); }#ifdef CONFIG_PM
drivers/ata/pata_artop.c +1 -1
@@ -430,7 +430,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)BUG_ON (ppi[0 ] ==NULL ); -return ata_pci_init_one (pdev, ppi, &artop_sht); +return ata_pci_init_one (pdev, ppi, &artop_sht,NULL ); }static const struct pci_device_id artop_pci_tbl[] = {
drivers/ata/pata_atiixp.c +1 -1
@@ -248,7 +248,7 @@ static int atiixp_init_one(struct pci_dev *dev, const struct pci_device_id *id) .port_ops = &atiixp_port_ops };const struct ata_port_info *ppi[] = { &info,NULL }; -return ata_pci_init_one (dev, ppi, &atiixp_sht); +return ata_pci_init_one (dev, ppi, &atiixp_sht,NULL ); }static const struct pci_device_id atiixp[] = {
drivers/ata/pata_cmd640.c +1 -1
@@ -224,7 +224,7 @@ static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)cmd640_hardware_init (pdev); -return ata_pci_init_one (pdev, ppi, &cmd640_sht); +return ata_pci_init_one (pdev, ppi, &cmd640_sht,NULL ); }#ifdef CONFIG_PM
drivers/ata/pata_cmd64x.c +1 -1
@@ -373,7 +373,7 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)pci_write_config_byte (pdev,UDIDETCR0 ,0xF0 );#endif -return ata_pci_init_one (pdev, ppi, &cmd64x_sht); +return ata_pci_init_one (pdev, ppi, &cmd64x_sht,NULL ); }#ifdef CONFIG_PM
drivers/ata/pata_cs5530.c +1 -1
@@ -325,7 +325,7 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ppi[1 ] = &info_palmax_secondary;/* Now kick off ATA set up */ -return ata_pci_init_one (pdev, ppi, &cs5530_sht); +return ata_pci_init_one (pdev, ppi, &cs5530_sht,NULL ); }#ifdef CONFIG_PM
drivers/ata/pata_cs5535.c +1 -1
@@ -199,7 +199,7 @@ static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)rdmsr (ATAC_CH0D1_PIO , timings, dummy);if (CS5535_BAD_PIO (timings))wrmsr (ATAC_CH0D1_PIO ,0xF7F4F7F4UL ,0 ); -return ata_pci_init_one (dev, ppi, &cs5535_sht); +return ata_pci_init_one (dev, ppi, &cs5535_sht,NULL ); }static const struct pci_device_id cs5535[] = {
drivers/ata/pata_cs5536.c +1 -1
@@ -261,7 +261,7 @@ static int cs5536_init_one(struct pci_dev *dev, const struct pci_device_id *id)return -ENODEV ; } -return ata_pci_init_one (dev, ppi, &cs5536_sht); +return ata_pci_init_one (dev, ppi, &cs5536_sht,NULL ); }static const struct pci_device_id cs5536[] = {
drivers/ata/pata_cypress.c +1 -1
@@ -136,7 +136,7 @@ static int cy82c693_init_one(struct pci_dev *pdev, const struct pci_device_id *iif (PCI_FUNC (pdev->devfn) !=1 )return -ENODEV ; -return ata_pci_init_one (pdev, ppi, &cy82c693_sht); +return ata_pci_init_one (pdev, ppi, &cy82c693_sht,NULL ); }static const struct pci_device_id cy82c693[] = {
drivers/ata/pata_efar.c +1 -1
@@ -275,7 +275,7 @@ static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_init_one (pdev, ppi, &efar_sht); +return ata_pci_init_one (pdev, ppi, &efar_sht,NULL ); }static const struct pci_device_id efar_pci_tbl[] = {
drivers/ata/pata_hpt366.c +6 -6
@@ -356,9 +356,9 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id) .udma_mask = ATA_UDMA4, .port_ops = &hpt366_port_ops }; -struct ata_port_info info = info_hpt366; -const struct ata_port_info *ppi[] = { &info,NULL }; +const struct ata_port_info *ppi[] = { &info_hpt366,NULL }; +void *hpriv =NULL ;u32 class_rev;u32 reg1;int rc;
@@ -383,17 +383,17 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id)/* info_hpt366 is safe against re-entry so we can scribble on it */ switch ((reg1 &0x700 ) >>8 ) {case 5 : - info.private_data = &hpt366_40; + hpriv = &hpt366_40;break ;case 9 : - info.private_data = &hpt366_25; + hpriv = &hpt366_25;break ;default : - info.private_data = &hpt366_33; + hpriv = &hpt366_33;break ; }/* Now kick off ATA set up */ -return ata_pci_init_one (dev, ppi, &hpt36x_sht); +return ata_pci_init_one (dev, ppi, &hpt36x_sht, hpriv); }#ifdef CONFIG_PM
drivers/ata/pata_hpt37x.c +14 -19
@@ -831,10 +831,8 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) };static const int MHz[4 ] = {33 ,40 ,50 ,66 }; -const struct ata_port_info *port;void *private_data =NULL ; -struct ata_port_info port_info; -const struct ata_port_info *ppi[] = { &port_info,NULL }; +const struct ata_port_info *ppi[] = {NULL ,NULL };u8 irqmask;u32 class_rev;
@@ -866,17 +864,17 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)switch (class_rev) {case 3 : - port = &info_hpt370; + ppi[0 ] = &info_hpt370; chip_table = &hpt370; prefer_dpll =0 ;break ;case 4 : - port = &info_hpt370a; + ppi[0 ] = &info_hpt370a; chip_table = &hpt370a; prefer_dpll =0 ;break ;case 5 : - port = &info_hpt372; + ppi[0 ] = &info_hpt372; chip_table = &hpt372;break ;default :
@@ -889,21 +887,21 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)/* 372N if rev >= 2*/ if (class_rev >=2 )return -ENODEV ; - port = &info_hpt372; + ppi[0 ] = &info_hpt372; chip_table = &hpt372a;break ;case PCI_DEVICE_ID_TTI_HPT302 :/* 302N if rev > 1 */ if (class_rev >1 )return -ENODEV ; - port = &info_hpt372; + ppi[0 ] = &info_hpt372;/* Check this */ chip_table = &hpt302;break ;case PCI_DEVICE_ID_TTI_HPT371 :if (class_rev >1 )return -ENODEV ; - port = &info_hpt372; + ppi[0 ] = &info_hpt372; chip_table = &hpt371;/* Single channel device, master is not present but the BIOS (or us for non x86) must mark it
@@ -914,7 +912,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)break ;case PCI_DEVICE_ID_TTI_HPT374 : chip_table = &hpt374; - port = &info_hpt374; + ppi[0 ] = &info_hpt374;break ;default :printk (KERN_ERR "pata_hpt37x: PCI table is bogus please report (%d).\n" , dev->device);
@@ -993,7 +991,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)int dpll, adjust;/* Compute DPLL */ - dpll = (port->udma_mask &0xC0 ) ?3 :2 ; + dpll = (ppi[0 ]->udma_mask &0xC0 ) ?3 :2 ; f_low = (MHz[clock_slot] *48 ) / MHz[dpll]; f_high = f_low +2 ;
@@ -1033,19 +1031,16 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)* about lack of UDMA133 support on lower clocks */ -if (clock_slot <2 && port == &info_hpt370) - port = &info_hpt370_33; -if (clock_slot <2 && port == &info_hpt370a) - port = &info_hpt370a_33; +if (clock_slot <2 && ppi[0 ] == &info_hpt370) + ppi[0 ] = &info_hpt370_33; +if (clock_slot <2 && ppi[0 ] == &info_hpt370a) + ppi[0 ] = &info_hpt370a_33;printk (KERN_INFO "pata_hpt37x: %s using %dMHz bus clock.\n" , chip_table->name, MHz[clock_slot]); }/* Now kick off ATA set up */ - port_info = *port; - port_info.private_data = private_data; - -return ata_pci_init_one (dev, ppi, &hpt37x_sht); +return ata_pci_init_one (dev, ppi, &hpt37x_sht, private_data); }static const struct pci_device_id hpt37x[] = {
drivers/ata/pata_hpt3x2n.c +4 -5
@@ -458,8 +458,7 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id) .udma_mask = ATA_UDMA6, .port_ops = &hpt3x2n_port_ops }; -struct ata_port_info port = info; -const struct ata_port_info *ppi[] = { &port,NULL }; +const struct ata_port_info *ppi[] = { &info,NULL };u8 irqmask;u32 class_rev;
@@ -468,6 +467,7 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id)unsigned int f_low, f_high;int adjust;unsigned long iobase =pci_resource_start (dev,4 ); +void *hpriv =NULL ;int rc; rc =pcim_enable_device (dev);
@@ -554,9 +554,8 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id) pci_mhz);/* Set our private data up. We only need a few flags so we use it directly */ - port.private_data =NULL ;if (pci_mhz >60 ) { - port.private_data = (void *)PCI66 ; + hpriv = (void *)PCI66 ;/* * On HPT371N, if ATA clock is 66 MHz we must set bit 2 in * the MISC. register to stretch the UltraDMA Tss timing.
@@ -567,7 +566,7 @@ static int hpt3x2n_init_one(struct pci_dev *dev, const struct pci_device_id *id) }/* Now kick off ATA set up */ -return ata_pci_init_one (dev, ppi, &hpt3x2n_sht); +return ata_pci_init_one (dev, ppi, &hpt3x2n_sht, hpriv); }static const struct pci_device_id hpt3x2n[] = {
drivers/ata/pata_it8213.c +1 -1
@@ -287,7 +287,7 @@ static int it8213_init_one (struct pci_dev *pdev, const struct pci_device_id *endev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_init_one (pdev, ppi, &it8213_sht); +return ata_pci_init_one (pdev, ppi, &it8213_sht,NULL ); }static const struct pci_device_id it8213_pci_tbl[] = {
drivers/ata/pata_it821x.c +1 -1
@@ -722,7 +722,7 @@ static int it821x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)else ppi[0 ] = &info_smart; -return ata_pci_init_one (pdev, ppi, &it821x_sht); +return ata_pci_init_one (pdev, ppi, &it821x_sht,NULL ); }#ifdef CONFIG_PM
drivers/ata/pata_jmicron.c +2 -16
@@ -105,20 +105,6 @@ static int jmicron_pre_reset(struct ata_link *link, unsigned long deadline)return ata_std_prereset (link, deadline); } -/** -* jmicron_error_handler - Setup and error handler -* @ap: Port to handle -* -* LOCKING: -* None (inherited from caller). -*/ - -static void jmicron_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, jmicron_pre_reset, ata_std_softreset,NULL , - ata_std_postreset); -} -/* No PIO or DMA methods needed for this device */ static struct scsi_host_template jmicron_sht = {
@@ -127,7 +113,7 @@ static struct scsi_host_template jmicron_sht = {static struct ata_port_operations jmicron_ops = { .inherits = &ata_bmdma_port_ops, - .error_handler = jmicron_error_handler, + .prereset = jmicron_pre_reset, };
@@ -158,7 +144,7 @@ static int jmicron_init_one (struct pci_dev *pdev, const struct pci_device_id *i };const struct ata_port_info *ppi[] = { &info,NULL }; -return ata_pci_init_one (pdev, ppi, &jmicron_sht); +return ata_pci_init_one (pdev, ppi, &jmicron_sht,NULL ); }static const struct pci_device_id jmicron_pci_tbl[] = {
drivers/ata/pata_marvell.c +2 -16
@@ -75,20 +75,6 @@ static int marvell_cable_detect(struct ata_port *ap)return 0 ;/* Our BUG macro needs the right markup */ } -/** -* marvell_error_handler - Setup and error handler -* @ap: Port to handle -* -* LOCKING: -* None (inherited from caller). -*/ - -static void marvell_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, marvell_pre_reset, ata_std_softreset,NULL , - ata_std_postreset); -} -/* No PIO or DMA methods needed for this device */ static struct scsi_host_template marvell_sht = {
@@ -98,7 +84,7 @@ static struct scsi_host_template marvell_sht = {static struct ata_port_operations marvell_ops = { .inherits = &ata_bmdma_port_ops, .cable_detect = marvell_cable_detect, - .error_handler = marvell_error_handler, + .prereset = marvell_pre_reset, };
@@ -142,7 +128,7 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *iif (pdev->device ==0x6101 ) ppi[1 ] = &ata_dummy_port_info; -return ata_pci_init_one (pdev, ppi, &marvell_sht); +return ata_pci_init_one (pdev, ppi, &marvell_sht,NULL ); }static const struct pci_device_id marvell_pci_tbl[] = {
drivers/ata/pata_netcell.c +1 -1
@@ -71,7 +71,7 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *eata_pci_clear_simplex (pdev);/* And let the library code do the work */ -return ata_pci_init_one (pdev, port_info, &netcell_sht); +return ata_pci_init_one (pdev, port_info, &netcell_sht,NULL ); }static const struct pci_device_id netcell_pci_tbl[] = {
drivers/ata/pata_ns87410.c +1 -1
@@ -163,7 +163,7 @@ static int ns87410_init_one(struct pci_dev *dev, const struct pci_device_id *id) .port_ops = &ns87410_port_ops };const struct ata_port_info *ppi[] = { &info,NULL }; -return ata_pci_init_one (dev, ppi, &ns87410_sht); +return ata_pci_init_one (dev, ppi, &ns87410_sht,NULL ); }static const struct pci_device_id ns87410[] = {
drivers/ata/pata_ns87415.c +1 -1
@@ -375,7 +375,7 @@ static int ns87415_init_one (struct pci_dev *pdev, const struct pci_device_id *epci_write_config_byte (pdev,0x55 ,0xEE );/* Select PIO0 8bit clocking */ pci_write_config_byte (pdev,0x54 ,0xB7 ); -return ata_pci_init_one (pdev, ppi, &ns87415_sht); +return ata_pci_init_one (pdev, ppi, &ns87415_sht,NULL ); }static const struct pci_device_id ns87415_pci_tbl[] = {
drivers/ata/pata_oldpiix.c +1 -1
@@ -263,7 +263,7 @@ static int oldpiix_init_one (struct pci_dev *pdev, const struct pci_device_id *edev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_init_one (pdev, ppi, &oldpiix_sht); +return ata_pci_init_one (pdev, ppi, &oldpiix_sht,NULL ); }static const struct pci_device_id oldpiix_pci_tbl[] = {
drivers/ata/pata_opti.c +1 -1
@@ -188,7 +188,7 @@ static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id)if (!printed_version++)dev_printk (KERN_DEBUG , &dev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_init_one (dev, ppi, &opti_sht); +return ata_pci_init_one (dev, ppi, &opti_sht,NULL ); }static const struct pci_device_id opti[] = {
drivers/ata/pata_optidma.c +1 -1
@@ -445,7 +445,7 @@ static int optidma_init_one(struct pci_dev *dev, const struct pci_device_id *id)if (optiplus_with_udma (dev)) ppi[0 ] = &info_82c700_udma; -return ata_pci_init_one (dev, ppi, &optidma_sht); +return ata_pci_init_one (dev, ppi, &optidma_sht,NULL ); }static const struct pci_device_id optidma[] = {
drivers/ata/pata_pdc202xx_old.c +1 -1
@@ -324,7 +324,7 @@ static int pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *idreturn -ENODEV ; } } -return ata_pci_init_one (dev, ppi, &pdc202xx_sht); +return ata_pci_init_one (dev, ppi, &pdc202xx_sht,NULL ); }static const struct pci_device_id pdc202xx[] = {
drivers/ata/pata_radisys.c +1 -1
@@ -228,7 +228,7 @@ static int radisys_init_one (struct pci_dev *pdev, const struct pci_device_id *edev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_init_one (pdev, ppi, &radisys_sht); +return ata_pci_init_one (pdev, ppi, &radisys_sht,NULL ); }static const struct pci_device_id radisys_pci_tbl[] = {
drivers/ata/pata_rz1000.c +1 -1
@@ -99,7 +99,7 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");if (rz1000_fifo_disable (pdev) ==0 ) -return ata_pci_init_one (pdev, ppi, &rz1000_sht); +return ata_pci_init_one (pdev, ppi, &rz1000_sht,NULL ); printk(KERN_ERR DRV_NAME ": failed to disable read-ahead on chipset..\n");/* Not safe to use so skip */
drivers/ata/pata_sc1200.c +1 -1
@@ -213,7 +213,7 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)/* Can't enable port 2 yet, see top comments */ const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info }; -return ata_pci_init_one (dev, ppi, &sc1200_sht); +return ata_pci_init_one (dev, ppi, &sc1200_sht,NULL ); }static const struct pci_device_id sc1200[] = {
drivers/ata/pata_serverworks.c +1 -1
@@ -461,7 +461,7 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_idif (pdev->device ==PCI_DEVICE_ID_SERVERWORKS_CSB5IDE )ata_pci_clear_simplex (pdev); -return ata_pci_init_one (pdev, ppi, &serverworks_sht); +return ata_pci_init_one (pdev, ppi, &serverworks_sht,NULL ); }#ifdef CONFIG_PM
drivers/ata/pata_sil680.c +1 -1
@@ -358,7 +358,7 @@ static int __devinit sil680_init_one(struct pci_dev *pdev, &sil680_sht); use_ioports: -return ata_pci_init_one (pdev, ppi, &sil680_sht); +return ata_pci_init_one (pdev, ppi, &sil680_sht,NULL ); }#ifdef CONFIG_PM
drivers/ata/pata_sis.c +3 -5
@@ -690,8 +690,7 @@ static void sis_fixup(struct pci_dev *pdev, struct sis_chipset *sis)static int sis_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {static int printed_version; -struct ata_port_info port; -const struct ata_port_info *ppi[] = { &port,NULL }; +const struct ata_port_info *ppi[] = {NULL ,NULL };struct pci_dev *host =NULL ;struct sis_chipset *chipset =NULL ;struct sis_chipset *sets;
@@ -831,12 +830,11 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)if (chipset ==NULL )return -ENODEV ; - port = *chipset->info; - port.private_data = chipset; + ppi[0 ] = chipset->info;sis_fixup (pdev, chipset); -return ata_pci_init_one (pdev, ppi, &sis_sht); +return ata_pci_init_one (pdev, ppi, &sis_sht, chipset); }static const struct pci_device_id sis_pci_tbl[] = {
drivers/ata/pata_sl82c105.c +1 -1
@@ -323,7 +323,7 @@ static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id val |=CTRL_P0EN |CTRL_P0F16 |CTRL_P1F16 ;pci_write_config_dword (dev,0x40 , val); -return ata_pci_init_one (dev, ppi, &sl82c105_sht); +return ata_pci_init_one (dev, ppi, &sl82c105_sht,NULL ); }static const struct pci_device_id sl82c105[] = {
drivers/ata/pata_triflex.c +1 -1
@@ -206,7 +206,7 @@ static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id)if (!printed_version++)dev_printk (KERN_DEBUG , &dev->dev,"version " DRV_VERSION "\n" ); -return ata_pci_init_one (dev, ppi, &triflex_sht); +return ata_pci_init_one (dev, ppi, &triflex_sht,NULL ); }static const struct pci_device_id triflex[] = {
drivers/ata/pata_via.c +8 -11
@@ -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
include/linux/libata.h +1 -1
@@ -1017,7 +1017,7 @@ struct pci_dev;extern int ata_pci_init_one (struct pci_dev *pdev,const struct ata_port_info *const * ppi, -struct scsi_host_template *sht); +struct scsi_host_template *sht,void *host_priv);extern void ata_pci_remove_one (struct pci_dev *pdev);#ifdef CONFIG_PM extern void ata_pci_device_do_suspend (struct pci_dev *pdev,pm_message_t mesg);
Signature · 1 line
1.5.2.4
PATCH 8/9 libata: kill port_info->sht and ->irq_handler
In reply to Tejun Heolibata core layer doesn't care about sht or ->irq_handler. Those are only of interest to the LLD during initialization. This is confusing and has caused several drivers to have duplicate unused initializers for these fields.
Currently only sata_nv uses these fields. Make sata_nv use ->private_data, which is supposed to carry LLD-specific information, instead and kill ->sht and ->irq_handler. nv_pi_priv structure is defined and struct literals are used to initialize private_data. Notational overhead is negligible.
Signed-off-by Tejun Heo <[email protected]>
--- drivers/ata/sata_nv.c | 29 +++++++++++++++++------------ include/linux/libata.h | 2 -- 2 files changed, 17 insertions(+), 14 deletions(-)
drivers/ata/sata_nv.c +17 -12
@@ -466,58 +466,61 @@ static struct ata_port_operations nv_swncq_ops = { .port_start = nv_swncq_port_start, }; +struct nv_pi_priv { +irq_handler_t irq_handler; +struct scsi_host_template *sht; +}; + +#define NV_PI_PRIV (_irq_handler, _sht) \ + &(struct nv_pi_priv){ .irq_handler = _irq_handler, .sht = _sht } +static const struct ata_port_info nv_port_info[] = {/* generic */ { - .sht = &nv_sht, .flags =ATA_FLAG_SATA |ATA_FLAG_NO_LEGACY , .pio_mask =NV_PIO_MASK , .mwdma_mask =NV_MWDMA_MASK , .udma_mask =NV_UDMA_MASK , .port_ops = &nv_generic_ops, - .irq_handler = nv_generic_interrupt, + .private_data =NV_PI_PRIV (nv_generic_interrupt, &nv_sht), },/* nforce2/3 */ { - .sht = &nv_sht, .flags =ATA_FLAG_SATA |ATA_FLAG_NO_LEGACY , .pio_mask =NV_PIO_MASK , .mwdma_mask =NV_MWDMA_MASK , .udma_mask =NV_UDMA_MASK , .port_ops = &nv_nf2_ops, - .irq_handler = nv_nf2_interrupt, + .private_data =NV_PI_PRIV (nv_nf2_interrupt, &nv_sht), },/* ck804 */ { - .sht = &nv_sht, .flags =ATA_FLAG_SATA |ATA_FLAG_NO_LEGACY , .pio_mask =NV_PIO_MASK , .mwdma_mask =NV_MWDMA_MASK , .udma_mask =NV_UDMA_MASK , .port_ops = &nv_ck804_ops, - .irq_handler = nv_ck804_interrupt, + .private_data =NV_PI_PRIV (nv_ck804_interrupt, &nv_sht), },/* ADMA */ { - .sht = &nv_adma_sht, .flags =ATA_FLAG_SATA |ATA_FLAG_NO_LEGACY |ATA_FLAG_MMIO |ATA_FLAG_NCQ , .pio_mask =NV_PIO_MASK , .mwdma_mask =NV_MWDMA_MASK , .udma_mask =NV_UDMA_MASK , .port_ops = &nv_adma_ops, - .irq_handler = nv_adma_interrupt, + .private_data =NV_PI_PRIV (nv_adma_interrupt, &nv_adma_sht), },/* SWNCQ */ { - .sht = &nv_swncq_sht, .flags =ATA_FLAG_SATA |ATA_FLAG_NO_LEGACY |ATA_FLAG_NCQ , .pio_mask =NV_PIO_MASK , .mwdma_mask =NV_MWDMA_MASK , .udma_mask =NV_UDMA_MASK , .port_ops = &nv_swncq_ops, - .irq_handler = nv_swncq_interrupt, + .private_data =NV_PI_PRIV (nv_swncq_interrupt, &nv_swncq_sht), }, };
@@ -2316,6 +2319,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) {static int printed_version;const struct ata_port_info *ppi[] = {NULL ,NULL }; +struct nv_pi_priv *ipriv;struct ata_host *host;struct nv_host_priv *hpriv;int rc;
@@ -2352,6 +2356,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) } ppi[0 ] = &nv_port_info[type]; + ipriv = ppi[0 ]->private_data; rc =ata_pci_prepare_sff_host (pdev, ppi, &host);if (rc)return rc;
@@ -2390,8 +2395,8 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)nv_swncq_host_init (host);pci_set_master (pdev); -return ata_host_activate (host, pdev->irq, ppi[0 ]->irq_handler, -IRQF_SHARED , ppi[0 ]->sht); +return ata_host_activate (host, pdev->irq, ipriv->irq_handler, +IRQF_SHARED , ipriv->sht); }#ifdef CONFIG_PM
include/linux/libata.h +0 -2
@@ -746,14 +746,12 @@ struct ata_port_operations { };struct ata_port_info { -struct scsi_host_template *sht;unsigned long flags;unsigned long link_flags;unsigned long pio_mask;unsigned long mwdma_mask;unsigned long udma_mask;struct ata_port_operations *port_ops; -irq_handler_t irq_handler;void *private_data; };
Signature · 1 line
1.5.2.4
PATCH 9/9 libata: make reset related methods proper port operations
In reply to Tejun HeoCurrently reset methods are not specified directly in the ata_port_operations table. If a LLD wants to use custom reset methods, it should construct and use a error_handler which uses those reset methods. It's done this way for two reasons.
First, the ops table already contained too many methods and adding four more of them would noticeably increase the amount of necessary boilerplate code all over low level drivers.
Second, as ->error_handler uses those reset methods, it can get confusing. ie. By overriding ->error_handler, those reset ops can be made useless making layering a bit hazy.
Now that ops table uses inheritance, the first problem doesn't exist anymore. The second isn't completely solved but is relieved by providing default values - most drivers can just override what it has implemented and don't have to concern itself about higher level callbacks. In fact, there currently is no driver which actually modifies error handling behavior. Drivers which override ->error_handler just wraps the standard error handler only to prepare the controller for EH. I don't think making ops layering strict has any noticeable benefit.
This patch makes ->prereset, ->softreset, ->hardreset, ->postreset and their PMP counterparts propoer ops. Default ops are provided in the base ops tables and drivers are converted to override individual reset methods instead of creating custom error_handler.
* ata_std_error_handler() doesn't use sata_std_hardreset() if SCRs aren't accessible. sata_promise doesn't need to use separate error_handlers for PATA and SATA anymore.
* softreset is broken for sata_inic162x and sata_sx4. As libata now always prefers hardreset, this doesn't really matter but the ops are forced to NULL using ATA_OP_NULL for documentation purpose.
* pata_hpt374 needs to use different prereset for the first and second PCI functions. This used to be done by branching from hpt374_error_handler(). The proper way to do this is to use separate ops and port_info tables for each function. Converted.
Signed-off-by Tejun Heo <[email protected]>
--- drivers/ata/ahci.c | 53 ++++++++++++------------------------ drivers/ata/ata_piix.c | 21 +++----------- drivers/ata/libata-core.c | 14 ++++++++- drivers/ata/libata-eh.c | 25 +++++++++++++++++ drivers/ata/libata-pmp.c | 47 ++++++++------------------------- drivers/ata/libata-sff.c | 49 +++++++++++----------------------- drivers/ata/pata_artop.c | 34 +---------------------- drivers/ata/pata_atiixp.c | 7 +---- drivers/ata/pata_bf54x.c | 14 +-------- drivers/ata/pata_efar.c | 15 +---------- drivers/ata/pata_hpt37x.c | 61 ++++++++++++++----------------------------- drivers/ata/pata_hpt3x2n.c | 16 +---------- drivers/ata/pata_icside.c | 8 +----- drivers/ata/pata_it8213.c | 15 +---------- drivers/ata/pata_mpc52xx.c | 10 ------- drivers/ata/pata_mpiix.c | 16 +---------- drivers/ata/pata_ns87410.c | 16 +---------- drivers/ata/pata_oldpiix.c | 16 +---------- drivers/ata/pata_opti.c | 17 +----------- drivers/ata/pata_optidma.c | 17 +----------- drivers/ata/pata_pdc2027x.c | 19 +------------ drivers/ata/pata_scc.c | 15 ++-------- drivers/ata/pata_sis.c | 15 +---------- drivers/ata/pata_sl82c105.c | 8 +----- drivers/ata/pata_triflex.c | 7 +---- drivers/ata/pata_via.c | 14 +--------- drivers/ata/pdc_adma.c | 11 ++----- drivers/ata/sata_fsl.c | 12 +-------- drivers/ata/sata_inic162x.c | 5 ++- drivers/ata/sata_mv.c | 16 +++++----- drivers/ata/sata_nv.c | 17 +++-------- drivers/ata/sata_promise.c | 22 +++------------ drivers/ata/sata_qstor.c | 6 +++- drivers/ata/sata_sil24.c | 18 +++++++++--- drivers/ata/sata_via.c | 10 +----- drivers/scsi/ipr.c | 3 +- include/linux/libata.h | 19 +++++++------ 37 files changed, 186 insertions(+), 502 deletions(-)
drivers/ata/ahci.c +18 -35
@@ -248,9 +248,18 @@ static void ahci_freeze(struct ata_port *ap);static void ahci_thaw (struct ata_port *ap);static void ahci_pmp_attach (struct ata_port *ap);static void ahci_pmp_detach (struct ata_port *ap); +static int ahci_softreset (struct ata_link *link,unsigned int *class, +unsigned long deadline); +static int ahci_hardreset (struct ata_link *link,unsigned int *class, +unsigned long deadline); +static int ahci_vt8251_hardreset (struct ata_link *link,unsigned int *class, +unsigned long deadline); +static int ahci_p5wdh_hardreset (struct ata_link *link,unsigned int *class, +unsigned long deadline); +static void ahci_postreset (struct ata_link *link,unsigned int *class); +static int ahci_pmp_softreset (struct ata_link *link,unsigned int *class, +unsigned long deadline);static void ahci_error_handler (struct ata_port *ap); -static void ahci_vt8251_error_handler (struct ata_port *ap); -static void ahci_p5wdh_error_handler (struct ata_port *ap);static void ahci_post_internal_cmd (struct ata_queued_cmd *qc);static int ahci_port_resume (struct ata_port *ap);static void ahci_dev_config (struct ata_device *dev);
@@ -289,6 +298,10 @@ static struct ata_port_operations ahci_ops = { .freeze = ahci_freeze, .thaw = ahci_thaw, + .softreset = ahci_softreset, + .hardreset = ahci_hardreset, + .postreset = ahci_postreset, + .pmp_softreset = ahci_pmp_softreset, .error_handler = ahci_error_handler, .post_internal_cmd = ahci_post_internal_cmd, .dev_config = ahci_dev_config,
@@ -310,12 +323,12 @@ static struct ata_port_operations ahci_ops = {static struct ata_port_operations ahci_vt8251_ops = { .inherits = &ahci_ops, - .error_handler = ahci_vt8251_error_handler, + .hardreset = ahci_vt8251_hardreset, };static struct ata_port_operations ahci_p5wdh_ops = { .inherits = &ahci_ops, - .error_handler = ahci_p5wdh_error_handler, + .hardreset = ahci_p5wdh_hardreset, };#define AHCI_HFLAGS (flags) .private_data = (void *)(flags)
@@ -1771,37 +1784,7 @@ static void ahci_error_handler(struct ata_port *ap)ahci_start_engine (ap); } -/* perform recovery */ -sata_pmp_do_eh (ap, ata_std_prereset, ahci_softreset, - ahci_hardreset, ahci_postreset, - sata_pmp_std_prereset, ahci_pmp_softreset, - sata_pmp_std_hardreset, sata_pmp_std_postreset); -} - -static void ahci_vt8251_error_handler (struct ata_port *ap) -{ -if (!(ap->pflags &ATA_PFLAG_FROZEN )) { -/* restart engine */ -ahci_stop_engine (ap); -ahci_start_engine (ap); - } - -/* perform recovery */ -ata_do_eh (ap, ata_std_prereset, ahci_softreset, ahci_vt8251_hardreset, - ahci_postreset); -} - -static void ahci_p5wdh_error_handler (struct ata_port *ap) -{ -if (!(ap->pflags &ATA_PFLAG_FROZEN )) { -/* restart engine */ -ahci_stop_engine (ap); -ahci_start_engine (ap); - } - -/* perform recovery */ -ata_do_eh (ap, ata_std_prereset, ahci_softreset, ahci_p5wdh_hardreset, - ahci_postreset); +sata_pmp_error_handler (ap); }static void ahci_post_internal_cmd (struct ata_queued_cmd *qc)
drivers/ata/ata_piix.c +5 -16
@@ -162,15 +162,16 @@ struct piix_host_priv {static int piix_init_one (struct pci_dev *pdev,const struct pci_device_id *ent); -static void piix_pata_error_handler (struct ata_port *ap); +static int piix_pata_prereset (struct ata_link *link,unsigned long deadline);static void piix_set_piomode (struct ata_port *ap,struct ata_device *adev);static void piix_set_dmamode (struct ata_port *ap,struct ata_device *adev);static void ich_set_dmamode (struct ata_port *ap,struct ata_device *adev);static int ich_pata_cable_detect (struct ata_port *ap);static u8 piix_vmw_bmdma_status (struct ata_port *ap); +static int piix_sidpr_hardreset (struct ata_link *link,unsigned int *class, +unsigned long deadline);static int piix_sidpr_scr_read (struct ata_port *ap,unsigned int reg,u32 *val);static int piix_sidpr_scr_write (struct ata_port *ap,unsigned int reg,u32 val); -static void piix_sidpr_error_handler (struct ata_port *ap);#ifdef CONFIG_PM static int piix_pci_device_suspend (struct pci_dev *pdev,pm_message_t mesg);static int piix_pci_device_resume (struct pci_dev *pdev);
@@ -299,7 +300,7 @@ static struct ata_port_operations piix_pata_ops = { .cable_detect = ata_cable_40wire, .set_piomode = piix_set_piomode, .set_dmamode = piix_set_dmamode, - .error_handler = piix_pata_error_handler, + .prereset = piix_pata_prereset, };static struct ata_port_operations piix_vmw_ops = {
@@ -319,9 +320,9 @@ static struct ata_port_operations piix_sata_ops = {static struct ata_port_operations piix_sidpr_sata_ops = { .inherits = &piix_sata_ops, + .hardreset = piix_sidpr_hardreset, .scr_read = piix_sidpr_scr_read, .scr_write = piix_sidpr_scr_write, - .error_handler = piix_sidpr_error_handler, };static const struct piix_map_db ich5_map_db = {
@@ -645,12 +646,6 @@ static int piix_pata_prereset(struct ata_link *link, unsigned long deadline)return ata_std_prereset (link, deadline); } -static void piix_pata_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, piix_pata_prereset, ata_std_softreset,NULL , - ata_std_postreset); -} -/** * piix_set_piomode - Initialize host controller PATA PIO timings * @ap: Port whose timings we are configuring
@@ -1057,12 +1052,6 @@ static int piix_sidpr_hardreset(struct ata_link *link, unsigned int *class,return -EAGAIN ; } -static void piix_sidpr_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, ata_std_prereset, ata_std_softreset, - piix_sidpr_hardreset, ata_std_postreset); -} -#ifdef CONFIG_PM static int piix_broken_suspend (void ) {
drivers/ata/libata-core.c +12 -2
@@ -76,6 +76,10 @@ const unsigned long sata_deb_timing_long[] = { 100, 2000, 5000 };const struct ata_port_operations ata_base_port_ops = { .irq_clear = ata_noop_irq_clear, + .prereset = ata_std_prereset, + .hardreset = sata_std_hardreset, + .postreset = ata_std_postreset, + .error_handler = ata_std_error_handler, };const struct ata_port_operations sata_port_ops = {
@@ -83,6 +87,11 @@ const struct ata_port_operations sata_port_ops = { .qc_defer = ata_std_qc_defer, .dev_select = ata_noop_dev_select, + + .pmp_prereset = sata_pmp_std_prereset, + .pmp_hardreset = sata_pmp_std_hardreset, + .pmp_postreset = sata_pmp_std_postreset, + .error_handler = sata_pmp_error_handler, };const struct ata_port_operations sata_pmp_port_ops = {
@@ -97,6 +106,7 @@ const struct ata_port_operations ata_sff_port_ops = { .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, + .softreset = ata_std_softreset, .error_handler = ata_bmdma_error_handler, .post_internal_cmd = ata_bmdma_post_internal_cmd,
@@ -7886,7 +7896,6 @@ EXPORT_SYMBOL_GPL(ata_bmdma_status);EXPORT_SYMBOL_GPL (ata_bmdma_stop);EXPORT_SYMBOL_GPL (ata_bmdma_freeze);EXPORT_SYMBOL_GPL (ata_bmdma_thaw); -EXPORT_SYMBOL_GPL (ata_bmdma_drive_eh);EXPORT_SYMBOL_GPL (ata_bmdma_error_handler);EXPORT_SYMBOL_GPL (ata_bmdma_post_internal_cmd);EXPORT_SYMBOL_GPL (ata_port_probe);
@@ -7956,7 +7965,7 @@ EXPORT_SYMBOL_GPL(sata_pmp_qc_defer_cmd_switch);EXPORT_SYMBOL_GPL (sata_pmp_std_prereset);EXPORT_SYMBOL_GPL (sata_pmp_std_hardreset);EXPORT_SYMBOL_GPL (sata_pmp_std_postreset); -EXPORT_SYMBOL_GPL (sata_pmp_do_eh); +EXPORT_SYMBOL_GPL (sata_pmp_error_handler);EXPORT_SYMBOL_GPL (__ata_ehi_push_desc);EXPORT_SYMBOL_GPL (ata_ehi_push_desc);
@@ -7975,6 +7984,7 @@ EXPORT_SYMBOL_GPL(ata_eh_thaw_port);EXPORT_SYMBOL_GPL (ata_eh_qc_complete);EXPORT_SYMBOL_GPL (ata_eh_qc_retry);EXPORT_SYMBOL_GPL (ata_do_eh); +EXPORT_SYMBOL_GPL (ata_std_error_handler);EXPORT_SYMBOL_GPL (ata_irq_on);EXPORT_SYMBOL_GPL (ata_dev_try_classify);
drivers/ata/libata-eh.c +25 -0
@@ -2814,6 +2814,7 @@ void ata_eh_finish(struct ata_port *ap)/** * ata_do_eh - do standard error handling * @ap: host port to handle error for +* * @prereset: prereset method (can be NULL) * @softreset: softreset method (can be NULL) * @hardreset: hardreset method (can be NULL)
@@ -2844,6 +2845,30 @@ void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset,ata_eh_finish (ap); } +/** +* ata_std_error_handler - standard error handler +* @ap: host port to handle error for +* +* Standard error handler +* +* LOCKING: +* Kernel thread context (may sleep). +*/ +void ata_std_error_handler (struct ata_port *ap) +{ +struct ata_port_operations *ops = ap->ops; +ata_reset_fn_t hardreset = ops->hardreset; + +/* sata_std_hardreset is inherited to all drivers from +* ata_base_port_ops. Ignore it if SCR access is not +* available. +*/ +if (hardreset == sata_std_hardreset && !sata_scr_valid (&ap->link)) + hardreset =NULL ; + +ata_do_eh (ap, ops->prereset, ops->softreset, hardreset, ops->postreset); +} +#ifdef CONFIG_PM /** * ata_eh_handle_port_suspend - perform port suspend operation
drivers/ata/libata-pmp.c +11 -36
93 lines not on this page · raw message
drivers/ata/libata-sff.c +16 -33
73 lines not on this page · raw message
drivers/ata/pata_artop.c +2 -32
@@ -56,21 +56,6 @@ static int artop6210_pre_reset(struct ata_link *link, unsigned long deadline) }/** -* artop6210_error_handler - Probe specified port on PATA host controller -* @ap: Port to probe -* -* LOCKING: -* None (inherited from caller). -*/ - -static void artop6210_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, artop6210_pre_reset, - ata_std_softreset,NULL , - ata_std_postreset); -} - -/** * artop6260_pre_reset - check for 40/80 pin * @link: link * @deadline: deadline jiffies for the operation
@@ -114,21 +99,6 @@ static int artop6260_cable_detect(struct ata_port *ap) }/** -* artop6260_error_handler - Probe specified port on PATA host controller -* @ap: Port to probe -* -* LOCKING: -* None (inherited from caller). -*/ - -static void artop6260_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, artop6260_pre_reset, - ata_std_softreset,NULL , - ata_std_postreset); -} - -/** * artop6210_load_piomode - Load a set of PATA PIO timings * @ap: Port whose timings we are configuring * @adev: Device
@@ -322,7 +292,7 @@ static struct ata_port_operations artop6210_ops = { .cable_detect = ata_cable_40wire, .set_piomode = artop6210_set_piomode, .set_dmamode = artop6210_set_dmamode, - .error_handler = artop6210_error_handler, + .prereset = artop6210_pre_reset, };static struct ata_port_operations artop6260_ops = {
@@ -330,7 +300,7 @@ static struct ata_port_operations artop6260_ops = { .cable_detect = artop6260_cable_detect, .set_piomode = artop6260_set_piomode, .set_dmamode = artop6260_set_dmamode, - .error_handler = artop6260_error_handler, + .prereset = artop6260_pre_reset, };
drivers/ata/pata_atiixp.c +1 -6
@@ -48,11 +48,6 @@ static int atiixp_pre_reset(struct ata_link *link, unsigned long deadline)return ata_std_prereset (link, deadline); } -static void atiixp_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, atiixp_pre_reset, ata_std_softreset,NULL , ata_std_postreset); -} -static int atiixp_cable_detect (struct ata_port *ap) {struct pci_dev *pdev =to_pci_dev (ap->host->dev);
@@ -235,7 +230,7 @@ static struct ata_port_operations atiixp_port_ops = { .cable_detect = atiixp_cable_detect, .set_piomode = atiixp_set_piomode, .set_dmamode = atiixp_set_dmamode, - .error_handler = atiixp_error_handler, + .prereset = atiixp_pre_reset, };static int atiixp_init_one (struct pci_dev *dev,const struct pci_device_id *id)
drivers/ata/pata_bf54x.c +2 -12
@@ -1314,17 +1314,6 @@ static void bfin_std_postreset(struct ata_link *link, unsigned int *classes)write_atapi_register (base,ATA_REG_CTRL , ap->ctl); } -/** -* bfin_error_handler - Stock error handler for DMA controller -* @ap: port to handle error for -*/ - -static void bfin_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, ata_std_prereset, bfin_std_softreset,NULL , - bfin_std_postreset); -} -static void bfin_port_stop (struct ata_port *ap) {dev_dbg (ap->dev,"in atapi port stop\n" );
@@ -1385,7 +1374,8 @@ static const struct ata_port_operations bfin_pata_ops = { .freeze = bfin_bmdma_freeze, .thaw = bfin_bmdma_thaw, - .error_handler = bfin_error_handler, + .softreset = bfin_std_softreset, + .postreset = bfin_std_postreset, .post_internal_cmd = bfin_bmdma_stop, .irq_clear = bfin_irq_clear,
drivers/ata/pata_efar.c +1 -14
@@ -49,19 +49,6 @@ static int efar_pre_reset(struct ata_link *link, unsigned long deadline) }/** -* efar_probe_reset - Probe specified port on PATA host controller -* @ap: Port to probe -* -* LOCKING: -* None (inherited from caller). -*/ - -static void efar_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, efar_pre_reset, ata_std_softreset,NULL , ata_std_postreset); -} - -/** * efar_cable_detect - check for 40/80 pin * @ap: Port *
@@ -241,7 +228,7 @@ static struct ata_port_operations efar_ops = { .cable_detect = efar_cable_detect, .set_piomode = efar_set_piomode, .set_dmamode = efar_set_dmamode, - .error_handler = efar_error_handler, + .prereset = efar_pre_reset, };
drivers/ata/pata_hpt37x.c +20 -41
108 lines not on this page · raw message
drivers/ata/pata_hpt3x2n.c +2 -14
@@ -148,7 +148,7 @@ static int hpt3x2n_cable_detect(struct ata_port *ap)* Reset the hardware and state machine, */ -static int hpt3xn_pre_reset (struct ata_link *link,unsigned long deadline) +static int hpt3x2n_pre_reset (struct ata_link *link,unsigned long deadline) {struct ata_port *ap = link->ap;struct pci_dev *pdev =to_pci_dev (ap->host->dev);
@@ -160,18 +160,6 @@ static int hpt3xn_pre_reset(struct ata_link *link, unsigned long deadline) }/** -* hpt3x2n_error_handler - probe the hpt3x2n bus -* @ap: ATA port to reset -* -* Perform the probe reset handling for the 3x2N -*/ - -static void hpt3x2n_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, hpt3xn_pre_reset, ata_std_softreset,NULL , ata_std_postreset); -} - -/** * hpt3x2n_set_piomode - PIO setup * @ap: ATA interface * @adev: device on the interface
@@ -355,7 +343,7 @@ static struct ata_port_operations hpt3x2n_port_ops = { .cable_detect = hpt3x2n_cable_detect, .set_piomode = hpt3x2n_set_piomode, .set_dmamode = hpt3x2n_set_dmamode, - .error_handler = hpt3x2n_error_handler, + .prereset = hpt3x2n_pre_reset, };/**
drivers/ata/pata_icside.c +1 -7
@@ -332,12 +332,6 @@ static void pata_icside_postreset(struct ata_link *link, unsigned int *classes) } } -static void pata_icside_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, ata_std_prereset, ata_std_softreset,NULL , - pata_icside_postreset); -} -static struct ata_port_operations pata_icside_port_ops = { .inherits = &ata_sff_port_ops,/* no need to build any PRD tables for DMA */
@@ -350,7 +344,7 @@ static struct ata_port_operations pata_icside_port_ops = { .cable_detect = ata_cable_40wire, .set_dmamode = pata_icside_set_dmamode, - .error_handler = pata_icside_error_handler, + .postreset = pata_icside_postreset, .post_internal_cmd = pata_icside_bmdma_stop, };
drivers/ata/pata_it8213.c +1 -14
@@ -44,19 +44,6 @@ static int it8213_pre_reset(struct ata_link *link, unsigned long deadline) }/** -* it8213_error_handler - Probe specified port on PATA host controller -* @ap: Port to probe -* -* LOCKING: -* None (inherited from caller). -*/ - -static void it8213_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, it8213_pre_reset, ata_std_softreset,NULL , ata_std_postreset); -} - -/** * it8213_cable_detect - check for 40/80 pin * @ap: Port *
@@ -252,7 +239,7 @@ static struct ata_port_operations it8213_ops = { .cable_detect = it8213_cable_detect, .set_piomode = it8213_set_piomode, .set_dmamode = it8213_set_dmamode, - .error_handler = it8213_error_handler, + .prereset = it8213_pre_reset, };
drivers/ata/pata_mpc52xx.c +0 -10
@@ -255,15 +255,6 @@ mpc52xx_ata_dev_select(struct ata_port *ap, unsigned int device)ata_std_dev_select (ap,device); } -static void -mpc52xx_ata_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, ata_std_prereset, ata_std_softreset,NULL , - ata_std_postreset); -} - - -static struct scsi_host_template mpc52xx_ata_sht = {ATA_PIO_SHT (DRV_NAME ), };
@@ -273,7 +264,6 @@ static struct ata_port_operations mpc52xx_ata_port_ops = { .dev_select = mpc52xx_ata_dev_select, .cable_detect = ata_cable_40wire, .set_piomode = mpc52xx_ata_set_piomode, - .error_handler = mpc52xx_ata_error_handler, .post_internal_cmd = ATA_OP_NULL, };
drivers/ata/pata_mpiix.c +1 -15
@@ -59,20 +59,6 @@ static int mpiix_pre_reset(struct ata_link *link, unsigned long deadline) }/** -* mpiix_error_handler - probe reset -* @ap: ATA port -* -* Perform the ATA probe and bus reset sequence plus specific handling -* for this hardware. The MPIIX has the enable bits in a different place -* to PIIX4 and friends. As a pure PIO device it has no cable detect -*/ - -static void mpiix_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, mpiix_pre_reset, ata_std_softreset,NULL , ata_std_postreset); -} - -/** * mpiix_set_piomode - set initial PIO mode data * @ap: ATA interface * @adev: ATA device
@@ -159,7 +145,7 @@ static struct ata_port_operations mpiix_port_ops = { .qc_issue = mpiix_qc_issue_prot, .cable_detect = ata_cable_40wire, .set_piomode = mpiix_set_piomode, - .error_handler = mpiix_error_handler, + .prereset = mpiix_pre_reset, };static int mpiix_init_one (struct pci_dev *dev,const struct pci_device_id *id)
drivers/ata/pata_ns87410.c +1 -15
@@ -54,20 +54,6 @@ static int ns87410_pre_reset(struct ata_link *link, unsigned long deadline) }/** -* ns87410_error_handler - probe reset -* @ap: ATA port -* -* Perform the ATA probe and bus reset sequence plus specific handling -* for this hardware. The MPIIX has the enable bits in a different place -* to PIIX4 and friends. As a pure PIO device it has no cable detect -*/ - -static void ns87410_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, ns87410_pre_reset, ata_std_softreset,NULL , ata_std_postreset); -} - -/** * ns87410_set_piomode - set initial PIO mode data * @ap: ATA interface * @adev: ATA device
@@ -152,7 +138,7 @@ static struct ata_port_operations ns87410_port_ops = { .qc_issue = ns87410_qc_issue_prot, .cable_detect = ata_cable_40wire, .set_piomode = ns87410_set_piomode, - .error_handler = ns87410_error_handler, + .prereset = ns87410_pre_reset, };static int ns87410_init_one (struct pci_dev *dev,const struct pci_device_id *id)
drivers/ata/pata_oldpiix.c +1 -15
@@ -51,20 +51,6 @@ static int oldpiix_pre_reset(struct ata_link *link, unsigned long deadline) }/** -* oldpiix_pata_error_handler - Probe specified port on PATA host controller -* @ap: Port to probe -* @classes: -* -* LOCKING: -* None (inherited from caller). -*/ - -static void oldpiix_pata_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, oldpiix_pre_reset, ata_std_softreset,NULL , ata_std_postreset); -} - -/** * oldpiix_set_piomode - Initialize host controller PATA PIO timings * @ap: Port whose timings we are configuring * @adev: Device whose timings we are configuring
@@ -229,7 +215,7 @@ static struct ata_port_operations oldpiix_pata_ops = { .cable_detect = ata_cable_40wire, .set_piomode = oldpiix_set_piomode, .set_dmamode = oldpiix_set_dmamode, - .error_handler = oldpiix_pata_error_handler, + .prereset = oldpiix_pre_reset, };
drivers/ata/pata_opti.c +1 -16
@@ -68,21 +68,6 @@ static int opti_pre_reset(struct ata_link *link, unsigned long deadline) }/** -* opti_probe_reset - probe reset -* @ap: ATA port -* -* Perform the ATA probe and bus reset sequence plus specific handling -* for this hardware. The Opti needs little handling - we have no UDMA66 -* capability that needs cable detection. All we must do is check the port -* is enabled. -*/ - -static void opti_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, opti_pre_reset, ata_std_softreset,NULL , ata_std_postreset); -} - -/** * opti_write_reg - control register setup * @ap: ATA port * @value: value
@@ -172,7 +157,7 @@ static struct ata_port_operations opti_port_ops = { .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = opti_set_piomode, - .error_handler = opti_error_handler, + .prereset = opti_pre_reset, };static int opti_init_one (struct pci_dev *dev,const struct pci_device_id *id)
drivers/ata/pata_optidma.c +1 -16
@@ -68,21 +68,6 @@ static int optidma_pre_reset(struct ata_link *link, unsigned long deadline) }/** -* optidma_probe_reset - probe reset -* @ap: ATA port -* -* Perform the ATA probe and bus reset sequence plus specific handling -* for this hardware. The Opti needs little handling - we have no UDMA66 -* capability that needs cable detection. All we must do is check the port -* is enabled. -*/ - -static void optidma_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, optidma_pre_reset, ata_std_softreset,NULL , ata_std_postreset); -} - -/** * optidma_unlock - unlock control registers * @ap: ATA port *
@@ -359,7 +344,7 @@ static struct ata_port_operations optidma_port_ops = { .set_piomode = optidma_set_pio_mode, .set_dmamode = optidma_set_dma_mode, .set_mode = optidma_set_mode, - .error_handler = optidma_error_handler, + .prereset = optidma_pre_reset, };static struct ata_port_operations optiplus_port_ops = {
drivers/ata/pata_pdc2027x.c +2 -17
@@ -63,7 +63,7 @@ enum { };static int pdc2027x_init_one (struct pci_dev *pdev,const struct pci_device_id *ent); -static void pdc2027x_error_handler (struct ata_port *ap); +static int pdc2027x_prereset (struct ata_link *link,unsigned long deadline);static void pdc2027x_set_piomode (struct ata_port *ap,struct ata_device *adev);static void pdc2027x_set_dmamode (struct ata_port *ap,struct ata_device *adev);static int pdc2027x_check_atapi_dma (struct ata_queued_cmd *qc);
@@ -136,7 +136,7 @@ static struct ata_port_operations pdc2027x_pata100_ops = { .inherits = &ata_bmdma_port_ops, .check_atapi_dma = pdc2027x_check_atapi_dma, .cable_detect = pdc2027x_cable_detect, - .error_handler = pdc2027x_error_handler, + .prereset = pdc2027x_prereset, };static struct ata_port_operations pdc2027x_pata133_ops = {
@@ -252,21 +252,6 @@ static int pdc2027x_prereset(struct ata_link *link, unsigned long deadline) }/** -* pdc2027x_error_handler - Perform reset on PATA port and classify -* @ap: Port to reset -* -* Reset PATA phy and classify attached devices. -* -* LOCKING: -* None (inherited from caller). -*/ - -static void pdc2027x_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, pdc2027x_prereset, ata_std_softreset,NULL , ata_std_postreset); -} - -/** * pdc2720x_mode_filter - mode selection filter * @adev: ATA device * @mask: list of modes proposed
drivers/ata/pata_scc.c +3 -12
@@ -905,17 +905,6 @@ static void scc_std_postreset(struct ata_link *link, unsigned int *classes) }/** -* scc_error_handler - Stock error handler for BMDMA controller -* @ap: port to handle error for -*/ - -static void scc_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, scc_pata_prereset, scc_std_softreset,NULL , - scc_std_postreset); -} - -/** * scc_bmdma_irq_clear - Clear PCI IDE BMDMA interrupt. * @ap: Port associated with this ATA transaction. *
@@ -992,7 +981,9 @@ static const struct ata_port_operations scc_pata_ops = { .data_xfer = scc_data_xfer, .freeze = scc_bmdma_freeze, - .error_handler = scc_error_handler, + .prereset = scc_pata_prereset, + .softreset = scc_std_softreset, + .postreset = scc_std_postreset, .post_internal_cmd = scc_bmdma_stop, .irq_clear = scc_bmdma_irq_clear,
drivers/ata/pata_sis.c +1 -14
@@ -161,19 +161,6 @@ static int sis_pre_reset(struct ata_link *link, unsigned long deadline)/** -* sis_error_handler - Probe specified port on PATA host controller -* @ap: Port to probe -* -* LOCKING: -* None (inherited from caller). -*/ - -static void sis_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, sis_pre_reset, ata_std_softreset,NULL , ata_std_postreset); -} - -/** * sis_set_fifo - Set RWP fifo bits for this device * @ap: Port * @adev: Device
@@ -526,7 +513,7 @@ static struct ata_port_operations sis_133_for_sata_ops = {static struct ata_port_operations sis_base_ops = { .inherits = &ata_bmdma_port_ops, - .error_handler = sis_error_handler, + .prereset = sis_pre_reset, };static struct ata_port_operations sis_133_ops = {
drivers/ata/pata_sl82c105.c +1 -7
@@ -64,12 +64,6 @@ static int sl82c105_pre_reset(struct ata_link *link, unsigned long deadline) } -static void sl82c105_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, sl82c105_pre_reset, ata_std_softreset,NULL , ata_std_postreset); -} - -/** * sl82c105_configure_piomode - set chip PIO timing * @ap: ATA interface
@@ -245,7 +239,7 @@ static struct ata_port_operations sl82c105_port_ops = { .bmdma_stop = sl82c105_bmdma_stop, .cable_detect = ata_cable_40wire, .set_piomode = sl82c105_set_piomode, - .error_handler = sl82c105_error_handler, + .prereset = sl82c105_pre_reset, };/**
drivers/ata/pata_triflex.c +1 -6
@@ -71,11 +71,6 @@ static int triflex_prereset(struct ata_link *link, unsigned long deadline) -static void triflex_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, triflex_prereset, ata_std_softreset,NULL , ata_std_postreset); -} -/** * triflex_load_timing - timing configuration * @ap: ATA interface
@@ -189,7 +184,7 @@ static struct ata_port_operations triflex_port_ops = { .bmdma_stop = triflex_bmdma_stop, .cable_detect = ata_cable_40wire, .set_piomode = triflex_set_piomode, - .error_handler = triflex_error_handler, + .prereset = triflex_prereset, };static int triflex_init_one (struct pci_dev *dev,const struct pci_device_id *id)
drivers/ata/pata_via.c +1 -13
@@ -215,18 +215,6 @@ static int via_pre_reset(struct ata_link *link, unsigned long deadline)/** -* via_error_handler - reset for VIA chips -* @ap: ATA port -* -* Handle the reset callback for the later chips with cable detect -*/ - -static void via_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, via_pre_reset, ata_std_softreset,NULL , ata_std_postreset); -} - -/** * via_do_set_mode - set initial PIO mode data * @ap: ATA interface * @adev: ATA device
@@ -343,7 +331,7 @@ static struct ata_port_operations via_port_ops = { .cable_detect = via_cable_detect, .set_piomode = via_set_piomode, .set_dmamode = via_set_dmamode, - .error_handler = via_error_handler, + .prereset = via_pre_reset, };static struct ata_port_operations via_port_ops_noirq = {
drivers/ata/pdc_adma.c +3 -8
@@ -140,7 +140,7 @@ static void adma_bmdma_stop(struct ata_queued_cmd *qc);static u8 adma_bmdma_status (struct ata_port *ap);static void adma_freeze (struct ata_port *ap);static void adma_thaw (struct ata_port *ap); -static void adma_error_handler (struct ata_port *ap); +static int adma_prereset (struct ata_link *link,unsigned long deadline);static struct scsi_host_template adma_ata_sht = {ATA_BASE_SHT (DRV_NAME ),
@@ -166,7 +166,8 @@ static struct ata_port_operations adma_ata_ops = { .freeze = adma_freeze, .thaw = adma_thaw, - .error_handler = adma_error_handler, + .prereset = adma_prereset, + .softreset = ata_std_softreset, .port_start = adma_port_start, .port_stop = adma_port_stop,
@@ -292,12 +293,6 @@ static int adma_prereset(struct ata_link *link, unsigned long deadline)return ata_std_prereset (link, deadline); } -static void adma_error_handler (struct ata_port *ap) -{ -ata_do_eh (ap, adma_prereset, ata_std_softreset,NULL , - ata_std_postreset); -} -static int adma_fill_sg (struct ata_queued_cmd *qc) {struct scatterlist *sg;
drivers/ata/sata_fsl.c +1 -11
@@ -912,16 +912,6 @@ err:return -EIO ; } -static void sata_fsl_error_handler (struct ata_port *ap) -{ - -DPRINTK ("in xx_error_handler\n" ); - -/* perform recovery */ -ata_do_eh (ap, ata_std_prereset, sata_fsl_softreset, sata_std_hardreset, - ata_std_postreset); -} -static void sata_fsl_post_internal_cmd (struct ata_queued_cmd *qc) {if (qc->flags &ATA_QCFLAG_FAILED )
@@ -1213,7 +1203,7 @@ static const struct ata_port_operations sata_fsl_ops = { .freeze = sata_fsl_freeze, .thaw = sata_fsl_thaw, - .error_handler = sata_fsl_error_handler, + .softreset = sata_fsl_softreset, .post_internal_cmd = sata_fsl_post_internal_cmd, .port_start = sata_fsl_port_start,
drivers/ata/sata_inic162x.c +3 -2
@@ -452,8 +452,7 @@ static void inic_error_handler(struct ata_port *ap)spin_unlock_irqrestore (ap->lock, flags);/* PIO and DMA engines have been stopped, perform recovery */ -ata_do_eh (ap, ata_std_prereset,NULL , inic_hardreset, - ata_std_postreset); +ata_std_error_handler (ap); }static void inic_post_internal_cmd (struct ata_queued_cmd *qc)
@@ -532,6 +531,8 @@ static struct ata_port_operations inic_port_ops = { .freeze = inic_freeze, .thaw = inic_thaw, + .softreset = ATA_OP_NULL, /* softreset is broken */ + .hardreset = inic_hardreset, .error_handler = inic_error_handler, .post_internal_cmd = inic_post_internal_cmd, .dev_config = inic_dev_config,
drivers/ata/sata_mv.c +8 -8
@@ -470,7 +470,10 @@ static void mv_port_stop(struct ata_port *ap);static void mv_qc_prep (struct ata_queued_cmd *qc);static void mv_qc_prep_iie (struct ata_queued_cmd *qc);static unsigned int mv_qc_issue (struct ata_queued_cmd *qc); -static void mv_error_handler (struct ata_port *ap); +static int mv_prereset (struct ata_link *link,unsigned long deadline); +static int mv_hardreset (struct ata_link *link,unsigned int *class, +unsigned long deadline); +static void mv_postreset (struct ata_link *link,unsigned int *classes);static void mv_eh_freeze (struct ata_port *ap);static void mv_eh_thaw (struct ata_port *ap);static void mv6_dev_config (struct ata_device *dev);
@@ -534,7 +537,10 @@ static struct ata_port_operations mv5_ops = { .freeze = mv_eh_freeze, .thaw = mv_eh_thaw, - .error_handler = mv_error_handler, + .prereset = mv_prereset, + .hardreset = mv_hardreset, + .postreset = mv_postreset, + .error_handler = ata_std_error_handler, /* avoid SFF EH */ .post_internal_cmd = ATA_OP_NULL, .scr_read = mv5_scr_read,
@@ -2415,12 +2421,6 @@ static void mv_postreset(struct ata_link *link, unsigned int *classes)iowrite8 (ap->ctl, ap->ioaddr.ctl_addr); } -static void mv_error_handler (struct ata_port *ap) -{ -ata_do_eh (ap, mv_prereset, ata_std_softreset, - mv_hardreset, mv_postreset); -} -static void mv_eh_freeze (struct ata_port *ap) {struct mv_host_priv *hpriv = ap->host->private_data;
drivers/ata/sata_nv.c +5 -12
@@ -309,7 +309,8 @@ static void nv_nf2_freeze(struct ata_port *ap);static void nv_nf2_thaw (struct ata_port *ap);static void nv_ck804_freeze (struct ata_port *ap);static void nv_ck804_thaw (struct ata_port *ap); -static void nv_error_handler (struct ata_port *ap); +static int nv_hardreset (struct ata_link *link,unsigned int *class, +unsigned long deadline);static int nv_adma_slave_config (struct scsi_device *sdev);static int nv_adma_check_atapi_dma (struct ata_queued_cmd *qc);static void nv_adma_qc_prep (struct ata_queued_cmd *qc);
@@ -406,7 +407,7 @@ static struct scsi_host_template nv_swncq_sht = {static struct ata_port_operations nv_generic_ops = { .inherits = &ata_bmdma_port_ops, - .error_handler = nv_error_handler, + .hardreset = nv_hardreset, .scr_read = nv_scr_read, .scr_write = nv_scr_write, };
@@ -1599,12 +1600,6 @@ static int nv_hardreset(struct ata_link *link, unsigned int *class,return sata_std_hardreset (link, &dummy, deadline); } -static void nv_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, ata_std_prereset, ata_std_softreset, - nv_hardreset, ata_std_postreset); -} -static void nv_adma_error_handler (struct ata_port *ap) {struct nv_adma_port_priv *pp = ap->private_data;
@@ -1658,8 +1653,7 @@ static void nv_adma_error_handler(struct ata_port *ap)readw (mmio +NV_ADMA_CTL );/* flush posted write */ } -ata_bmdma_drive_eh (ap, ata_std_prereset, ata_std_softreset, - nv_hardreset, ata_std_postreset); +ata_bmdma_error_handler (ap); }static void nv_swncq_qc_to_dq (struct ata_port *ap,struct ata_queued_cmd *qc)
@@ -1785,8 +1779,7 @@ static void nv_swncq_error_handler(struct ata_port *ap) ehc->i.action |=ATA_EH_RESET ; } -ata_bmdma_drive_eh (ap, ata_std_prereset, ata_std_softreset, - nv_hardreset, ata_std_postreset); +ata_bmdma_error_handler (ap); }#ifdef CONFIG_PM
drivers/ata/sata_promise.c +4 -18
@@ -146,8 +146,7 @@ static void pdc_irq_clear(struct ata_port *ap);static unsigned int pdc_qc_issue_prot (struct ata_queued_cmd *qc);static void pdc_freeze (struct ata_port *ap);static void pdc_thaw (struct ata_port *ap); -static void pdc_pata_error_handler (struct ata_port *ap); -static void pdc_sata_error_handler (struct ata_port *ap); +static void pdc_error_handler (struct ata_port *ap);static void pdc_post_internal_cmd (struct ata_queued_cmd *qc);static int pdc_pata_cable_detect (struct ata_port *ap);static int pdc_sata_cable_detect (struct ata_port *ap);
@@ -171,12 +170,12 @@ static const struct ata_port_operations pdc_common_ops = { .freeze = pdc_freeze, .thaw = pdc_thaw, .post_internal_cmd = pdc_post_internal_cmd, + .error_handler = pdc_error_handler, };static struct ata_port_operations pdc_sata_ops = { .inherits = &pdc_common_ops, .cable_detect = pdc_sata_cable_detect, - .error_handler = pdc_sata_error_handler, .scr_read = pdc_sata_scr_read, .scr_write = pdc_sata_scr_write, .port_start = pdc_sata_port_start,
@@ -191,7 +190,6 @@ static struct ata_port_operations pdc_old_sata_ops = {static struct ata_port_operations pdc_pata_ops = { .inherits = &pdc_common_ops, .cable_detect = pdc_pata_cable_detect, - .error_handler = pdc_pata_error_handler, .port_start = pdc_common_port_start, };
@@ -612,24 +610,12 @@ static void pdc_thaw(struct ata_port *ap)readl (mmio +PDC_CTLSTAT );/* flush */ } -static void pdc_common_error_handler (struct ata_port *ap,ata_reset_fn_t hardreset) +static void pdc_error_handler (struct ata_port *ap) {if (!(ap->pflags &ATA_PFLAG_FROZEN ))pdc_reset_port (ap); -/* perform recovery */ -ata_do_eh (ap, ata_std_prereset, ata_std_softreset, hardreset, - ata_std_postreset); -} - -static void pdc_pata_error_handler (struct ata_port *ap) -{ -pdc_common_error_handler (ap,NULL ); -} - -static void pdc_sata_error_handler (struct ata_port *ap) -{ -pdc_common_error_handler (ap, sata_std_hardreset); +ata_std_error_handler (ap); }static void pdc_post_internal_cmd (struct ata_queued_cmd *qc)
drivers/ata/sata_qstor.c +4 -2
@@ -123,6 +123,7 @@ static void qs_bmdma_stop(struct ata_queued_cmd *qc);static u8 qs_bmdma_status (struct ata_port *ap);static void qs_freeze (struct ata_port *ap);static void qs_thaw (struct ata_port *ap); +static int qs_prereset (struct ata_link *link,unsigned long deadline);static void qs_error_handler (struct ata_port *ap);static struct scsi_host_template qs_ata_sht = {
@@ -142,6 +143,8 @@ static struct ata_port_operations qs_ata_ops = { .freeze = qs_freeze, .thaw = qs_thaw, + .prereset = qs_prereset, + .softreset = ATA_OP_NULL, .error_handler = qs_error_handler, .post_internal_cmd = ATA_OP_NULL,
@@ -250,8 +253,7 @@ static int qs_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)static void qs_error_handler (struct ata_port *ap) {qs_enter_reg_mode (ap); -ata_do_eh (ap, qs_prereset,NULL , sata_std_hardreset, - ata_std_postreset); +ata_std_error_handler (ap); }static int qs_scr_write (struct ata_port *ap,unsigned int sc_reg,u32 val)
drivers/ata/sata_sil24.c +13 -5
@@ -352,6 +352,14 @@ static void sil24_pmp_attach(struct ata_port *ap);static void sil24_pmp_detach (struct ata_port *ap);static void sil24_freeze (struct ata_port *ap);static void sil24_thaw (struct ata_port *ap); +static int sil24_softreset (struct ata_link *link,unsigned int *class, +unsigned long deadline); +static int sil24_hardreset (struct ata_link *link,unsigned int *class, +unsigned long deadline); +static int sil24_pmp_softreset (struct ata_link *link,unsigned int *class, +unsigned long deadline); +static int sil24_pmp_hardreset (struct ata_link *link,unsigned int *class, +unsigned long deadline);static void sil24_error_handler (struct ata_port *ap);static void sil24_post_internal_cmd (struct ata_queued_cmd *qc);static int sil24_port_start (struct ata_port *ap);
@@ -402,6 +410,10 @@ static struct ata_port_operations sil24_ops = { .freeze = sil24_freeze, .thaw = sil24_thaw, + .softreset = sil24_softreset, + .hardreset = sil24_hardreset, + .pmp_softreset = sil24_pmp_softreset, + .pmp_hardreset = sil24_pmp_hardreset, .error_handler = sil24_error_handler, .post_internal_cmd = sil24_post_internal_cmd, .dev_config = sil24_dev_config,
@@ -1181,11 +1193,7 @@ static void sil24_error_handler(struct ata_port *ap)if (sil24_init_port (ap))ata_eh_freeze_port (ap); -/* perform recovery */ -sata_pmp_do_eh (ap, ata_std_prereset, sil24_softreset, sil24_hardreset, - ata_std_postreset, sata_pmp_std_prereset, - sil24_pmp_softreset, sil24_pmp_hardreset, - sata_pmp_std_postreset); +sata_pmp_error_handler (ap); pp->do_port_rst =0 ; }
drivers/ata/sata_via.c +2 -8
@@ -71,7 +71,7 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);static int svia_scr_read (struct ata_port *ap,unsigned int sc_reg,u32 *val);static int svia_scr_write (struct ata_port *ap,unsigned int sc_reg,u32 val);static void svia_noop_freeze (struct ata_port *ap); -static void vt6420_error_handler (struct ata_port *ap); +static int vt6420_prereset (struct ata_link *link,unsigned long deadline);static int vt6421_pata_cable_detect (struct ata_port *ap);static void vt6421_set_pio_mode (struct ata_port *ap,struct ata_device *adev);static void vt6421_set_dma_mode (struct ata_port *ap,struct ata_device *adev);
@@ -106,7 +106,7 @@ static struct scsi_host_template svia_sht = {static struct ata_port_operations vt6420_sata_ops = { .inherits = &ata_bmdma_port_ops, .freeze = svia_noop_freeze, - .error_handler = vt6420_error_handler, + .prereset = vt6420_prereset, };static struct ata_port_operations vt6421_pata_ops = {
@@ -247,12 +247,6 @@ static int vt6420_prereset(struct ata_link *link, unsigned long deadline)return 0 ; } -static void vt6420_error_handler (struct ata_port *ap) -{ -ata_bmdma_drive_eh (ap, vt6420_prereset, ata_std_softreset,NULL , - ata_std_postreset); -} -static int vt6421_pata_cable_detect (struct ata_port *ap) {struct pci_dev *pdev =to_pci_dev (ap->host->dev);
drivers/scsi/ipr.c +2 -1
@@ -3937,7 +3937,7 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd)if (ipr_is_gata (res) && res->sata_port) { ap = res->sata_port->ap;spin_unlock_irq (scsi_cmd->device->host->host_lock); -ata_do_eh (ap,NULL ,NULL , ipr_sata_reset,NULL ); +ata_std_error_handler (ap);spin_lock_irq (scsi_cmd->device->host->host_lock);list_for_each_entry (ipr_cmd, &ioa_cfg->pending_q, queue) {
@@ -5275,6 +5275,7 @@ static struct ata_port_operations ipr_sata_ops = { .check_altstatus = ipr_ata_check_altstatus, .dev_select = ata_noop_dev_select, .phy_reset = ipr_ata_phy_reset, + .hardreset = ipr_sata_reset, .post_internal_cmd = ipr_ata_post_internal, .tf_read = ipr_tf_read, .qc_prep = ata_noop_qc_prep,
include/linux/libata.h +10 -9
@@ -691,6 +691,14 @@ struct ata_port_operations {void (*freeze)(struct ata_port *ap);void (*thaw)(struct ata_port *ap); +ata_prereset_fn_t prereset; +ata_reset_fn_t softreset; +ata_reset_fn_t hardreset; +ata_postreset_fn_t postreset; +ata_prereset_fn_t pmp_prereset; +ata_reset_fn_t pmp_softreset; +ata_reset_fn_t pmp_hardreset; +ata_postreset_fn_t pmp_postreset;void (*error_handler)(struct ata_port *ap);void (*post_internal_cmd)(struct ata_queued_cmd *qc);
@@ -906,10 +914,6 @@ extern void ata_bmdma_irq_clear(struct ata_port *ap);extern void ata_noop_irq_clear (struct ata_port *ap);extern void ata_bmdma_freeze (struct ata_port *ap);extern void ata_bmdma_thaw (struct ata_port *ap); -extern void ata_bmdma_drive_eh (struct ata_port *ap,ata_prereset_fn_t prereset, -ata_reset_fn_t softreset, -ata_reset_fn_t hardreset, -ata_postreset_fn_t postreset);extern void ata_bmdma_error_handler (struct ata_port *ap);extern void ata_bmdma_post_internal_cmd (struct ata_queued_cmd *qc); extern int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc,
@@ -1053,11 +1057,7 @@ extern int sata_pmp_std_prereset(struct ata_link *link, unsigned long deadline);extern int sata_pmp_std_hardreset (struct ata_link *link,unsigned int *class,unsigned long deadline);extern void sata_pmp_std_postreset (struct ata_link *link,unsigned int *class); -extern void sata_pmp_do_eh (struct ata_port *ap, -ata_prereset_fn_t prereset,ata_reset_fn_t softreset, -ata_reset_fn_t hardreset,ata_postreset_fn_t postreset, -ata_prereset_fn_t pmp_prereset,ata_reset_fn_t pmp_softreset, -ata_reset_fn_t pmp_hardreset,ata_postreset_fn_t pmp_postreset); +extern void sata_pmp_error_handler (struct ata_port *ap);/* * EH
@@ -1077,6 +1077,7 @@ extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);extern void ata_do_eh (struct ata_port *ap,ata_prereset_fn_t prereset,ata_reset_fn_t softreset,ata_reset_fn_t hardreset,ata_postreset_fn_t postreset); +extern void ata_std_error_handler (struct ata_port *ap);/* * Base operations to inherit from and initializers for sht
Signature · 1 line
1.5.2.4
Quoted 5 lines · Tejun Heo
Hello, all.
This is the third take of cleanup-sht-ops patchset. As the name suggests it reorganizes and cleans up
scsi_host_templateandata_port_operationtables used by libata core and low level drivers.
..
I have a ton of sata_mv updates "in process" at the moment, and it would be *really* good to sort out this core infrastructure stuff before I generate upstream patches for it all -- to avoid one or both of us from unnecessary rework.
So.. can we get this stuff upstream soon-ish, so that I can generate my own patches on top of it?
Thanks
devres-implement-pcim_iomap_regions_request_all was missing changes from include/linux/pci.h. Updated patch posted and git trees updated accordingly.
Thanks.
Signature · 1 line
tejun
Quoted 40 lines · Tejun Heo
Hello, all.
This is the third take of cleanup-sht-ops patchset. As the name suggests it reorganizes and cleans up
scsi_host_templateandata_port_operationtables used by libata core and low level drivers.Please read the head message of the first take[F] for more info. Changes from the last take[L] are...
* Updated to fit the current upstream-fixes.
*
pata_sccthaw change applied.*
pata_rb500_cfnewly converted.* Updated to accomodate drivers w/o any reset method available.
The following drivers need specific platform to build, so they need verification. If you work on one of the following drivers, please verify that the driver builds and works fine. It would be best if you can verify that the sht and ops don't change by the fifth and sixth patches using the method I'll write in another message.
*
pata_at32
*pata_bf54x
*pata_icside
*pata_ixp4xx_cf
*pata_mpc52xx
*pata_scc
*sata_fsl
*pata_rb500_cfThis patchset is on top of
upstream-fixes (
3db691daa4f6c4b899e144ea54a65738402c94e3)
+ [1] prefer-hardreset patchset, take#3 (the subject line is wrong)
+ [2] devres-implement-pcim_iomap_regions_request_all
+ [3] ahci-request-all-PCI-BARs
+ [4] libata-PCI-device-should-be-powered-up-before-being-accessed
Quoted 8 lines
This patchset is available as GIT branch.
http://git.kernel.org/?p=linux/kernel/git/tj/libata-dev.git;a=shortlog;h=cleanup-sht-ops
git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata-dev.gitcleanup-sht-opsThe verification method is the same as before[B].
Thanks.
ACK patchset; based on recent comments I will await one final resend -- or simply do a 'git pull'?
Quoted 48 lines · Jeff Garzik
Quoted 47 lines · Tejun Heo
Hello, all.
This is the third take of cleanup-sht-ops patchset. As the name suggests it reorganizes and cleans up
scsi_host_templateandata_port_operationtables used by libata core and low level drivers.Please read the head message of the first take[F] for more info. Changes from the last take[L] are...
* Updated to fit the current upstream-fixes.
*
pata_sccthaw change applied.*
pata_rb500_cfnewly converted.* Updated to accomodate drivers w/o any reset method available.
The following drivers need specific platform to build, so they need verification. If you work on one of the following drivers, please verify that the driver builds and works fine. It would be best if you can verify that the sht and ops don't change by the fifth and sixth patches using the method I'll write in another message.
*
pata_at32
*pata_bf54x
*pata_icside
*pata_ixp4xx_cf
*pata_mpc52xx
*pata_scc
*sata_fsl
*pata_rb500_cfThis patchset is on top of
upstream-fixes (
3db691daa4f6c4b899e144ea54a65738402c94e3)
+ [1] prefer-hardreset patchset, take#3 (the subject line is wrong)
+ [2] devres-implement-pcim_iomap_regions_request_all
+ [3] ahci-request-all-PCI-BARs
+ [4] libata-PCI-device-should-be-powered-up-before-being-accessedThis patchset is available as GIT branch.
http://git.kernel.org/?p=linux/kernel/git/tj/libata-dev.git;a=shortlog;h=cleanup-sht-ops
git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata-dev.git
cleanup-sht-ops
Quoted 7 lines
Quoted 3 lines
The verification method is the same as before[B].
Thanks.
ACK patchset; based on recent comments I will await one final resend -- or simply do a 'git pull'?
Okay, branches updated. Please pull. There are only two changes.
* "sata_promise: hardreset is broken" patch added before prefer-hardreset patchset. It just passes NULL for hardreset method. This later gets translated into ops->hardreset = ATA_OP_NULL while making reset methods ops.
* pmp ops moved to sata_pmp_port_ops from sata_port_ops as they should be.
I'll post the sata_promise-hardreset-is-broken patch as reply to this message and the following is the difference between end results of the previous and updated patchset.
drivers/ata/libata-core.c +4 -4
@@ -87,10 +87,6 @@ const struct ata_port_operations sata_port_ops = { .qc_defer = ata_std_qc_defer, .dev_select = ata_noop_dev_select, -}; - -const struct ata_port_operations sata_pmp_port_ops = { - .inherits = &sata_port_ops, .pmp_prereset = sata_pmp_std_prereset, .pmp_hardreset = sata_pmp_std_hardreset,
@@ -98,6 +94,10 @@ const struct ata_port_operations sata_pmp_port_ops = { .error_handler = sata_pmp_error_handler, }; +const struct ata_port_operations sata_pmp_port_ops = { + .inherits = &sata_port_ops, +}; +const struct ata_port_operations ata_sff_port_ops = { .inherits = &ata_base_port_ops,
drivers/ata/sata_promise.c +0 -4
@@ -176,10 +176,6 @@ static const struct ata_port_operations pdc_common_ops = {static struct ata_port_operations pdc_sata_ops = { .inherits = &pdc_common_ops, .cable_detect = pdc_sata_cable_detect, -/* FIXME: hardreset is currently broken and causes hotplug -* event loop. Remove ATA_OP_NULL once hardreset is fixed. -*/ - .hardreset =ATA_OP_NULL , .scr_read = pdc_sata_scr_read, .scr_write = pdc_sata_scr_write, .port_start = pdc_sata_port_start,
Signature · 1 line
tejun
PATCH 1/1 sata_promise: hardreset is broken
PHY events aren't plugged properly over hardresets and cause PHY event loop mkaing hardreset repeat itself. Don't use hardreset for now.
Signed-off-by Tejun Heo <[email protected]>
--- drivers/ata/sata_promise.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/ata/sata_promise.c +5 -1
@@ -675,7 +675,11 @@ static void pdc_pata_error_handler(struct ata_port *ap)static void pdc_sata_error_handler (struct ata_port *ap) { -pdc_common_error_handler (ap, sata_std_hardreset); +/* FIXME: hardreset is currently broken and causes hotplug +* event loop. sata_std_hardreset can be used for @hardreset +* once the problem is fixed. +*/ +pdc_common_error_handler (ap,NULL ); }static void pdc_post_internal_cmd (struct ata_queued_cmd *qc)
Signature · 1 line
1.5.2.4