diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 18:56:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 18:56:21 -0700 |
commit | c09b360a2b0779e08bacb88d3fcd8458ebc49658 (patch) | |
tree | f9b8ea6bf9fe3fc395ff9b46a865b9ee459e239a /include | |
parent | 432409eebcdec38ff6fa949f097b5438d588faa5 (diff) | |
parent | 3a9e3a51dd47bd9e2fd6bcf3c893eb5729c6f1ee (diff) | |
download | op-kernel-dev-c09b360a2b0779e08bacb88d3fcd8458ebc49658.zip op-kernel-dev-c09b360a2b0779e08bacb88d3fcd8458ebc49658.tar.gz |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
jmicron: update quirk for JMB361/3/5/6
libata: add HTS542525K9SA00 to NCQ blacklist
libata-core: auditting chk_status v check_status
[libata] checkpatch-inspired cleanups
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ata.h | 6 | ||||
-rw-r--r-- | include/linux/libata.h | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h index a4f373f..8263a7b 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -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) diff --git a/include/linux/libata.h b/include/linux/libata.h index bc3b6fc..6fd24e0 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -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); |