Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (61 commits)
  ide: sanitize handling of IDE_HFLAG_NO_SET_MODE host flag
  sis5513: fail early for unsupported chipsets
  it821x: fix kzalloc() failure handling
  qd65xx: use IDE_HFLAG_SINGLE host flag
  qd65xx: always use ->selectproc method
  ide-cd: put proc-related functions together under single ifdef
  ide-cd: Replace __FUNCTION__ with __func__
  IDE: Coding Style fixes to drivers/ide/ide-cd.c
  IDE: Coding Style fixes to drivers/ide/pci/cy82c693.c
  IDE: Coding Style fixes to drivers/ide/pci/it8213.c
  IDE: Coding Style fixes to drivers/ide/ide-floppy.c
  IDE: Coding Style fixes to drivers/ide/legacy/ali14xx.c
  IDE: Coding Style fixes to drivers/ide/legacy/hd.c
  IDE: Coding Style fixes to drivers/ide/pci/cmd640.c
  IDE: Coding Style fixes to drivers/ide/pci/opti621.c
  IDE: Coding Style fixes to drivers/ide/ide-pnp.c
  IDE: Coding Style fixes to drivers/ide/ide-proc.c
  IDE: Coding Style fixes to drivers/ide/legacy/ide-4drives.c
  IDE: Coding Style fixes to drivers/ide/legacy/umc8672.c
  IDE: Coding Style fixes to drivers/ide/pci/generic.c
  ...

3 files changed, 13 insertions, 137 deletions

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index cbb5ccb27de3..bda6f04791d4 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -210,7 +210,6 @@ unifdef-y += hayesesp.h
 unifdef-y += hdlcdrv.h
 unifdef-y += hdlc.h
 unifdef-y += hdreg.h
-unifdef-y += hdsmart.h
 unifdef-y += hid.h
 unifdef-y += hiddev.h
 unifdef-y += hidraw.h
diff --git a/include/linux/hdsmart.h b/include/linux/hdsmart.h
deleted file mode 100644
index 4f4faf9d4238..000000000000
--- a/include/linux/hdsmart.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * linux/include/linux/hdsmart.h
- *
- * Copyright (C) 1999-2000      Michael Cornwell <cornwell@acm.org>
- * Copyright (C) 2000           Andre Hedrick <andre@linux-ide.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example /usr/src/linux/COPYING); if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _LINUX_HDSMART_H
-#define _LINUX_HDSMART_H
-
-#ifndef __KERNEL__
-#define OFFLINE_FULL_SCAN               0
-#define SHORT_SELF_TEST                 1
-#define EXTEND_SELF_TEST                2
-#define SHORT_CAPTIVE_SELF_TEST         129
-#define EXTEND_CAPTIVE_SELF_TEST        130
-
-/* smart_attribute is the vendor specific in SFF-8035 spec */
-typedef struct ata_smart_attribute_s {
-        unsigned char                   id;
-        unsigned short                  status_flag;
-        unsigned char                   normalized;
-        unsigned char                   worse_normal;
-        unsigned char                   raw[6];
-        unsigned char                   reserv;
-} __attribute__ ((packed)) ata_smart_attribute_t;
-
-/* smart_values is format of the read drive Atrribute command */
-typedef struct ata_smart_values_s {
-        unsigned short                  revnumber;
-        ata_smart_attribute_t           vendor_attributes [30];
-        unsigned char                   offline_data_collection_status;
-        unsigned char                   self_test_exec_status;
-        unsigned short                  total_time_to_complete_off_line;
-        unsigned char                   vendor_specific_366;
-        unsigned char                   offline_data_collection_capability;
-        unsigned short                  smart_capability;
-        unsigned char                   errorlog_capability;
-        unsigned char                   vendor_specific_371;
-        unsigned char                   short_test_completion_time;
-        unsigned char                   extend_test_completion_time;
-        unsigned char                   reserved_374_385 [12];
-        unsigned char                   vendor_specific_386_509 [125];
-        unsigned char                   chksum;
-} __attribute__ ((packed)) ata_smart_values_t;
-
-/* Smart Threshold data structures */
-/* Vendor attribute of SMART Threshold */
-typedef struct ata_smart_threshold_entry_s {
-        unsigned char                   id;
-        unsigned char                   normalized_threshold;
-        unsigned char                   reserved[10];
-} __attribute__ ((packed)) ata_smart_threshold_entry_t;
-
-/* Format of Read SMART THreshold Command */
-typedef struct ata_smart_thresholds_s {
-        unsigned short                  revnumber;
-        ata_smart_threshold_entry_t     thres_entries[30];
-        unsigned char                   reserved[149];
-        unsigned char                   chksum;
-} __attribute__ ((packed)) ata_smart_thresholds_t;
-
-typedef struct ata_smart_errorlog_command_struct_s {
-        unsigned char                   devicecontrolreg;
-        unsigned char                   featuresreg;
-        unsigned char                   sector_count;
-        unsigned char                   sector_number;
-        unsigned char                   cylinder_low;
-        unsigned char                   cylinder_high;
-        unsigned char                   drive_head;
-        unsigned char                   commandreg;
-        unsigned int                    timestamp;
-} __attribute__ ((packed)) ata_smart_errorlog_command_struct_t;
-
-typedef struct ata_smart_errorlog_error_struct_s {
-        unsigned char                   error_condition;
-        unsigned char                   extended_error[14];
-        unsigned char                   state;
-        unsigned short                  timestamp;
-} __attribute__ ((packed)) ata_smart_errorlog_error_struct_t;
-
-typedef struct ata_smart_errorlog_struct_s {
-        ata_smart_errorlog_command_struct_t     commands[6];
-        ata_smart_errorlog_error_struct_t       error_struct;
-} __attribute__ ((packed)) ata_smart_errorlog_struct_t;
-
-typedef struct ata_smart_errorlog_s {
-        unsigned char                   revnumber;
-        unsigned char                   error_log_pointer;
-        ata_smart_errorlog_struct_t     errorlog_struct[5];
-        unsigned short                  ata_error_count;
-        unsigned short                  non_fatal_count;
-        unsigned short                  drive_timeout_count;
-        unsigned char                   reserved[53];
-        unsigned char                   chksum;
-} __attribute__ ((packed)) ata_smart_errorlog_t;
-
-typedef struct ata_smart_selftestlog_struct_s {
-        unsigned char                   selftestnumber;
-        unsigned char                   selfteststatus;
-        unsigned short                  timestamp;
-        unsigned char                   selftestfailurecheckpoint;
-        unsigned int                    lbafirstfailure;
-        unsigned char                   vendorspecific[15];
-} __attribute__ ((packed)) ata_smart_selftestlog_struct_t;
-
-typedef struct ata_smart_selftestlog_s {
-        unsigned short                  revnumber;
-        ata_smart_selftestlog_struct_t  selftest_struct[21];
-        unsigned char                   vendorspecific[2];
-        unsigned char                   mostrecenttest;
-        unsigned char                   resevered[2];
-        unsigned char                   chksum;
-} __attribute__ ((packed)) ata_smart_selftestlog_t;
-#endif /* __KERNEL__ */
-
-#endif  /* _LINUX_HDSMART_H */
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 5f3e82ae901a..f20410dd4482 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -170,7 +170,6 @@ typedef struct hw_regs_s {
         struct device   *dev;
 } hw_regs_t;
 
-struct hwif_s * ide_find_port(unsigned long);
 void ide_init_port_data(struct hwif_s *, unsigned int);
 void ide_init_port_hw(struct hwif_s *, hw_regs_t *);
 
@@ -522,7 +521,6 @@ typedef struct hwif_s {
         unsigned        reset      : 1; /* reset after probe */
         unsigned        sg_mapped  : 1; /* sg_table and sg_nents are ready */
         unsigned        mmio       : 1; /* host uses MMIO */
-        unsigned        straight8  : 1; /* Alan's straight 8 check */
 
         struct device           gendev;
         struct device           *portdev;
@@ -809,6 +807,13 @@ extern	ide_hwif_t	ide_hwifs[];		/* master data repository */
 #endif
 extern int noautodma;
 
+ide_hwif_t *ide_find_port_slot(const struct ide_port_info *);
+
+static inline ide_hwif_t *ide_find_port(void)
+{
+        return ide_find_port_slot(NULL);
+}
+
 extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs);
 int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq,
                              int uptodate, int nr_sectors);
@@ -1027,8 +1032,8 @@ enum {
         IDE_HFLAG_SINGLE                = (1 << 1),
         /* don't use legacy PIO blacklist */
         IDE_HFLAG_PIO_NO_BLACKLIST      = (1 << 2),
-        /* don't use conservative PIO "downgrade" */
-        IDE_HFLAG_PIO_NO_DOWNGRADE      = (1 << 3),
+        /* set for the second port of QD65xx */
+        IDE_HFLAG_QD_2ND_PORT           = (1 << 3),
         /* use PIO8/9 for prefetch off/on */
         IDE_HFLAG_ABUSE_PREFETCH        = (1 << 4),
         /* use PIO6/7 for fast-devsel off/on */
@@ -1050,8 +1055,8 @@ enum {
         IDE_HFLAG_VDMA                  = (1 << 11),
         /* ATAPI DMA is unsupported */
         IDE_HFLAG_NO_ATAPI_DMA          = (1 << 12),
-        /* set if host is a "bootable" controller */
-        IDE_HFLAG_BOOTABLE              = (1 << 13),
+        /* set if host is a "non-bootable" controller */
+        IDE_HFLAG_NON_BOOTABLE          = (1 << 13),
         /* host doesn't support DMA */
         IDE_HFLAG_NO_DMA                = (1 << 14),
         /* check if host is PCI IDE device before allowing DMA */
@@ -1079,8 +1084,6 @@ enum {
         /* unmask IRQs */
         IDE_HFLAG_UNMASK_IRQS           = (1 << 25),
         IDE_HFLAG_ABUSE_SET_DMA_MODE    = (1 << 26),
-        /* host is CY82C693 */
-        IDE_HFLAG_CY82C693              = (1 << 27),
         /* force host out of "simplex" mode */
         IDE_HFLAG_CLEAR_SIMPLEX         = (1 << 28),
         /* DSC overlap is unsupported */
@@ -1092,9 +1095,9 @@ enum {
 };
 
 #ifdef CONFIG_BLK_DEV_OFFBOARD
-# define IDE_HFLAG_OFF_BOARD    IDE_HFLAG_BOOTABLE
-#else
 # define IDE_HFLAG_OFF_BOARD    0
+#else
+# define IDE_HFLAG_OFF_BOARD    IDE_HFLAG_NON_BOOTABLE
 #endif
 
 struct ide_port_info {