deleted 3.0 and 3.4 musb patch that shouldn't have been there

diff --git a/queue-3.0/series b/queue-3.0/series
index 730aaaf1d22b648a1fc5e6d8d0d09fd8fdc5db1b..4a3c89cccb1e262585c3ffb29c1dfe02cca41e69 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -2,7 +2,6 @@ drm-i915-invalidate-the-relocation-presumed_offsets-along-the-slow-path.patch
 ftrace-be-first-to-run-code-modification-on-modules.patch
 pci-allow-pcie_aspm-force-even-when-fadt-indicates-it-is-unsupported.patch
 usb-uhci-fix-irq-race-during-initialization.patch
-usb-musb-cppi_dma-drop-__init-annotation.patch
 scsi-sd-reshuffle-init_sd-to-avoid-crash.patch
 drivers-firmware-dmi_scan.c-check-dmi-version-when-get.patch
 drivers-firmware-dmi_scan.c-fetch-dmi-version-from-smbios-if-it-exists.patch

diff --git a/queue-3.0/usb-musb-cppi_dma-drop-__init-annotation.patch b/queue-3.0/usb-musb-cppi_dma-drop-__init-annotation.patch
deleted file mode 100644 (file)
index 29475cd..0000000
--- a/queue-3.0/usb-musb-cppi_dma-drop-__init-annotation.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 091a62c9b3d899d99dbf4e3dbebc8dfa3edbccdd Mon Sep 17 00:00:00 2001
-From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
-Date: Fri, 14 Dec 2012 21:30:27 +0300
-Subject: usb: musb: cppi_dma: drop '__init' annotation
-
-From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
-
-commit 091a62c9b3d899d99dbf4e3dbebc8dfa3edbccdd upstream.
-
-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>
-Signed-off-by: Felipe Balbi <balbi@ti.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/musb/cppi_dma.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/usb/musb/cppi_dma.c
-+++ b/drivers/usb/musb/cppi_dma.c
-@@ -104,7 +104,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 cppi_pool_init(struct cppi *cppi, struct cppi_channel *c)
- {
-       int     j;
- 
-@@ -149,7 +149,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 cppi_controller_start(struct dma_controller *c)
- {
-       struct cppi     *controller;
-       void __iomem    *tibase;

diff --git a/queue-3.4/series b/queue-3.4/series
index 17b505aacf6a44ec2fe82865273b200ad4ed306a..267988206e13cf7e28242042160be3c4db047940 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -11,7 +11,6 @@ pci-pciehp-use-per-slot-workqueues-to-avoid-deadlock.patch
 pci-shpchp-handle-push-button-event-asynchronously.patch
 usb-uhci-fix-irq-race-during-initialization.patch
 usb-dwc3-gadget-fix-ep-maxburst-for-ep0.patch
-usb-musb-cppi_dma-drop-__init-annotation.patch
 scsi-sd-reshuffle-init_sd-to-avoid-crash.patch
 drivers-firmware-dmi_scan.c-check-dmi-version-when-get.patch
 drivers-firmware-dmi_scan.c-fetch-dmi-version-from-smbios-if-it-exists.patch

diff --git a/queue-3.4/usb-musb-cppi_dma-drop-__init-annotation.patch b/queue-3.4/usb-musb-cppi_dma-drop-__init-annotation.patch
deleted file mode 100644 (file)
index 29475cd..0000000
--- a/queue-3.4/usb-musb-cppi_dma-drop-__init-annotation.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 091a62c9b3d899d99dbf4e3dbebc8dfa3edbccdd Mon Sep 17 00:00:00 2001
-From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
-Date: Fri, 14 Dec 2012 21:30:27 +0300
-Subject: usb: musb: cppi_dma: drop '__init' annotation
-
-From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
-
-commit 091a62c9b3d899d99dbf4e3dbebc8dfa3edbccdd upstream.
-
-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>
-Signed-off-by: Felipe Balbi <balbi@ti.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/usb/musb/cppi_dma.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/usb/musb/cppi_dma.c
-+++ b/drivers/usb/musb/cppi_dma.c
-@@ -104,7 +104,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 cppi_pool_init(struct cppi *cppi, struct cppi_channel *c)
- {
-       int     j;
- 
-@@ -149,7 +149,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 cppi_controller_start(struct dma_controller *c)
- {
-       struct cppi     *controller;
-       void __iomem    *tibase;