Merge ../linux-2.6

5 files changed, 10 insertions, 9 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index c7671e188017..b4a41d6d0714 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -2143,6 +2143,7 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity,
         req.cmd[0] = GPCMD_READ_CDVD_CAPACITY;
         req.data = (char *)&capbuf;
         req.data_len = sizeof(capbuf);
+        req.flags |= REQ_QUIET;
 
         stat = cdrom_queue_packet_command(drive, &req);
         if (stat == 0) {
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index ebc59064b475..f04791a58df0 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -433,6 +433,7 @@
 #include <linux/timer.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
+#include <linux/jiffies.h>
 #include <linux/major.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/errno.h>
@@ -2336,7 +2337,7 @@ static ide_startstop_t idetape_rw_callback (ide_drive_t *drive)
         }
         if (time_after(jiffies, tape->insert_time))
                 tape->insert_speed = tape->insert_size / 1024 * HZ / (jiffies - tape->insert_time);
-        if (jiffies - tape->avg_time >= HZ) {
+        if (time_after_eq(jiffies, tape->avg_time + HZ)) {
                 tape->avg_speed = tape->avg_size * HZ / (jiffies - tape->avg_time) / 1024;
                 tape->avg_size = 0;
                 tape->avg_time = jiffies;
@@ -2497,7 +2498,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
                         } else {
                                 return ide_do_reset(drive);
                         }
-                } else if (jiffies - tape->dsc_polling_start > IDETAPE_DSC_MA_THRESHOLD)
+                } else if (time_after(jiffies, tape->dsc_polling_start + IDETAPE_DSC_MA_THRESHOLD))
                         tape->dsc_polling_frequency = IDETAPE_DSC_MA_SLOW;
                 idetape_postpone_request(drive);
                 return ide_stopped;
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 21965e5ef25e..b22ee5462318 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -347,10 +347,8 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, const ch
                         break;
 
                 case AMD_UDMA_66:
-                        pci_read_config_dword(dev, AMD_UDMA_TIMING, &u);
-                        for (i = 24; i >= 0; i -= 8)
-                                if ((u >> i) & 4)
-                                        amd_80w |= (1 << (1 - (i >> 4)));
+                        /* no host side cable detection */
+                        amd_80w = 0x03;
                         break;
         }
 
@@ -386,8 +384,6 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, const ch
         if (amd_clock < 20000 || amd_clock > 50000) {
                 printk(KERN_WARNING "%s: User given PCI clock speed impossible (%d), using 33 MHz instead.\n",
                         amd_chipset->name, amd_clock);
-                printk(KERN_WARNING "%s: Use ide0=ata66 if you want to assume 80-wire cable\n",
-                        amd_chipset->name);
                 amd_clock = 33333;
         }
 
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 6e3ab0c38c4d..f82e82109728 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -41,14 +41,15 @@
 
 static int ide_generic_all;             /* Set to claim all devices */
 
+#ifndef MODULE
 static int __init ide_generic_all_on(char *unused)
 {
         ide_generic_all = 1;
         printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers.\n");
         return 1;
 }
-
 __setup("all-generic-ide", ide_generic_all_on);
+#endif
 
 static void __devinit init_hwif_generic (ide_hwif_t *hwif)
 {
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 75a2253a3e68..8e9d87701ce2 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -112,6 +112,7 @@ static const struct {
 
         { "SiS5596",    PCI_DEVICE_ID_SI_5596,  ATA_16   },
         { "SiS5571",    PCI_DEVICE_ID_SI_5571,  ATA_16   },
+        { "SiS5517",    PCI_DEVICE_ID_SI_5517,  ATA_16   },
         { "SiS551x",    PCI_DEVICE_ID_SI_5511,  ATA_16   },
 };
 
@@ -524,6 +525,7 @@ static void config_art_rwp_pio (ide_drive_t *drive, u8 pio)
                         case 3:         test1 = 0x30|0x03; break;
                         case 2:         test1 = 0x40|0x04; break;
                         case 1:         test1 = 0x60|0x07; break;
+                        case 0:         test1 = 0x00; break;
                         default:        break;
                 }
                 pci_write_config_byte(dev, drive_pci, test1);