All of lore.kernel.org
 help / color / mirror / Atom feed
* Make spitz compile again
@ 2005-10-31 13:42 Pavel Machek
  2005-10-31 15:45 ` Richard Purdie
  0 siblings, 1 reply; 18+ messages in thread
From: Pavel Machek @ 2005-10-31 13:42 UTC (permalink / raw)
  To: rpurdie, kernel list

Hi!

This is what I needed to do after update to latest linus
kernel. Perhaps it helps someone. 

Signed-off-by: Pavel Machek <pavel@suse.cz>

, but it is against Richard's tree merged into my tree, so do not
expect to apply it over mainline. Akita code movement is needed if I
want to compile kernel without akita support...


							Pavel

Fix compilation after update to latest 2.6.14.

---
commit 84a41bb5e3a0a46b271929818f6699357f9c03e9
tree b6e836af503cb9e1c0bffe21413ec03eb0845644
parent 128aac988a7eaaa882a71670109831265d24c121
author <pavel@amd.(none)> Mon, 31 Oct 2005 14:40:01 +0100
committer <pavel@amd.(none)> Mon, 31 Oct 2005 14:40:01 +0100

 arch/arm/mach-pxa/pxa_keys.c   |   20 ++++++++------------
 arch/arm/mach-pxa/sharpsl_pm.c |   37 ++++++++++++++++---------------------
 arch/arm/mach-pxa/spitz.c      |   24 +++++++++++-------------
 config.3000                    |   19 ++++++++++++++++---
 drivers/i2c/busses/i2c-pxa.c   |    6 ++----
 5 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/arch/arm/mach-pxa/pxa_keys.c b/arch/arm/mach-pxa/pxa_keys.c
--- a/arch/arm/mach-pxa/pxa_keys.c
+++ b/arch/arm/mach-pxa/pxa_keys.c
@@ -55,24 +55,20 @@ pxa_keys_isr (int irq, void *dev_id, str
 }
 
 #ifdef CONFIG_PM
-static int pxa_keys_suspend(struct device *dev, pm_message_t state, uint32_t level)
+static int pxa_keys_suspend(struct device *dev, pm_message_t state)
 {
-	if (level == SUSPEND_POWER_DOWN) {
-		struct pxa_keys_platform_data *k = dev_get_drvdata(dev);
-		k->suspended = 1;
-	}
+	struct pxa_keys_platform_data *k = dev_get_drvdata(dev);
+	k->suspended = 1;
 	return 0;
 }
 
-static int pxa_keys_resume(struct device *dev, uint32_t level)
+static int pxa_keys_resume(struct device *dev)
 {
-	if (level == RESUME_POWER_ON) {
-		struct pxa_keys_platform_data *k = dev_get_drvdata(dev);
+	struct pxa_keys_platform_data *k = dev_get_drvdata(dev);
 
-		/* Upon resume, ignore the suspend key for a short while */
-		k->suspend_jiffies=jiffies;
-		k->suspended = 0;
-	}
+	/* Upon resume, ignore the suspend key for a short while */
+	k->suspend_jiffies=jiffies;
+	k->suspended = 0;
 	return 0;
 }
 #else
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -634,36 +634,31 @@ static int sharpsl_ac_check(void)
 
 #ifdef CONFIG_PM
 
-static int corgi_batt_suspend(struct device *dev, pm_message_t state, uint32_t level)
+static int corgi_batt_suspend(struct device *dev, pm_message_t state)
 {
-	if (level == SUSPEND_POWER_DOWN) {
+	DPRINTK("SharpSL Battery Suspending \n");
+	sharpsl_pm.suspended=1;
 
-		DPRINTK("SharpSL Battery Suspending \n");
-		sharpsl_pm.suspended=1;
-
-		flush_scheduled_work();
+	flush_scheduled_work();
 		
-		if (sharpsl_pm.charge_mode == CHRG_ON)
-			sharpsl_pm.offline_charge_activate = 1;
-		else
-			sharpsl_pm.offline_charge_activate = 0;
-	}
+	if (sharpsl_pm.charge_mode == CHRG_ON)
+		sharpsl_pm.offline_charge_activate = 1;
+	else
+		sharpsl_pm.offline_charge_activate = 0;
+
 	return 0;
 }	
 		
-static int corgi_batt_resume(struct device *dev, uint32_t level)
+static int corgi_batt_resume(struct device *dev)
 {
-	if (level == RESUME_POWER_ON) {
+	DPRINTK("SharpSL Battery Resuming \n");
 
-		DPRINTK("SharpSL Battery Resuming \n");
-	
-		/* Clear the reset source indicators as they break the bootloader upon reboot */
-		RCSR=0x0f;
-		apm_event_queued = 0;
-		sharpsl_average_clear();
+	/* Clear the reset source indicators as they break the bootloader upon reboot */
+	RCSR=0x0f;
+	apm_event_queued = 0;
+	sharpsl_average_clear();
 
-		sharpsl_pm.suspended = 0;
-	}
+	sharpsl_pm.suspended = 0;
 	return 0;
 }
 
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -412,19 +412,6 @@ static void __init spitz_init(void)
 	platform_device_register(&spitzscoop2_device);
 }
 
-static void __init akita_init(void)
-{
-	spitz_ficp_platform_data.transceiver_mode = akita_irda_transceiver_mode;
-
-	/* We just pretend the second element of the array doesn't exist */
-	scoop_num = 1;
-	scoop_devs = &spitz_pcmcia_scoop[0];
-	spitz_bl_machinfo.set_bl_intensity = akita_bl_set_intensity;
-
-	common_init();
-	platform_device_register(&akitaioexp_device);
-}
-
 static void __init fixup_spitz(struct machine_desc *desc,
 		struct tag *tags, char **cmdline, struct meminfo *mi)
 {
@@ -462,6 +449,17 @@ MACHINE_END
 #endif
 
 #ifdef CONFIG_MACH_AKITA
+static void __init akita_init(void)
+{
+	/* We just pretend the second element of the array doesn't exist */
+	scoop_num = 1;
+	scoop_devs = &spitz_pcmcia_scoop[0];
+	spitz_bl_machinfo.set_bl_intensity = akita_bl_set_intensity;
+
+	common_init();
+	platform_device_register(&akitaioexp_device);
+}
+
 MACHINE_START(AKITA, "SHARP Akita")
 	.phys_ram	= 0xa0000000,
 	.phys_io	= 0x40000000,
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1009,11 +1009,9 @@ static int i2c_pxa_remove(struct device 
 }
 
 #ifdef CONFIG_PM
-static int i2c_pxa_resume(struct device *dev, u32 level)
+static int i2c_pxa_resume(struct device *dev)
 {
-	if (level == RESUME_ENABLE) {
-		i2c_pxa_reset(dev_get_drvdata(dev));
-	}
+	i2c_pxa_reset(dev_get_drvdata(dev));
 	return 0;
 }
 


-- 
Thanks, Sharp!

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2005-11-07 12:45 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-10-31 13:42 Make spitz compile again Pavel Machek
2005-10-31 15:45 ` Richard Purdie
2005-11-01 19:31   ` Pavel Machek
2005-11-01 20:10     ` Richard Purdie
2005-11-01 20:37       ` Pavel Machek
2005-11-01 20:39       ` Pavel Machek
2005-11-01 20:40       ` Pavel Machek
2005-11-01 20:05   ` Pavel Machek
2005-11-01 20:19     ` Richard Purdie
2005-11-01 21:46     ` Richard Purdie
2005-11-01 22:14       ` Russell King
2005-11-01 22:54         ` Richard Purdie
2005-11-02 11:10       ` Pavel Machek
2005-11-02 12:51   ` Pavel Machek
2005-11-02 13:47     ` Richard Purdie
2005-11-02 13:52       ` Pavel Machek
2005-11-02 14:44         ` Richard Purdie
2005-10-06  7:16           ` spitz autorepeat Pavel Machek

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.