* [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal
@ 2011-04-18 19:21 Jarkko Nikula
2011-04-18 19:21 ` [PATCH 2/3] cbus: retu: Fix build breakage caused by recent genirq commits Jarkko Nikula
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Jarkko Nikula @ 2011-04-18 19:21 UTC (permalink / raw)
To: linux-omap; +Cc: Tony Lindgren, Felipe Balbi, Jarkko Nikula
Use DEFINE_SPINLOCK() for static spinlock initialization as the commit
d04fa5a "locking: Remove deprecated lock initializers" removes the
deprecated SPIN_LOCK_UNLOCKED. Since tahvo_lock is not used elsewhere than
tahvo.c it can be removed from tahvo.h too.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
drivers/cbus/tahvo.c | 2 +-
drivers/cbus/tahvo.h | 2 --
2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/cbus/tahvo.c b/drivers/cbus/tahvo.c
index 8e2e669..45318d9 100644
--- a/drivers/cbus/tahvo.c
+++ b/drivers/cbus/tahvo.c
@@ -53,7 +53,7 @@ static int tahvo_initialized;
static int tahvo_is_betty;
static struct tasklet_struct tahvo_tasklet;
-spinlock_t tahvo_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(tahvo_lock);
struct tahvo_irq_handler_desc {
int (*func)(unsigned long);
diff --git a/drivers/cbus/tahvo.h b/drivers/cbus/tahvo.h
index 6cb6600..e5ed990 100644
--- a/drivers/cbus/tahvo.h
+++ b/drivers/cbus/tahvo.h
@@ -63,6 +63,4 @@ int tahvo_get_backlight_level(void);
int tahvo_get_max_backlight_level(void);
void tahvo_set_backlight_level(int level);
-extern spinlock_t tahvo_lock;
-
#endif /* __DRIVERS_CBUS_TAHVO_H */
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] cbus: retu: Fix build breakage caused by recent genirq commits
2011-04-18 19:21 [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal Jarkko Nikula
@ 2011-04-18 19:21 ` Jarkko Nikula
2011-04-18 19:21 ` [PATCH 3/3] omap: Fix board-nokia770.c and board-n8x0 cbus build breakage Jarkko Nikula
2011-04-19 7:07 ` [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal Tony Lindgren
2 siblings, 0 replies; 5+ messages in thread
From: Jarkko Nikula @ 2011-04-18 19:21 UTC (permalink / raw)
To: linux-omap; +Cc: Tony Lindgren, Felipe Balbi, Jarkko Nikula
Convert retu.c to use updated irq function names after the genirq cleanup
commits 0c6f8a8 "genirq: Remove compat code" and
a0cd9ca "genirq: Namespace cleanup".
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
drivers/cbus/retu.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/cbus/retu.c b/drivers/cbus/retu.c
index f271e57..ec108f3 100644
--- a/drivers/cbus/retu.c
+++ b/drivers/cbus/retu.c
@@ -298,10 +298,10 @@ static void retu_irq_init(struct retu *retu)
int irq;
for (irq = base; irq < end; irq++) {
- set_irq_chip_data(irq, retu);
- set_irq_chip_and_handler(irq, &retu_irq_chip,
+ irq_set_chip_data(irq, retu);
+ irq_set_chip_and_handler(irq, &retu_irq_chip,
handle_simple_irq);
- set_irq_nested_thread(irq, 1);
+ irq_set_nested_thread(irq, 1);
retu_irq_setup(irq);
}
}
@@ -316,8 +316,8 @@ static void retu_irq_exit(struct retu *retu)
#ifdef CONFIG_ARM
set_irq_flags(irq, 0);
#endif
- set_irq_chip_and_handler(irq, NULL, NULL);
- set_irq_chip_data(irq, NULL);
+ irq_set_chip_and_handler(irq, NULL, NULL);
+ irq_set_chip_data(irq, NULL);
}
}
@@ -479,7 +479,7 @@ static int __init retu_probe(struct platform_device *pdev)
goto err1;
}
- set_irq_wake(retu->irq, 1);
+ irq_set_irq_wake(retu->irq, 1);
/* Register power off function */
pm_power_off = retu_power_off;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] omap: Fix board-nokia770.c and board-n8x0 cbus build breakage
2011-04-18 19:21 [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal Jarkko Nikula
2011-04-18 19:21 ` [PATCH 2/3] cbus: retu: Fix build breakage caused by recent genirq commits Jarkko Nikula
@ 2011-04-18 19:21 ` Jarkko Nikula
2011-04-19 7:07 ` [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal Tony Lindgren
2 siblings, 0 replies; 5+ messages in thread
From: Jarkko Nikula @ 2011-04-18 19:21 UTC (permalink / raw)
To: linux-omap; +Cc: Tony Lindgren, Felipe Balbi, Jarkko Nikula
Fix a build breakage in CBUS initialization code in Nokia 770 and N8x0
boards that appeared after commit 0c6f8a8 "genirq: Remove compat code".
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
Build breakage that is only in linux-omap-2.6/cbus branch.
---
arch/arm/mach-omap1/board-nokia770.c | 2 +-
arch/arm/mach-omap2/board-n8x0.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index e2537b8..5d174a3 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -177,7 +177,7 @@ static void __init nokia770_cbus_init(void)
return;
}
- set_irq_type(gpio_to_irq(62), IRQ_TYPE_EDGE_RISING);
+ irq_set_irq_type(gpio_to_irq(62), IRQ_TYPE_EDGE_RISING);
retu_resource[0].start = gpio_to_irq(62);
platform_device_register(&retu_device);
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index bd7937a..9ae6dff 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -274,7 +274,7 @@ static void __init n8x0_cbus_init(void)
return;
}
- set_irq_type(gpio_to_irq(108), IRQ_TYPE_EDGE_RISING);
+ irq_set_irq_type(gpio_to_irq(108), IRQ_TYPE_EDGE_RISING);
retu_resource[0].start = gpio_to_irq(108);
platform_device_register(&retu_device);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal
2011-04-18 19:21 [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal Jarkko Nikula
2011-04-18 19:21 ` [PATCH 2/3] cbus: retu: Fix build breakage caused by recent genirq commits Jarkko Nikula
2011-04-18 19:21 ` [PATCH 3/3] omap: Fix board-nokia770.c and board-n8x0 cbus build breakage Jarkko Nikula
@ 2011-04-19 7:07 ` Tony Lindgren
2011-04-19 7:53 ` Jarkko Nikula
2 siblings, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2011-04-19 7:07 UTC (permalink / raw)
To: Jarkko Nikula; +Cc: linux-omap, Felipe Balbi
* Jarkko Nikula <jhnikula@gmail.com> [110418 12:18]:
> Use DEFINE_SPINLOCK() for static spinlock initialization as the commit
> d04fa5a "locking: Remove deprecated lock initializers" removes the
> deprecated SPIN_LOCK_UNLOCKED. Since tahvo_lock is not used elsewhere than
> tahvo.c it can be removed from tahvo.h too.
Thanks pushed all three. Looks like TAHVO_USB still fails
to compile as the otg_set_transceiver may not be compiled.
Tony
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal
2011-04-19 7:07 ` [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal Tony Lindgren
@ 2011-04-19 7:53 ` Jarkko Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jarkko Nikula @ 2011-04-19 7:53 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap, Felipe Balbi
On Tue, 19 Apr 2011 00:07:24 -0700
Tony Lindgren <tony@atomide.com> wrote:
> * Jarkko Nikula <jhnikula@gmail.com> [110418 12:18]:
> > Use DEFINE_SPINLOCK() for static spinlock initialization as the commit
> > d04fa5a "locking: Remove deprecated lock initializers" removes the
> > deprecated SPIN_LOCK_UNLOCKED. Since tahvo_lock is not used elsewhere than
> > tahvo.c it can be removed from tahvo.h too.
>
> Thanks pushed all three. Looks like TAHVO_USB still fails
> to compile as the otg_set_transceiver may not be compiled.
>
True, it fails if CONFIG_OTG_UTILS is not set and it was selected
by musb in my config. I'll send a Kconfig fix for that.
--
Jarkko
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-04-19 7:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-04-18 19:21 [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal Jarkko Nikula
2011-04-18 19:21 ` [PATCH 2/3] cbus: retu: Fix build breakage caused by recent genirq commits Jarkko Nikula
2011-04-18 19:21 ` [PATCH 3/3] omap: Fix board-nokia770.c and board-n8x0 cbus build breakage Jarkko Nikula
2011-04-19 7:07 ` [PATCH 1/3] cbus: tahvo: Fix build breakage caused by deprecated initializer removal Tony Lindgren
2011-04-19 7:53 ` Jarkko Nikula
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.