From d88607df5c50a8f0e8ce401270593db83a6aec02 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rddunlap@osdl.org>
Date: Sat, 6 Sep 2003 00:36:32 -0700
Subject: [PATCH] [PATCH] janitor: more init/exit cleanups

From: Domen Puncer <domen@coderock.org>
	and Randy Dunlap

Release (in fact all) functions shouldn't be __init or __exit, if they
are called from __init and __exit functions.
---
 drivers/ide/legacy/ali14xx.c | 2 +-
 drivers/ide/legacy/dtc2278.c | 2 +-
 drivers/ide/legacy/pdc4030.c | 6 +-----
 drivers/ide/legacy/umc8672.c | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index 55c3a29546868..ad2bae2fa7631 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -227,7 +227,7 @@ int __init probe_ali14xx (void)
 	return 0;
 }
 
-void __init ali14xx_release (void)
+static void ali14xx_release (void)
 {
 	if (ide_hwifs[0].chipset != ide_ali14xx &&
 	    ide_hwifs[1].chipset != ide_ali14xx)
diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c
index 0f87da816ab55..7e30b0933f05e 100644
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/legacy/dtc2278.c
@@ -134,7 +134,7 @@ void __init probe_dtc2278 (void)
 	probe_hwif_init(&ide_hwifs[1]);
 }
 
-void __init dtc2278_release (void)
+static void dtc2278_release (void)
 {
 	if (ide_hwifs[0].chipset != ide_dtc2278 &&
 	    ide_hwifs[1].chipset != ide_dtc2278)
diff --git a/drivers/ide/legacy/pdc4030.c b/drivers/ide/legacy/pdc4030.c
index 0757841a51de6..ccf7e9c4847ab 100644
--- a/drivers/ide/legacy/pdc4030.c
+++ b/drivers/ide/legacy/pdc4030.c
@@ -297,11 +297,7 @@ int __init detect_pdc4030(ide_hwif_t *hwif)
 }
 
 
-#ifndef MODULE
-void __init ide_probe_for_pdc4030(void)
-#else
-int ide_probe_for_pdc4030(void)
-#endif
+static int __init ide_probe_for_pdc4030(void)
 {
 	unsigned int	index;
 	ide_hwif_t	*hwif;
diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c
index 64fee6a1c919a..876df2d72a0cf 100644
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/legacy/umc8672.c
@@ -160,7 +160,7 @@ int __init probe_umc8672 (void)
 	return 0;
 }
 
-void __init umc8672_release (void)
+static void umc8672_release (void)
 {
 	unsigned long flags;
 
-- 
2.53.0