libata fixes and checkpatch cleanups
PATCH 1/1 libata fixes and checkpatch cleanups
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
drivers/ata/ahci.c | 26 +++--- drivers/ata/ata_piix.c | 29 +++--- drivers/ata/libata-acpi.c | 16 ++-- drivers/ata/libata-core.c | 69 +++++++------ drivers/ata/libata-eh.c | 14 ++-- drivers/ata/libata-scsi.c | 240 ++++++++++++++++++++++---------------------- drivers/ata/libata-sff.c | 2 +- drivers/ata/pata_ns87415.c | 10 +- drivers/ata/sata_mv.c | 23 ++-- drivers/ata/sata_nv.c | 68 ++++++------- drivers/ata/sata_sx4.c | 4 +- drivers/pci/quirks.c | 2 +- include/linux/ata.h | 6 +- include/linux/libata.h | 22 ++-- 14 files changed, 265 insertions(+), 266 deletions(-)
Alan Cox (1):
libata-core: auditting chk_status v check_status
Jeff Garzik (1):
[libata] checkpatch-inspired cleanups
Tejun Heo (2):
libata: add HTS542525K9SA00 to NCQ blacklist
jmicron: update quirk for JMB361/3/5/6
drivers/ata/ahci.c +13 -13
@@ -227,7 +227,7 @@ struct ahci_port_priv {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 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);
@@ -729,7 +729,7 @@ static int ahci_stop_engine(struct ata_port *ap)/* wait for engine to stop. This could be as long as 500 msec */ tmp =ata_wait_register (port_mmio +PORT_CMD , -PORT_CMD_LIST_ON ,PORT_CMD_LIST_ON ,1 ,500 ); +PORT_CMD_LIST_ON ,PORT_CMD_LIST_ON ,1 ,500 );if (tmp &PORT_CMD_LIST_ON )return -EIO ;
@@ -1564,9 +1564,9 @@ static irqreturn_t ahci_interrupt(int irq, void *dev_instance)if (!irq_stat)return IRQ_NONE ; -spin_lock (&host->lock); +spin_lock (&host->lock); -for (i =0 ; i < host->n_ports; i++) { +for (i =0 ; i < host->n_ports; i++) {struct ata_port *ap;if (!(irq_stat & (1 << i)))
@@ -1829,9 +1829,9 @@ static int ahci_port_start(struct ata_port *ap) pp->cmd_tbl_dma = mem_dma;/* -* Save off initial list of interrupts to be enabled. -* This could be changed later -*/ +* Save off initial list of interrupts to be enabled. +* This could be changed later +*/ pp->intr_mask =DEF_PORT_IRQ ; ap->private_data = pp;
@@ -1918,12 +1918,12 @@ static void ahci_print_info(struct ata_host *host) dev_printk(KERN_INFO, &pdev->dev, "AHCI %02x%02x.%02x%02x " "%u slots %u ports %s Gbps 0x%x impl %s mode\n" - , + , - (vers >> 24) & 0xff, - (vers >> 16) & 0xff, - (vers >> 8) & 0xff, - vers & 0xff, + (vers >> 24) & 0xff, + (vers >> 16) & 0xff, + (vers >> 8) & 0xff, + vers & 0xff, ((cap >> 8) & 0x1f) + 1, (cap & 0x1f) + 1,
@@ -1935,7 +1935,7 @@ static void ahci_print_info(struct ata_host *host)"flags: " "%s%s%s%s%s%s%s" "%s%s%s%s%s%s%s\n" - , + , cap & (1 <<31 ) ?"64bit " :"" , cap & (1 << 30) ? "ncq " : "",
drivers/ata/ata_piix.c +14 -15
@@ -157,12 +157,12 @@ struct piix_host_priv {const int *map; }; -static int piix_init_one (struct pci_dev *pdev, -const struct pci_device_id *ent); +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 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 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);#ifdef CONFIG_PM static int piix_pci_device_suspend (struct pci_dev *pdev,pm_message_t mesg);
@@ -650,9 +650,9 @@ static int ich_pata_cable_detect(struct ata_port *ap)while (lap->device) {if (lap->device == pdev->device && lap->subvendor == pdev->subsystem_vendor && - lap->subdevice == pdev->subsystem_device) { + lap->subdevice == pdev->subsystem_device)return ATA_CBL_PATA40_SHORT ; - } + lap++; }
@@ -699,7 +699,7 @@ static void piix_pata_error_handler(struct ata_port *ap)* None (inherited from caller). */ -static void piix_set_piomode (struct ata_port *ap,struct ata_device *adev) +static void piix_set_piomode (struct ata_port *ap,struct ata_device *adev) {unsigned int pio = adev->pio_mode -XFER_PIO_0 ;struct pci_dev *dev =to_pci_dev (ap->host->dev);
@@ -786,7 +786,7 @@ static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev)* None (inherited from caller). */ -static void do_pata_set_dmamode (struct ata_port *ap,struct ata_device *adev,int isich) +static void do_pata_set_dmamode (struct ata_port *ap,struct ata_device *adev,int isich) {struct pci_dev *dev =to_pci_dev (ap->host->dev);u8 master_port = ap->port_no ?0x42 :0x40 ;
@@ -813,7 +813,7 @@ static void do_pata_set_dmamode (struct ata_port *ap, struct ata_device *adev, iint u_clock, u_speed;/* -* UDMA is handled by a combination of clock switching and +* UDMA is handled by a combination of clock switching and * selection of dividers * * Handy rule: Odd modes are UDMATIMx 01, even are 02
@@ -905,7 +905,7 @@ static void do_pata_set_dmamode (struct ata_port *ap, struct ata_device *adev, i* None (inherited from caller). */ -static void piix_set_dmamode (struct ata_port *ap,struct ata_device *adev) +static void piix_set_dmamode (struct ata_port *ap,struct ata_device *adev) {do_pata_set_dmamode (ap, adev,0 ); }
@@ -921,7 +921,7 @@ static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev)* None (inherited from caller). */ -static void ich_set_dmamode (struct ata_port *ap,struct ata_device *adev) +static void ich_set_dmamode (struct ata_port *ap,struct ata_device *adev) {do_pata_set_dmamode (ap, adev,1 ); }
@@ -1106,8 +1106,7 @@ static int __devinit piix_check_450nx_errata(struct pci_dev *ata_dev)u16 cfg;int no_piix_dma =0 ; -while ((pdev =pci_get_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82454NX , pdev)) !=NULL ) - { +while ((pdev =pci_get_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82454NX , pdev)) !=NULL ) {/* Look for 450NX PXB. Check for problem configurations A PCI quirk checks bit 6 already */ pci_read_config_word (pdev,0x41 , &cfg);
@@ -1241,7 +1240,7 @@ static void piix_iocfg_bit18_quirk(struct pci_dev *pdev)* Zero on success, or -ERRNO value. */ -static int piix_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) +static int piix_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {static int printed_version;struct device *dev = &pdev->dev;
drivers/ata/libata-acpi.c +8 -8
@@ -26,7 +26,7 @@#include <acpi/actypes.h> #define NO_PORT_MULT 0xffff -#define SATA_ADR (root,pmp) (((root) << 16) | (pmp)) +#define SATA_ADR (root, pmp) (((root) << 16) | (pmp))#define REGS_PER_GTF 7struct ata_acpi_gtf {
@@ -96,8 +96,8 @@ static void ata_acpi_associate_ide_port(struct ata_port *ap) } } -static void ata_acpi_handle_hotplug (struct ata_port *ap,struct kobject *kobj, -u32 event) +static void ata_acpi_handle_hotplug (struct ata_port *ap,struct kobject *kobj, +u32 event) {char event_string[12 ];char *envp[] = { event_string,NULL };
@@ -114,7 +114,7 @@ static void ata_acpi_handle_hotplug (struct ata_port *ap, struct kobject *kobj, }if (kobj) { -sprintf (event_string,"BAY_EVENT=%d" , event); +sprintf (event_string,"BAY_EVENT=%d" , event);kobject_uevent_env (kobj,KOBJ_CHANGE , envp); } }
@@ -127,14 +127,14 @@ static void ata_acpi_dev_notify(acpi_handle handle, u32 event, void *data)if (dev->sdev) kobj = &dev->sdev->sdev_gendev.kobj; -ata_acpi_handle_hotplug (dev->link->ap, kobj, event); +ata_acpi_handle_hotplug (dev->link->ap, kobj, event); }static void ata_acpi_ap_notify (acpi_handle handle,u32 event,void *data) {struct ata_port *ap = data; -ata_acpi_handle_hotplug (ap, &ap->dev->kobj, event); +ata_acpi_handle_hotplug (ap, &ap->dev->kobj, event); }/**
@@ -398,11 +398,11 @@ int ata_acpi_cbl_80wire(struct ata_port *ap) {struct ata_acpi_gtm gtm;int valid =0 ; - +/* No _GTM data, no information */ if (ata_acpi_gtm (ap, >m) <0 )return 0 ; - +/* Split timing, DMA enabled */ if ((gtm.flags &0x11 ) ==0x11 && gtm.drive[0 ].dma <55 ) valid |=1 ;
drivers/ata/libata-core.c +36 -33
232 lines not on this page · raw message
drivers/ata/libata-eh.c +7 -7
@@ -1197,7 +1197,7 @@ void ata_eh_done(struct ata_link *link, struct ata_device *dev,* RETURNS: * Descriptive string for @err_mask */ -static const char *ata_err_string (unsigned int err_mask) +static const char *ata_err_string (unsigned int err_mask) {if (err_mask &AC_ERR_HOST_BUS )return "host bus error" ;
@@ -1934,7 +1934,7 @@ static void ata_eh_link_report(struct ata_link *link) ehc->i.serror &SERR_LINK_SEQ_ERR ?"LinkSeq " :"" , ehc->i.serror &SERR_TRANS_ST_ERROR ?"TrStaTrns " :"" , ehc->i.serror &SERR_UNRECOG_FIS ?"UnrecFIS " :"" , - ehc->i.serror & SERR_DEV_XCHG ? "DevExch " : "" ); + ehc->i.serror & SERR_DEV_XCHG ? "DevExch " : "");for (tag =0 ; tag <ATA_MAX_QUEUE ; tag++) { static const char *dma_str[] = {
@@ -1969,17 +1969,17 @@ static void ata_eh_link_report(struct ata_link *link) qc->err_mask & AC_ERR_NCQ ? " <F>" : "");if (res->command & (ATA_BUSY |ATA_DRDY |ATA_DF |ATA_DRQ | -ATA_ERR ) ) { +ATA_ERR )) {if (res->command &ATA_BUSY )ata_dev_printk (qc->dev,KERN_ERR , -"status: { Busy }\n" ); +"status: { Busy }\n" );else ata_dev_printk (qc->dev,KERN_ERR ,"status: { %s%s%s%s}\n" , res->command &ATA_DRDY ?"DRDY " :"" , res->command &ATA_DF ?"DF " :"" , res->command &ATA_DRQ ?"DRQ " :"" , - res->command &ATA_ERR ?"ERR " :"" ); + res->command &ATA_ERR ?"ERR " :"" ); } if (cmd->command != ATA_CMD_PACKET &&
@@ -1990,7 +1990,7 @@ static void ata_eh_link_report(struct ata_link *link) res->feature &ATA_ICRC ?"ICRC " :"" , res->feature &ATA_UNC ?"UNC " :"" , res->feature &ATA_IDNF ?"IDNF " :"" , - res->feature & ATA_ABORTED ? "ABRT " : "" ); + res->feature & ATA_ABORTED ? "ABRT " : ""); } }
@@ -2611,7 +2611,7 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, ehc->i.flags =0 ;continue ; - dev_fail: +dev_fail: nr_failed_devs++;if (ata_eh_handle_dev_fail (dev, rc)) nr_disabled_devs++;
drivers/ata/libata-scsi.c +120 -120
355 lines not on this page · raw message
drivers/ata/libata-sff.c +1 -1
@@ -248,7 +248,7 @@ void ata_bmdma_setup(struct ata_queued_cmd *qc)* LOCKING: * spin_lock_irqsave(host lock) */ -void ata_bmdma_start (struct ata_queued_cmd *qc) +void ata_bmdma_start (struct ata_queued_cmd *qc) {struct ata_port *ap = qc->ap;u8 dmactl;
drivers/ata/pata_ns87415.c +5 -5
@@ -17,7 +17,7 @@* TODO: * Test PARISC SuperIO * Get someone to test on SPARC -* Implement lazy pio/dma switching for better performance +* Implement lazy pio/dma switching for better performance * 8bit shared timing. * See if we need to kill the FIFO for ATAPI */
@@ -60,10 +60,10 @@ static void ns87415_set_mode(struct ata_port *ap, struct ata_device *adev, u8 mou16 clocking;u8 iordy;u8 status; - +/* Timing register format is 17 - low nybble read timing with the high nybble being 16 - x for recovery time in PCI clocks */ - +ata_timing_compute (adev, adev->pio_mode, &t,T ,0 ); clocking =17 -FIT (t.active,2 ,17 );
@@ -71,7 +71,7 @@ static void ns87415_set_mode(struct ata_port *ap, struct ata_device *adev, u8 mo/* Use the same timing for read and write bytes */ clocking |= (clocking <<8 );pci_write_config_word (dev, timing, clocking); - +/* Set the IORDY enable versus DMA enable on or off properly */ pci_read_config_byte (dev,0x42 , &iordy); iordy &= ~(1 << (4 + unit));
@@ -185,7 +185,7 @@ static void ns87415_bmdma_irq_clear(struct ata_port *ap)if (!mmio)return ; -iowrite8 ((ioread8 (mmio +ATA_DMA_CMD ) |ATA_DMA_INTR |ATA_DMA_ERR ), +iowrite8 ((ioread8 (mmio +ATA_DMA_CMD ) |ATA_DMA_INTR |ATA_DMA_ERR ), mmio +ATA_DMA_CMD ); }
drivers/ata/sata_mv.c +11 -12
@@ -845,7 +845,7 @@ static int __mv_stop_dma(struct ata_port *ap) pp->pp_flags &= ~MV_PP_FLAG_EDMA_EN ; }else {WARN_ON (EDMA_EN &readl (port_mmio +EDMA_CMD_OFS )); - } + }/* now properly wait for the eDMA to stop */ for (i =1000 ; i >0 ; i--) {
@@ -883,7 +883,7 @@ static void mv_dump_mem(void __iomem *start, unsigned bytes)for (b =0 ; b < bytes; ) {DPRINTK ("%p: " , start + b);for (w =0 ; b < bytes && w <4 ; w++) { -printk ("%08x " ,readl (start + b)); +printk ("%08x " ,readl (start + b)); b +=sizeof (u32); }printk ("\n" );
@@ -899,8 +899,8 @@ static void mv_dump_pci_cfg(struct pci_dev *pdev, unsigned bytes)for (b =0 ; b < bytes; ) {DPRINTK ("%02x: " , b);for (w =0 ; b < bytes && w <4 ; w++) { - (void )pci_read_config_dword (pdev,b,&dw); -printk ("%08x " ,dw); + (void )pci_read_config_dword (pdev, b, &dw); +printk ("%08x " , dw); b +=sizeof (u32); }printk ("\n" );
@@ -944,9 +944,9 @@ static void mv_dump_all_regs(void __iomem *mmio_base, int port, }for (p = start_port; p < start_port + num_ports; p++) { port_base =mv_port_base (mmio_base, p); -DPRINTK ("EDMA regs (port %i):\n" ,p); +DPRINTK ("EDMA regs (port %i):\n" , p);mv_dump_mem (port_base,0x54 ); -DPRINTK ("SATA regs (port %i):\n" ,p); +DPRINTK ("SATA regs (port %i):\n" , p);mv_dump_mem (port_base+0x300 ,0x60 ); }#endif
@@ -1184,7 +1184,7 @@ static void mv_qc_prep(struct ata_queued_cmd *qc)u16 flags =0 ;unsigned in_index; -if (qc->tf.protocol !=ATA_PROT_DMA ) +if (qc->tf.protocol !=ATA_PROT_DMA )return ;/* Fill in command request block
@@ -1276,7 +1276,7 @@ static void mv_qc_prep_iie(struct ata_queued_cmd *qc)unsigned in_index;u32 flags =0 ; -if (qc->tf.protocol !=ATA_PROT_DMA ) +if (qc->tf.protocol !=ATA_PROT_DMA )return ;/* Fill in Gen IIE command request block
@@ -1606,7 +1606,7 @@ static void mv_host_intr(struct ata_host *host, u32 relevant, unsigned int hc)writelfl (~hc_irq_cause, hc_mmio +HC_IRQ_CAUSE_OFS );VPRINTK ("ENTER, hc%u relevant=0x%08x HC IRQ cause=0x%08x\n" , - hc,relevant,hc_irq_cause); + hc, relevant, hc_irq_cause);for (port = port0; port < port0 +MV_PORTS_PER_HC ; port++) {struct ata_port *ap = host->ports[port];
@@ -1983,9 +1983,8 @@ static int mv6_reset_hc(struct mv_host_priv *hpriv, void __iomem *mmio,for (i =0 ; i <1000 ; i++) {udelay (1 ); t =readl (reg); -if (PCI_MASTER_EMPTY & t) { +if (PCI_MASTER_EMPTY & t)break ; - } }if (!(PCI_MASTER_EMPTY & t)) { printk(KERN_ERR DRV_NAME ": PCI master won't flush\n");
@@ -2668,7 +2667,7 @@ static void mv_print_info(struct ata_host *host)*/ static int mv_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version =0 ; +static int printed_version;unsigned int board_idx = (unsigned int )ent->driver_data;const struct ata_port_info *ppi[] = { &mv_port_info[board_idx],NULL };struct ata_host *host;
drivers/ata/sata_nv.c +33 -35
223 lines not on this page · raw message
drivers/ata/sata_sx4.c +2 -2
@@ -62,13 +62,13 @@ submit ATA packet to hardware hardware executes ATA WRITE command, w/ data in DIMM hardware raises interrupt - + and each READ looks like this: submit ATA packet to hardware hardware executes ATA READ command, w/ data in DIMM hardware raises interrupt - + submit HDMA packet to hardware hardware copies data from DIMM to system memory hardware raises interrupt
drivers/pci/quirks.c +1 -1
@@ -1230,7 +1230,7 @@ static void quirk_jmicron_ata(struct pci_dev *pdev)case PCI_DEVICE_ID_JMICRON_JMB363 :/* Enable dual function mode, AHCI on fn 0, IDE fn1 */ /* Set the class codes correctly and then direct IDE 0 */ - conf1 |=0x00C2A102 ;/* Set 1, 8, 13, 15, 17, 22, 23 */ + conf1 |=0x00C2A1B3 ;/* Set 0, 1, 4, 5, 7, 8, 13, 15, 17, 22, 23 */ break ;case PCI_DEVICE_ID_JMICRON_JMB368 :
include/linux/ata.h +3 -3
@@ -178,8 +178,8 @@ enum {ATA_CMD_PACKET =0xA0 ,ATA_CMD_VERIFY =0x40 ,ATA_CMD_VERIFY_EXT =0x42 , -ATA_CMD_STANDBYNOW1 =0xE0 , -ATA_CMD_IDLEIMMEDIATE =0xE1 , +ATA_CMD_STANDBYNOW1 =0xE0 , +ATA_CMD_IDLEIMMEDIATE =0xE1 ,ATA_CMD_INIT_DEV_PARAMS =0x91 ,ATA_CMD_READ_NATIVE_MAX =0xF8 , ATA_CMD_READ_NATIVE_MAX_EXT = 0x27,
@@ -458,7 +458,7 @@ static inline int ata_id_wcache_enabled(const u16 *id)* ATA-3 introduces word 80 and accurate reporting * * The practical impact of this is that ata_id_major_version cannot -* reliably report on drives below ATA3. +* reliably report on drives below ATA3. */ static inline unsigned int ata_id_major_version (const u16 *id)
include/linux/libata.h +11 -11
@@ -326,7 +326,7 @@ enum {ATA_HORKAGE_SKIP_PM = (1 <<5 ),/* Skip PM operations */ ATA_HORKAGE_HPA_SIZE = (1 <<6 ),/* native size off by one */ -/* DMA mask for user DMA control: User visible values; DO NOT +/* DMA mask for user DMA control: User visible values; DO NOT renumber */ ATA_DMA_MASK_ATA = (1 <<0 ),/* DMA on ATA Disk */ ATA_DMA_MASK_ATAPI = (1 << 1), /* DMA on ATAPI */
@@ -717,7 +717,7 @@ struct ata_timing {unsigned short udma;/* t2CYCTYP/2 */ }; -#define FIT (v,vmin,vmax) max_t(short,min_t(short,v,vmax),vmin) +#define FIT (v, vmin, vmax) max_t(short, min_t(short, v, vmax), vmin)extern const unsigned long sata_deb_timing_normal[];extern const unsigned long sata_deb_timing_hotplug[];
@@ -816,14 +816,14 @@ extern void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf);extern void ata_tf_to_fis (const struct ata_taskfile *tf,u8 pmp,int is_cmd,u8 *fis);extern void ata_tf_from_fis (const u8 *fis,struct ata_taskfile *tf); -extern void ata_noop_dev_select (struct ata_port *ap,unsigned int device); -extern void ata_std_dev_select (struct ata_port *ap,unsigned int device); +extern void ata_noop_dev_select (struct ata_port *ap,unsigned int device); +extern void ata_std_dev_select (struct ata_port *ap,unsigned int device);extern u8 ata_check_status (struct ata_port *ap);extern u8 ata_altstatus (struct ata_port *ap);extern void ata_exec_command (struct ata_port *ap,const struct ata_taskfile *tf); -extern int ata_port_start (struct ata_port *ap); -extern int ata_sff_port_start (struct ata_port *ap); -extern irqreturn_t ata_interrupt (int irq,void *dev_instance); +extern int ata_port_start (struct ata_port *ap); +extern int ata_sff_port_start (struct ata_port *ap); +extern irqreturn_t ata_interrupt (int irq,void *dev_instance);extern void ata_data_xfer (struct ata_device *adev,unsigned char *buf,unsigned int buflen,int write_data); extern void ata_data_xfer_noirq(struct ata_device *adev, unsigned char *buf,
@@ -844,8 +844,8 @@ extern void ata_id_string(const u16 *id, unsigned char *s,extern void ata_id_c_string (const u16 *id,unsigned char *s,unsigned int ofs,unsigned int len);extern void ata_id_to_dma_mode (struct ata_device *dev,u8 unknown); -extern void ata_bmdma_setup (struct ata_queued_cmd *qc); -extern void ata_bmdma_start (struct ata_queued_cmd *qc); +extern void ata_bmdma_setup (struct ata_queued_cmd *qc); +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);
@@ -920,9 +920,9 @@ static inline int ata_acpi_cbl_80wire(struct ata_port *ap) { return 0; }#ifdef CONFIG_PCI struct pci_dev ; -extern int ata_pci_init_one (struct pci_dev *pdev, +extern int ata_pci_init_one (struct pci_dev *pdev,const struct ata_port_info *const * ppi); -extern void ata_pci_remove_one (struct pci_dev *pdev); +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);extern int __must_check ata_pci_device_do_resume (struct pci_dev *pdev);