aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-10-19 06:42:56 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-23 20:59:42 -0400
commit2dcb407e61458ded17503d6bd12b8c064965368b (patch)
tree6044e032197b84f9943a385b0c9dbb6656c3f97f /include
parent01e7ae8c13bb06a2ce622ebace33bb7e28ef596c (diff)
[libata] checkpatch-inspired cleanups
Tackle the relatively sane complaints of checkpatch --file. The vast majority is indentation and whitespace changes, the rest are * #include fixes * printk KERN_xxx prefix addition * BSS/initializer cleanups Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ata.h6
-rw-r--r--include/linux/libata.h22
2 files changed, 14 insertions, 14 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h
index a4f373f8b798..8263a7b74d34 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -178,8 +178,8 @@ enum {
178 ATA_CMD_PACKET = 0xA0, 178 ATA_CMD_PACKET = 0xA0,
179 ATA_CMD_VERIFY = 0x40, 179 ATA_CMD_VERIFY = 0x40,
180 ATA_CMD_VERIFY_EXT = 0x42, 180 ATA_CMD_VERIFY_EXT = 0x42,
181 ATA_CMD_STANDBYNOW1 = 0xE0, 181 ATA_CMD_STANDBYNOW1 = 0xE0,
182 ATA_CMD_IDLEIMMEDIATE = 0xE1, 182 ATA_CMD_IDLEIMMEDIATE = 0xE1,
183 ATA_CMD_INIT_DEV_PARAMS = 0x91, 183 ATA_CMD_INIT_DEV_PARAMS = 0x91,
184 ATA_CMD_READ_NATIVE_MAX = 0xF8, 184 ATA_CMD_READ_NATIVE_MAX = 0xF8,
185 ATA_CMD_READ_NATIVE_MAX_EXT = 0x27, 185 ATA_CMD_READ_NATIVE_MAX_EXT = 0x27,
@@ -458,7 +458,7 @@ static inline int ata_id_wcache_enabled(const u16 *id)
458 * ATA-3 introduces word 80 and accurate reporting 458 * ATA-3 introduces word 80 and accurate reporting
459 * 459 *
460 * The practical impact of this is that ata_id_major_version cannot 460 * The practical impact of this is that ata_id_major_version cannot
461 * reliably report on drives below ATA3. 461 * reliably report on drives below ATA3.
462 */ 462 */
463 463
464static inline unsigned int ata_id_major_version(const u16 *id) 464static inline unsigned int ata_id_major_version(const u16 *id)
diff --git a/include/linux/libata.h b/include/linux/libata.h
index bc3b6fc7b98d..6fd24e03622e 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -326,7 +326,7 @@ enum {
326 ATA_HORKAGE_SKIP_PM = (1 << 5), /* Skip PM operations */ 326 ATA_HORKAGE_SKIP_PM = (1 << 5), /* Skip PM operations */
327 ATA_HORKAGE_HPA_SIZE = (1 << 6), /* native size off by one */ 327 ATA_HORKAGE_HPA_SIZE = (1 << 6), /* native size off by one */
328 328
329 /* DMA mask for user DMA control: User visible values; DO NOT 329 /* DMA mask for user DMA control: User visible values; DO NOT
330 renumber */ 330 renumber */
331 ATA_DMA_MASK_ATA = (1 << 0), /* DMA on ATA Disk */ 331 ATA_DMA_MASK_ATA = (1 << 0), /* DMA on ATA Disk */
332 ATA_DMA_MASK_ATAPI = (1 << 1), /* DMA on ATAPI */ 332 ATA_DMA_MASK_ATAPI = (1 << 1), /* DMA on ATAPI */
@@ -717,7 +717,7 @@ struct ata_timing {
717 unsigned short udma; /* t2CYCTYP/2 */ 717 unsigned short udma; /* t2CYCTYP/2 */
718}; 718};
719 719
720#define FIT(v,vmin,vmax) max_t(short,min_t(short,v,vmax),vmin) 720#define FIT(v, vmin, vmax) max_t(short, min_t(short, v, vmax), vmin)
721 721
722extern const unsigned long sata_deb_timing_normal[]; 722extern const unsigned long sata_deb_timing_normal[];
723extern const unsigned long sata_deb_timing_hotplug[]; 723extern const unsigned long sata_deb_timing_hotplug[];
@@ -816,14 +816,14 @@ extern void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
816extern void ata_tf_to_fis(const struct ata_taskfile *tf, 816extern void ata_tf_to_fis(const struct ata_taskfile *tf,
817 u8 pmp, int is_cmd, u8 *fis); 817 u8 pmp, int is_cmd, u8 *fis);
818extern void ata_tf_from_fis(const u8 *fis, struct ata_taskfile *tf); 818extern void ata_tf_from_fis(const u8 *fis, struct ata_taskfile *tf);
819extern void ata_noop_dev_select (struct ata_port *ap, unsigned int device); 819extern void ata_noop_dev_select(struct ata_port *ap, unsigned int device);
820extern void ata_std_dev_select (struct ata_port *ap, unsigned int device); 820extern void ata_std_dev_select(struct ata_port *ap, unsigned int device);
821extern u8 ata_check_status(struct ata_port *ap); 821extern u8 ata_check_status(struct ata_port *ap);
822extern u8 ata_altstatus(struct ata_port *ap); 822extern u8 ata_altstatus(struct ata_port *ap);
823extern void ata_exec_command(struct ata_port *ap, const struct ata_taskfile *tf); 823extern void ata_exec_command(struct ata_port *ap, const struct ata_taskfile *tf);
824extern int ata_port_start (struct ata_port *ap); 824extern int ata_port_start(struct ata_port *ap);
825extern int ata_sff_port_start (struct ata_port *ap); 825extern int ata_sff_port_start(struct ata_port *ap);
826extern irqreturn_t ata_interrupt (int irq, void *dev_instance); 826extern irqreturn_t ata_interrupt(int irq, void *dev_instance);
827extern void ata_data_xfer(struct ata_device *adev, unsigned char *buf, 827extern void ata_data_xfer(struct ata_device *adev, unsigned char *buf,
828 unsigned int buflen, int write_data); 828 unsigned int buflen, int write_data);
829extern void ata_data_xfer_noirq(struct ata_device *adev, unsigned char *buf, 829extern 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,
844extern void ata_id_c_string(const u16 *id, unsigned char *s, 844extern void ata_id_c_string(const u16 *id, unsigned char *s,
845 unsigned int ofs, unsigned int len); 845 unsigned int ofs, unsigned int len);
846extern void ata_id_to_dma_mode(struct ata_device *dev, u8 unknown); 846extern void ata_id_to_dma_mode(struct ata_device *dev, u8 unknown);
847extern void ata_bmdma_setup (struct ata_queued_cmd *qc); 847extern void ata_bmdma_setup(struct ata_queued_cmd *qc);
848extern void ata_bmdma_start (struct ata_queued_cmd *qc); 848extern void ata_bmdma_start(struct ata_queued_cmd *qc);
849extern void ata_bmdma_stop(struct ata_queued_cmd *qc); 849extern void ata_bmdma_stop(struct ata_queued_cmd *qc);
850extern u8 ata_bmdma_status(struct ata_port *ap); 850extern u8 ata_bmdma_status(struct ata_port *ap);
851extern void ata_bmdma_irq_clear(struct ata_port *ap); 851extern 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; }
920#ifdef CONFIG_PCI 920#ifdef CONFIG_PCI
921struct pci_dev; 921struct pci_dev;
922 922
923extern int ata_pci_init_one (struct pci_dev *pdev, 923extern int ata_pci_init_one(struct pci_dev *pdev,
924 const struct ata_port_info * const * ppi); 924 const struct ata_port_info * const * ppi);
925extern void ata_pci_remove_one (struct pci_dev *pdev); 925extern void ata_pci_remove_one(struct pci_dev *pdev);
926#ifdef CONFIG_PM 926#ifdef CONFIG_PM
927extern void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg); 927extern void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg);
928extern int __must_check ata_pci_device_do_resume(struct pci_dev *pdev); 928extern int __must_check ata_pci_device_do_resume(struct pci_dev *pdev);