Commit 091a62c9 authored Dec 14, 2012 by Sergei Shtylyov Committed by Felipe Balbi Jan 18, 2013

usb: musb: cppi_dma: drop '__init' annotation



This patch fixes the following:

WARNING: vmlinux.o(.text+0x1e709c): Section mismatch in reference from the funct
ion dma_controller_create() to the function .init.text:cppi_controller_start()
The function dma_controller_create() references
the function __init cppi_controller_start().
This is often because dma_controller_create lacks a __init
annotation or the annotation of cppi_controller_start is wrong.

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
not annotated, drop '__init' annotation from cppi_controller_start() and also
cppi_pool_init() since it gets called from that function, to avoid another
section mismatch warning...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: stable@vger.kernel.org # 3.7+
Signed-off-by: Felipe Balbi <balbi@ti.com>

parent 7d1f9aef

drivers/usb/musb/cppi_dma.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ static void cppi_reset_tx(struct cppi_tx_stateram __iomem *tx, u32 ptr)
		musb_writel(&tx->tx_complete, 0, ptr);
		}

		static void __init cppi_pool_init(struct cppi cppi, struct cppi_channel c)
		static void cppi_pool_init(struct cppi cppi, struct cppi_channel c)
		{
		int j;

		@@ -150,7 +150,7 @@ static void cppi_pool_free(struct cppi_channel *c)
		c->last_processed = NULL;
		}

		static int __init cppi_controller_start(struct dma_controller *c)
		static int cppi_controller_start(struct dma_controller *c)
		{
		struct cppi *controller;
		void __iomem *tibase;