Commit ddac3ee3 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://gkernel.bkbits.net/libata-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents ef552a86 e808a63c
...@@ -64,12 +64,16 @@ ...@@ -64,12 +64,16 @@
<chapter id="libataExt"> <chapter id="libataExt">
<title>libata Library</title> <title>libata Library</title>
!Edrivers/scsi/libata-core.c !Edrivers/scsi/libata-core.c
!Edrivers/scsi/libata-scsi.c
</chapter> </chapter>
<chapter id="libataInt"> <chapter id="libataInt">
<title>libata Internals</title> <title>libata Core Internals</title>
!Idrivers/scsi/libata-core.c !Idrivers/scsi/libata-core.c
</chapter>
<chapter id="libataScsiInt">
<title>libata SCSI translation/emulation</title>
!Edrivers/scsi/libata-scsi.c
!Idrivers/scsi/libata-scsi.c !Idrivers/scsi/libata-scsi.c
</chapter> </chapter>
...@@ -83,9 +87,4 @@ ...@@ -83,9 +87,4 @@
!Idrivers/scsi/sata_sil.c !Idrivers/scsi/sata_sil.c
</chapter> </chapter>
<chapter id="VIAInt">
<title>ata_via Internals</title>
!Idrivers/scsi/sata_via.c
</chapter>
</book> </book>
...@@ -272,7 +272,7 @@ static void piix_pata_phy_reset(struct ata_port *ap) ...@@ -272,7 +272,7 @@ static void piix_pata_phy_reset(struct ata_port *ap)
/** /**
* piix_sata_probe - Probe PCI device for present SATA devices * piix_sata_probe - Probe PCI device for present SATA devices
* @pdev: PCI device to probe * @ap: Port associated with the PCI device we wish to probe
* *
* Reads SATA PCI device's PCI config register Port Configuration * Reads SATA PCI device's PCI config register Port Configuration
* and Status (PCS) to determine port and device availability. * and Status (PCS) to determine port and device availability.
......
...@@ -98,7 +98,7 @@ static const char *ata_thr_state_name(unsigned int thr_state) ...@@ -98,7 +98,7 @@ static const char *ata_thr_state_name(unsigned int thr_state)
/** /**
* ata_tf_load_pio - send taskfile registers to host controller * ata_tf_load_pio - send taskfile registers to host controller
* @ioaddr: set of IO ports to which output is sent * @ap: Port to which output is sent
* @tf: ATA taskfile register set * @tf: ATA taskfile register set
* *
* Outputs ATA taskfile to standard ATA host controller using PIO. * Outputs ATA taskfile to standard ATA host controller using PIO.
...@@ -156,7 +156,7 @@ void ata_tf_load_pio(struct ata_port *ap, struct ata_taskfile *tf) ...@@ -156,7 +156,7 @@ void ata_tf_load_pio(struct ata_port *ap, struct ata_taskfile *tf)
/** /**
* ata_tf_load_mmio - send taskfile registers to host controller * ata_tf_load_mmio - send taskfile registers to host controller
* @ioaddr: set of IO ports to which output is sent * @ap: Port to which output is sent
* @tf: ATA taskfile register set * @tf: ATA taskfile register set
* *
* Outputs ATA taskfile to standard ATA host controller using MMIO. * Outputs ATA taskfile to standard ATA host controller using MMIO.
...@@ -316,7 +316,7 @@ void ata_tf_to_host_nolock(struct ata_port *ap, struct ata_taskfile *tf) ...@@ -316,7 +316,7 @@ void ata_tf_to_host_nolock(struct ata_port *ap, struct ata_taskfile *tf)
/** /**
* ata_tf_read_pio - input device's ATA taskfile shadow registers * ata_tf_read_pio - input device's ATA taskfile shadow registers
* @ioaddr: set of IO ports from which input is read * @ap: Port from which input is read
* @tf: ATA taskfile register set for storing input * @tf: ATA taskfile register set for storing input
* *
* Reads ATA taskfile registers for currently-selected device * Reads ATA taskfile registers for currently-selected device
...@@ -348,7 +348,7 @@ void ata_tf_read_pio(struct ata_port *ap, struct ata_taskfile *tf) ...@@ -348,7 +348,7 @@ void ata_tf_read_pio(struct ata_port *ap, struct ata_taskfile *tf)
/** /**
* ata_tf_read_mmio - input device's ATA taskfile shadow registers * ata_tf_read_mmio - input device's ATA taskfile shadow registers
* @ioaddr: set of IO ports from which input is read * @ap: Port from which input is read
* @tf: ATA taskfile register set for storing input * @tf: ATA taskfile register set for storing input
* *
* Reads ATA taskfile registers for currently-selected device * Reads ATA taskfile registers for currently-selected device
...@@ -414,6 +414,7 @@ u8 ata_check_status_mmio(struct ata_port *ap) ...@@ -414,6 +414,7 @@ u8 ata_check_status_mmio(struct ata_port *ap)
* ata_tf_to_fis - Convert ATA taskfile to SATA FIS structure * ata_tf_to_fis - Convert ATA taskfile to SATA FIS structure
* @tf: Taskfile to convert * @tf: Taskfile to convert
* @fis: Buffer into which data will output * @fis: Buffer into which data will output
* @pmp: Port multiplier port
* *
* Converts a standard ATA taskfile to a Serial ATA * Converts a standard ATA taskfile to a Serial ATA
* FIS structure (Register - Host to Device). * FIS structure (Register - Host to Device).
...@@ -1680,9 +1681,9 @@ static void ata_host_set_udma(struct ata_port *ap) ...@@ -1680,9 +1681,9 @@ static void ata_host_set_udma(struct ata_port *ap)
} }
/** /**
* ata_dev_set_xfermode - * ata_dev_set_xfermode - Issue SET FEATURES - XFER MODE command
* @ap: * @ap: Port associated with device @dev
* @dev: * @dev: Device to which command will be sent
* *
* LOCKING: * LOCKING:
*/ */
...@@ -1721,9 +1722,9 @@ static void ata_dev_set_xfermode(struct ata_port *ap, struct ata_device *dev) ...@@ -1721,9 +1722,9 @@ static void ata_dev_set_xfermode(struct ata_port *ap, struct ata_device *dev)
} }
/** /**
* ata_dev_set_udma - * ata_dev_set_udma - Set ATA device's transfer mode to Ultra DMA
* @ap: * @ap: Port associated with device @dev
* @device: * @device: Device whose mode will be set
* *
* LOCKING: * LOCKING:
*/ */
...@@ -1745,9 +1746,9 @@ static void ata_dev_set_udma(struct ata_port *ap, unsigned int device) ...@@ -1745,9 +1746,9 @@ static void ata_dev_set_udma(struct ata_port *ap, unsigned int device)
} }
/** /**
* ata_dev_set_pio - * ata_dev_set_pio - Set ATA device's transfer mode to PIO
* @ap: * @ap: Port associated with device @dev
* @device: * @device: Device whose mode will be set
* *
* LOCKING: * LOCKING:
*/ */
...@@ -2223,9 +2224,9 @@ void ata_eng_timeout(struct ata_port *ap) ...@@ -2223,9 +2224,9 @@ void ata_eng_timeout(struct ata_port *ap)
} }
/** /**
* ata_qc_new - * ata_qc_new - Request an available ATA command, for queueing
* @ap: * @ap: Port associated with device @dev
* @dev: * @dev: Device from whom we request an available command structure
* *
* LOCKING: * LOCKING:
*/ */
...@@ -2248,9 +2249,9 @@ static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap) ...@@ -2248,9 +2249,9 @@ static struct ata_queued_cmd *ata_qc_new(struct ata_port *ap)
} }
/** /**
* ata_qc_new_init - * ata_qc_new_init - Request an available ATA command, and initialize it
* @ap: * @ap: Port associated with device @dev
* @dev: * @dev: Device from whom we request an available command structure
* *
* LOCKING: * LOCKING:
*/ */
...@@ -2282,9 +2283,9 @@ struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, ...@@ -2282,9 +2283,9 @@ struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
} }
/** /**
* ata_qc_complete - * ata_qc_complete - Complete an active ATA command
* @qc: * @qc: Command to complete
* @drv_stat: * @drv_stat: ATA status register contents
* *
* LOCKING: * LOCKING:
* *
...@@ -2551,9 +2552,9 @@ void ata_bmdma_start_pio (struct ata_queued_cmd *qc) ...@@ -2551,9 +2552,9 @@ void ata_bmdma_start_pio (struct ata_queued_cmd *qc)
} }
/** /**
* ata_dma_complete - * ata_dma_complete - Complete an active ATA BMDMA command
* @qc: * @qc: Command to complete
* @host_stat: * @host_stat: BMDMA status register contents
* *
* LOCKING: * LOCKING:
*/ */
...@@ -2670,10 +2671,10 @@ inline unsigned int ata_host_intr (struct ata_port *ap, ...@@ -2670,10 +2671,10 @@ inline unsigned int ata_host_intr (struct ata_port *ap,
} }
/** /**
* ata_interrupt - * ata_interrupt - Default ATA host interrupt handler
* @irq: * @irq: irq line
* @dev_instance: * @dev_instance: pointer to our host information structure
* @regs: * @regs: unused
* *
* LOCKING: * LOCKING:
* *
...@@ -2862,9 +2863,9 @@ static void ata_probe_task(void *_data) ...@@ -2862,9 +2863,9 @@ static void ata_probe_task(void *_data)
} }
/** /**
* ata_host_remove - * ata_host_remove - Unregister SCSI host structure with upper layers
* @ap: * @ap: Port to unregister
* @do_unregister: * @do_unregister: 1 if we fully unregister, 0 to just stop the port
* *
* LOCKING: * LOCKING:
*/ */
...@@ -2882,10 +2883,12 @@ static void ata_host_remove(struct ata_port *ap, unsigned int do_unregister) ...@@ -2882,10 +2883,12 @@ static void ata_host_remove(struct ata_port *ap, unsigned int do_unregister)
} }
/** /**
* ata_host_init - * ata_host_init - Initialize an ata_port structure
* @host: * @ap: Structure to initialize
* @ent: * @host: associated SCSI mid-layer structure
* @port_no: * @host_set: Collection of hosts to which @ap belongs
* @ent: Probe information provided by low-level driver
* @port_no: Port number associated with this ata_port
* *
* LOCKING: * LOCKING:
* *
...@@ -2939,10 +2942,10 @@ static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host, ...@@ -2939,10 +2942,10 @@ static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host,
} }
/** /**
* ata_host_add - * ata_host_add - Attach low-level ATA driver to system
* @ent: * @ent: Information provided by low-level driver
* @host_set: * @host_set: Collections of ports to which we add
* @port_no: * @port_no: Port number associated with this host
* *
* LOCKING: * LOCKING:
* *
...@@ -3098,7 +3101,7 @@ int ata_device_add(struct ata_probe_ent *ent) ...@@ -3098,7 +3101,7 @@ int ata_device_add(struct ata_probe_ent *ent)
* ata_scsi_release - SCSI layer callback hook for host unload * ata_scsi_release - SCSI layer callback hook for host unload
* @host: libata host to be unloaded * @host: libata host to be unloaded
* *
* Performs all duties necessary to shut down a libata port: * Performs all duties necessary to shut down a libata port...
* Kill port kthread, disable port, and release resources. * Kill port kthread, disable port, and release resources.
* *
* LOCKING: * LOCKING:
...@@ -3123,7 +3126,7 @@ int ata_scsi_release(struct Scsi_Host *host) ...@@ -3123,7 +3126,7 @@ int ata_scsi_release(struct Scsi_Host *host)
/** /**
* ata_std_ports - initialize ioaddr with standard port offsets. * ata_std_ports - initialize ioaddr with standard port offsets.
* @ioaddr: * @ioaddr: IO address structure to be initialized
*/ */
void ata_std_ports(struct ata_ioports *ioaddr) void ata_std_ports(struct ata_ioports *ioaddr)
{ {
...@@ -3140,10 +3143,10 @@ void ata_std_ports(struct ata_ioports *ioaddr) ...@@ -3140,10 +3143,10 @@ void ata_std_ports(struct ata_ioports *ioaddr)
} }
/** /**
* ata_pci_init_one - * ata_pci_init_one - Initialize/register PCI IDE host controller
* @pdev: * @pdev: Controller to be initialized
* @port_info: * @port_info: Information from low-level host driver
* @n_ports: * @n_ports: Number of ports attached to host controller
* *
* LOCKING: * LOCKING:
* Inherited from PCI layer (may sleep). * Inherited from PCI layer (may sleep).
......
...@@ -340,6 +340,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, u8 *scsicmd) ...@@ -340,6 +340,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, u8 *scsicmd)
* @dev: ATA device to which the command is addressed * @dev: ATA device to which the command is addressed
* @cmd: SCSI command to execute * @cmd: SCSI command to execute
* @done: SCSI command completion function * @done: SCSI command completion function
* @xlat_func: Actor which translates @cmd to an ATA taskfile
* *
* Our ->queuecommand() function has decided that the SCSI * Our ->queuecommand() function has decided that the SCSI
* command issued can be directly translated into an ATA * command issued can be directly translated into an ATA
......
...@@ -267,7 +267,7 @@ static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val) ...@@ -267,7 +267,7 @@ static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
* *
* 20040111 - Seagate drives affected by the Mod15Write bug are blacklisted * 20040111 - Seagate drives affected by the Mod15Write bug are blacklisted
* The Maxtor quirk is in the blacklist, but I'm keeping the original * The Maxtor quirk is in the blacklist, but I'm keeping the original
* pessimistic fix for the following reasons: * pessimistic fix for the following reasons...
* - There seems to be less info on it, only one device gleaned off the * - There seems to be less info on it, only one device gleaned off the
* Windows driver, maybe only one is affected. More info would be greatly * Windows driver, maybe only one is affected. More info would be greatly
* appreciated. * appreciated.
......
...@@ -148,17 +148,6 @@ static unsigned long svia_scr_addr(unsigned long addr, unsigned int port) ...@@ -148,17 +148,6 @@ static unsigned long svia_scr_addr(unsigned long addr, unsigned int port)
return addr + (port * 128); return addr + (port * 128);
} }
/**
* svia_init_one -
* @pdev:
* @ent:
*
* LOCKING:
*
* RETURNS:
*
*/
static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
static int printed_version; static int printed_version;
...@@ -289,27 +278,11 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -289,27 +278,11 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
return rc; return rc;
} }
/**
* svia_init -
*
* LOCKING:
*
* RETURNS:
*
*/
static int __init svia_init(void) static int __init svia_init(void)
{ {
return pci_module_init(&svia_pci_driver); return pci_module_init(&svia_pci_driver);
} }
/**
* svia_exit -
*
* LOCKING:
*
*/
static void __exit svia_exit(void) static void __exit svia_exit(void)
{ {
pci_unregister_driver(&svia_pci_driver); pci_unregister_driver(&svia_pci_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment