[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-248-g777bc9f

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  777bc9f02f55eb5d6d545930b6366b0988de1b49 (commit)
       via  47027dcf078bd56bf1666e1a7475a4b05ed80972 (commit)
      from  3a2592e28baae64eaab2b02cf2881b5362525d92 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 777bc9f02f55eb5d6d545930b6366b0988de1b49
Merge: 47027dc 3a2592e
Author: Fabien Marteau <fab...@ar...>
Date:   Tue May 21 15:06:12 2013 +0200

    Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code

commit 47027dcf078bd56bf1666e1a7475a4b05ed80972
Author: Fabien Marteau <fab...@ar...>
Date:   Tue May 21 15:05:47 2013 +0200

    [kernel][module][fpga][virtual_component][irq_ocore] remove properly

-----------------------------------------------------------------------

Summary of changes:
 .../twin_uart/irq_mngr/twin_uarts_irq_mng.c        |    3 ++-
 .../fpga/virtual_components/irq_mngr/main.c        |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/twin_uarts_irq_mng.c b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/twin_uarts_irq_mng.c
index 0727225..9d81129 100644
--- a/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/twin_uarts_irq_mng.c
+++ b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/twin_uarts_irq_mng.c
@@ -55,7 +55,7 @@ static struct ocore_irq_mng_pdata irq_mng0_data = {
 	.idoffset	= 0x06,
 };
 
-void irq_mng0_release(struct device *dev)
+static void irq_mng0_release(struct device *dev)
 {
 	dev_dbg(dev, "released\n");
 }
@@ -87,6 +87,7 @@ static int __init board_irq_mng_init(void)
 		return -EINVAL;
 #endif
 	set_irq_type(ARMADEUS_FPGA_IRQ, IRQ_TYPE_EDGE_RISING);
+
 	return platform_device_register(&irq_mng0_device);
 }
 
diff --git a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
index 26fa3d4..d57af34 100644
--- a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
+++ b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
@@ -260,6 +260,7 @@ static int __devinit ocore_irq_mng_probe(struct platform_device *pdev)
 		ret = -ENOMEM;
 		goto out_release_mem;
 	}
+	pdata->mng = mng;
 
 	mng->membase = ioremap(mem_res->start, resource_size(mem_res));
 	if (!mng->membase) {
@@ -330,7 +331,7 @@ out_release_mem:
 static int __devexit ocore_irq_mng_remove(struct platform_device *pdev)
 {
 	struct ocore_irq_mng_pdata *pdata = pdev->dev.platform_data;
-	struct irq_mng *mng = (*pdata).mng;
+	struct irq_mng *mng = pdata->mng;
 	unsigned int irq;
 
 	for (irq = IRQ_FPGA(0); irq < IRQ_FPGA(NB_IT); irq++) {


hooks/post-receive
-- 
armadeus