From 196038cc9c07f84cc4f5e4eb6fc3dc9cd1decabf Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@sirena.org.uk>
Date: Wed, 10 Oct 2007 11:05:44 +0100
Subject: [PATCH] --- yaml --- r: 69307 b: refs/heads/master c:
 0e5d5442cbe3399d789d6a75c6e3a0db37f846f5 h: refs/heads/master i:   69305:
 ed57d0d57edff6538c4575fc4f2ce9c4dd5a28f5   69303:
 0ebbb3868cb4dc64fe10f9f94e35527cb40ceaa6 v: v3

---
 [refs]                                |  2 +-
 trunk/arch/m68k/atari/atakeyb.c       |  2 ++
 trunk/drivers/input/keyboard/atakbd.c |  7 +++----
 trunk/drivers/mtd/maps/pxa2xx-flash.c |  4 ++--
 trunk/drivers/net/natsemi.c           | 10 +++++++---
 trunk/drivers/scsi/gdth.c             |  4 ----
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 172daf0669be..43f79e0763d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63bd8c48e04bbbc9cee3d752857914609d8d406f
+refs/heads/master: 0e5d5442cbe3399d789d6a75c6e3a0db37f846f5
diff --git a/trunk/arch/m68k/atari/atakeyb.c b/trunk/arch/m68k/atari/atakeyb.c
index 880add120eb3..fbbccb5e7511 100644
--- a/trunk/arch/m68k/atari/atakeyb.c
+++ b/trunk/arch/m68k/atari/atakeyb.c
@@ -1,4 +1,6 @@
 /*
+ * linux/arch/m68k/atari/atakeyb.c
+ *
  * Atari Keyboard driver for 680x0 Linux
  *
  * This file is subject to the terms and conditions of the GNU General Public
diff --git a/trunk/drivers/input/keyboard/atakbd.c b/trunk/drivers/input/keyboard/atakbd.c
index a1800151b6ce..f948d3a14a93 100644
--- a/trunk/drivers/input/keyboard/atakbd.c
+++ b/trunk/drivers/input/keyboard/atakbd.c
@@ -217,7 +217,7 @@ static void atakbd_interrupt(unsigned char scancode, char down)
 
 static int __init atakbd_init(void)
 {
-	int i, error;
+	int i;
 
 	if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP))
 		return -EIO;
@@ -247,10 +247,9 @@ static int __init atakbd_init(void)
 	}
 
 	/* error check */
-	error = input_register_device(atakbd_dev);
-	if (error) {
+	if (input_register_device(atakbd_dev)) {
 		input_free_device(atakbd_dev);
-		return error;
+		return -ENOMEM;
 	}
 
 	atari_input_keyboard_interrupt_hook = atakbd_interrupt;
diff --git a/trunk/drivers/mtd/maps/pxa2xx-flash.c b/trunk/drivers/mtd/maps/pxa2xx-flash.c
index 82113295c266..cb933ac475d5 100644
--- a/trunk/drivers/mtd/maps/pxa2xx-flash.c
+++ b/trunk/drivers/mtd/maps/pxa2xx-flash.c
@@ -14,20 +14,20 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 
 #include <asm/io.h>
 #include <asm/hardware.h>
-#include <asm/cacheflush.h>
 
 #include <asm/mach/flash.h>
 
 static void pxa2xx_map_inval_cache(struct map_info *map, unsigned long from,
 				      ssize_t len)
 {
-	flush_ioremap_region(map->phys, map->cached, from, len);
+	consistent_sync((char *)map->cached + from, len, DMA_FROM_DEVICE);
 }
 
 struct pxa2xx_flash_info {
diff --git a/trunk/drivers/net/natsemi.c b/trunk/drivers/net/natsemi.c
index 527f9dcc7f69..b881786eebd4 100644
--- a/trunk/drivers/net/natsemi.c
+++ b/trunk/drivers/net/natsemi.c
@@ -1576,7 +1576,7 @@ static int netdev_open(struct net_device *dev)
 
 	/* Set the timer to check for link beat. */
 	init_timer(&np->timer);
-	np->timer.expires = jiffies + NATSEMI_TIMER_FREQ;
+	np->timer.expires = round_jiffies(jiffies + NATSEMI_TIMER_FREQ);
 	np->timer.data = (unsigned long)dev;
 	np->timer.function = &netdev_timer; /* timer handler */
 	add_timer(&np->timer);
@@ -1856,7 +1856,11 @@ static void netdev_timer(unsigned long data)
 			next_tick = 1;
 		}
 	}
-	mod_timer(&np->timer, jiffies + next_tick);
+
+	if (next_tick > 1)
+		mod_timer(&np->timer, round_jiffies(jiffies + next_tick));
+	else
+		mod_timer(&np->timer, jiffies + next_tick);
 }
 
 static void dump_ring(struct net_device *dev)
@@ -3331,7 +3335,7 @@ static int natsemi_resume (struct pci_dev *pdev)
 		spin_unlock_irq(&np->lock);
 		enable_irq(dev->irq);
 
-		mod_timer(&np->timer, jiffies + 1*HZ);
+		mod_timer(&np->timer, round_jiffies(jiffies + 1*HZ));
 	}
 	netif_device_attach(dev);
 out:
diff --git a/trunk/drivers/scsi/gdth.c b/trunk/drivers/scsi/gdth.c
index 3ac080ee6e2f..e8010a702e73 100644
--- a/trunk/drivers/scsi/gdth.c
+++ b/trunk/drivers/scsi/gdth.c
@@ -5213,10 +5213,6 @@ static int __init gdth_init(void)
 #endif /* CONFIG_PCI */
 
 	TRACE2(("gdth_detect() %d controller detected\n", gdth_ctr_count));
-
-	if (list_empty(&gdth_instances))
-		return -ENODEV;
-
 #ifdef GDTH_STATISTICS
 	TRACE2(("gdth_detect(): Initializing timer !\n"));
 	init_timer(&gdth_timer);