[PATCH] cppi_dma: mark cppi_controller_create() and cppi_pool_init() as '__devinit'

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This patch fixes the following:

WARNING: vmlinux.o(.devinit.text+0x24ac): Section mismatch in reference from the function dma_controller_create() to the function .init.text:cppi_controller_start()
The function __devinit dma_controller_create() references
a function __init cppi_controller_start().
If cppi_controller_start is only used by dma_controller_create then
annotate cppi_controller_start with a matching annotation.

This warning is there due to the deficiency in the commit 07a67bbb (usb: musb:
Make dma_controller_create __devinit).

Since the start() method is only called from musb_init_controller() which is
marked '__devinit', mark cppi_controller_start() '__devinit' and also mark
cppi_pool_init() as such since it gets called from that function, to avoid
another section mismatch warning...

Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # 3.7+

---
This patch is atop of 'musb' branch of Felipe's tree...

Would be good to have it in 3.7 as an amendment to the patch
that went into 3.7-rc1, but if not, I CC'ed stable kernels.

 drivers/usb/musb/cppi_dma.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: usb/drivers/usb/musb/cppi_dma.c
===================================================================
--- usb.orig/drivers/usb/musb/cppi_dma.c
+++ usb/drivers/usb/musb/cppi_dma.c
@@ -105,7 +105,7 @@ static void cppi_reset_tx(struct cppi_tx
 	musb_writel(&tx->tx_complete, 0, ptr);
 }
 
-static void __init cppi_pool_init(struct cppi *cppi, struct cppi_channel *c)
+static void __devinit cppi_pool_init(struct cppi *cppi, struct cppi_channel *c)
 {
 	int	j;
 
@@ -150,7 +150,7 @@ static void cppi_pool_free(struct cppi_c
 	c->last_processed = NULL;
 }
 
-static int __init cppi_controller_start(struct dma_controller *c)
+static int __devinit cppi_controller_start(struct dma_controller *c)
 {
 	struct cppi	*controller;
 	void __iomem	*tibase;
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux