[PATCH 01/19] rtc: rtc-mv: remove erroneous __exit annotation

[PATCH 01/19] rtc: rtc-mv: remove erroneous __exit annotation

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-mv.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c
index 57233c8..8cb15d2 100644
--- a/drivers/rtc/rtc-mv.c
+++ b/drivers/rtc/rtc-mv.c
@@ -284,7 +284,7 @@ static int mv_rtc_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __exit mv_rtc_remove(struct platform_device *pdev)
+static int mv_rtc_remove(struct platform_device *pdev)
 {
 	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
@@ -303,7 +303,7 @@ static struct of_device_id rtc_mv_of_match_table[] = {
 #endif
 
 static struct platform_driver mv_rtc_driver = {
-	.remove		= __exit_p(mv_rtc_remove),
+	.remove		= mv_rtc_remove,
 	.driver		= {
 		.name	= "rtc-mv",
 		.owner	= THIS_MODULE,
-- 
1.7.2.5

[PATCH 02/19] rtc: rtc-davinci: remove erroneous __init annotation

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-davinci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c
index 56b7308..893bfc0 100644
--- a/drivers/rtc/rtc-davinci.c
+++ b/drivers/rtc/rtc-davinci.c
@@ -478,7 +478,7 @@ static struct rtc_class_ops davinci_rtc_ops = {
 	.set_alarm		= davinci_rtc_set_alarm,
 };
 
-static int __init davinci_rtc_probe(struct platform_device *pdev)
+static int davinci_rtc_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct davinci_rtc *davinci_rtc;
-- 
1.7.2.5

[PATCH 03/19] rtc: rtc-ds1302: remove erroneous __init annotation

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-ds1302.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c
index fdbcdb2..fad99ba 100644
--- a/drivers/rtc/rtc-ds1302.c
+++ b/drivers/rtc/rtc-ds1302.c
@@ -205,7 +205,7 @@ static struct rtc_class_ops ds1302_rtc_ops = {
 	.ioctl		= ds1302_rtc_ioctl,
 };
 
-static int __init ds1302_rtc_probe(struct platform_device *pdev)
+static int ds1302_rtc_probe(struct platform_device *pdev)
 {
 	struct rtc_device *rtc;
 
-- 
1.7.2.5

[PATCH 04/19] rtc: omap: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-omap.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index 6009714..366e220 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -322,7 +322,7 @@ static const struct of_device_id omap_rtc_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, omap_rtc_of_match);
 
-static int __init omap_rtc_probe(struct platform_device *pdev)
+static int omap_rtc_probe(struct platform_device *pdev)
 {
 	struct resource		*res, *mem;
 	struct rtc_device	*rtc;
@@ -461,7 +461,7 @@ fail:
 	return -EIO;
 }
 
-static int __exit omap_rtc_remove(struct platform_device *pdev)
+static int omap_rtc_remove(struct platform_device *pdev)
 {
 	struct rtc_device	*rtc = platform_get_drvdata(pdev);
 	struct resource		*mem = dev_get_drvdata(&rtc->dev);
@@ -538,7 +538,7 @@ static void omap_rtc_shutdown(struct platform_device *pdev)
 
 MODULE_ALIAS("platform:omap_rtc");
 static struct platform_driver omap_rtc_driver = {
-	.remove		= __exit_p(omap_rtc_remove),
+	.remove		= omap_rtc_remove,
 	.suspend	= omap_rtc_suspend,
 	.resume		= omap_rtc_resume,
 	.shutdown	= omap_rtc_shutdown,
-- 
1.7.2.5

[PATCH 05/19] rtc: rtc-efi: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-efi.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-efi.c b/drivers/rtc/rtc-efi.c
index 1a0c37c..71ac803 100644
--- a/drivers/rtc/rtc-efi.c
+++ b/drivers/rtc/rtc-efi.c
@@ -187,7 +187,7 @@ static const struct rtc_class_ops efi_rtc_ops = {
 	.set_alarm = efi_set_alarm,
 };
 
-static int __init efi_rtc_probe(struct platform_device *dev)
+static int efi_rtc_probe(struct platform_device *dev)
 {
 	struct rtc_device *rtc;
 
@@ -201,7 +201,7 @@ static int __init efi_rtc_probe(struct platform_device *dev)
 	return 0;
 }
 
-static int __exit efi_rtc_remove(struct platform_device *dev)
+static int efi_rtc_remove(struct platform_device *dev)
 {
 	struct rtc_device *rtc = platform_get_drvdata(dev);
 
@@ -215,7 +215,7 @@ static struct platform_driver efi_rtc_driver = {
 		.name = "rtc-efi",
 		.owner = THIS_MODULE,
 	},
-	.remove = __exit_p(efi_rtc_remove),
+	.remove = efi_rtc_remove,
 };
 
 static int __init efi_rtc_init(void)
-- 
1.7.2.5

[PATCH 06/19] rtc: rtc-mc13xxx: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-mc13xxx.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-mc13xxx.c b/drivers/rtc/rtc-mc13xxx.c
index 2643d88..9ae755d 100644
--- a/drivers/rtc/rtc-mc13xxx.c
+++ b/drivers/rtc/rtc-mc13xxx.c
@@ -309,7 +309,7 @@ static irqreturn_t mc13xxx_rtc_reset_handler(int irq, void *dev)
 	return IRQ_HANDLED;
 }
 
-static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
+static int mc13xxx_rtc_probe(struct platform_device *pdev)
 {
 	int ret;
 	struct mc13xxx_rtc *priv;
@@ -378,7 +378,7 @@ err_reset_irq_request:
 	return ret;
 }
 
-static int __exit mc13xxx_rtc_remove(struct platform_device *pdev)
+static int mc13xxx_rtc_remove(struct platform_device *pdev)
 {
 	struct mc13xxx_rtc *priv = platform_get_drvdata(pdev);
 
@@ -413,7 +413,7 @@ MODULE_DEVICE_TABLE(platform, mc13xxx_rtc_idtable);
 
 static struct platform_driver mc13xxx_rtc_driver = {
 	.id_table = mc13xxx_rtc_idtable,
-	.remove = __exit_p(mc13xxx_rtc_remove),
+	.remove = mc13xxx_rtc_remove,
 	.driver = {
 		.name = DRIVER_NAME,
 		.owner = THIS_MODULE,
-- 
1.7.2.5

[PATCH 07/19] rtc: rtc-ps3: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-ps3.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-ps3.c b/drivers/rtc/rtc-ps3.c
index 968133c..8a24d11 100644
--- a/drivers/rtc/rtc-ps3.c
+++ b/drivers/rtc/rtc-ps3.c
@@ -58,7 +58,7 @@ static const struct rtc_class_ops ps3_rtc_ops = {
 	.set_time = ps3_set_time,
 };
 
-static int __init ps3_rtc_probe(struct platform_device *dev)
+static int ps3_rtc_probe(struct platform_device *dev)
 {
 	struct rtc_device *rtc;
 
@@ -71,7 +71,7 @@ static int __init ps3_rtc_probe(struct platform_device *dev)
 	return 0;
 }
 
-static int __exit ps3_rtc_remove(struct platform_device *dev)
+static int ps3_rtc_remove(struct platform_device *dev)
 {
 	rtc_device_unregister(platform_get_drvdata(dev));
 	return 0;
@@ -82,7 +82,7 @@ static struct platform_driver ps3_rtc_driver = {
 		.name = "rtc-ps3",
 		.owner = THIS_MODULE,
 	},
-	.remove = __exit_p(ps3_rtc_remove),
+	.remove = ps3_rtc_remove,
 };
 
 static int __init ps3_rtc_init(void)
-- 
1.7.2.5

Re: [PATCH 07/19] rtc: rtc-ps3: remove erroneous __init/__exit annotations

[Geert Uytterhoeven]

On Thu, Feb 28, 2013 at 9:41 AM, Jingoo Han <jg1.han@samsung.com> wrote:
> __init/__exit annotations for probe()/remove() are supposed to be
> __devinit/__devexit, because __init/__exit for probe()/remove()
> are not correct. However, __devinit/__devexit are not used,
> because CONFIG_HOTPLUG was removed. Thus, these annotations
> should be removed.

Nack.

This driver does not use platform_driver_register(), but
platform_driver_probe().
Hence the .probe can only be called from platform_driver_probe()
(which is __init),
not at any later time.

I did not check the other drivers you sent patches for.

> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
>  drivers/rtc/rtc-ps3.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/rtc/rtc-ps3.c b/drivers/rtc/rtc-ps3.c
> index 968133c..8a24d11 100644
> --- a/drivers/rtc/rtc-ps3.c
> +++ b/drivers/rtc/rtc-ps3.c
> @@ -58,7 +58,7 @@ static const struct rtc_class_ops ps3_rtc_ops = {
>         .set_time = ps3_set_time,
>  };
>
> -static int __init ps3_rtc_probe(struct platform_device *dev)
> +static int ps3_rtc_probe(struct platform_device *dev)
>  {
>         struct rtc_device *rtc;
>
> @@ -71,7 +71,7 @@ static int __init ps3_rtc_probe(struct platform_device *dev)
>         return 0;
>  }
>
> -static int __exit ps3_rtc_remove(struct platform_device *dev)
> +static int ps3_rtc_remove(struct platform_device *dev)
>  {
>         rtc_device_unregister(platform_get_drvdata(dev));
>         return 0;
> @@ -82,7 +82,7 @@ static struct platform_driver ps3_rtc_driver = {
>                 .name = "rtc-ps3",
>                 .owner = THIS_MODULE,
>         },
> -       .remove = __exit_p(ps3_rtc_remove),
> +       .remove = ps3_rtc_remove,
>  };
>
>  static int __init ps3_rtc_init(void)

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 07/19] rtc: rtc-ps3: remove erroneous __init/__exit annotations

[Jingoo Han]

On Thursday, February 28, 2013 5:56 PM, Geert Uytterhoeven wrote:
> 
> On Thu, Feb 28, 2013 at 9:41 AM, Jingoo Han <jg1.han@samsung.com> wrote:
> > __init/__exit annotations for probe()/remove() are supposed to be
> > __devinit/__devexit, because __init/__exit for probe()/remove()
> > are not correct. However, __devinit/__devexit are not used,
> > because CONFIG_HOTPLUG was removed. Thus, these annotations
> > should be removed.
> 
> Nack.
> 
> This driver does not use platform_driver_register(), but
> platform_driver_probe().
> Hence the .probe can only be called from platform_driver_probe()
> (which is __init),
> not at any later time.

Oops, you are right.
In this case, bind/unbind via sysfs is disabled.

Also, other drivers I sent for use platform_driver_probe().
So, my patchset is useless. 

Thank you for your comment :)


Best regards,
Jingoo Han

> 
> I did not check the other drivers you sent patches for.
> 
> > Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> > ---
> >  drivers/rtc/rtc-ps3.c |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/rtc/rtc-ps3.c b/drivers/rtc/rtc-ps3.c
> > index 968133c..8a24d11 100644
> > --- a/drivers/rtc/rtc-ps3.c
> > +++ b/drivers/rtc/rtc-ps3.c
> > @@ -58,7 +58,7 @@ static const struct rtc_class_ops ps3_rtc_ops = {
> >         .set_time = ps3_set_time,
> >  };
> >
> > -static int __init ps3_rtc_probe(struct platform_device *dev)
> > +static int ps3_rtc_probe(struct platform_device *dev)
> >  {
> >         struct rtc_device *rtc;
> >
> > @@ -71,7 +71,7 @@ static int __init ps3_rtc_probe(struct platform_device *dev)
> >         return 0;
> >  }
> >
> > -static int __exit ps3_rtc_remove(struct platform_device *dev)
> > +static int ps3_rtc_remove(struct platform_device *dev)
> >  {
> >         rtc_device_unregister(platform_get_drvdata(dev));
> >         return 0;
> > @@ -82,7 +82,7 @@ static struct platform_driver ps3_rtc_driver = {
> >                 .name = "rtc-ps3",
> >                 .owner = THIS_MODULE,
> >         },
> > -       .remove = __exit_p(ps3_rtc_remove),
> > +       .remove = ps3_rtc_remove,
> >  };
> >
> >  static int __init ps3_rtc_init(void)
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds

[PATCH 08/19] rtc: rtc-coh901331: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-coh901331.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c
index 2d28ec1..a166a37 100644
--- a/drivers/rtc/rtc-coh901331.c
+++ b/drivers/rtc/rtc-coh901331.c
@@ -150,7 +150,7 @@ static struct rtc_class_ops coh901331_ops = {
 	.alarm_irq_enable = coh901331_alarm_irq_enable,
 };
 
-static int __exit coh901331_remove(struct platform_device *pdev)
+static int coh901331_remove(struct platform_device *pdev)
 {
 	struct coh901331_port *rtap = dev_get_drvdata(&pdev->dev);
 
@@ -164,7 +164,7 @@ static int __exit coh901331_remove(struct platform_device *pdev)
 }
 
 
-static int __init coh901331_probe(struct platform_device *pdev)
+static int coh901331_probe(struct platform_device *pdev)
 {
 	int ret;
 	struct coh901331_port *rtap;
@@ -281,7 +281,7 @@ static struct platform_driver coh901331_driver = {
 		.name = "rtc-coh901331",
 		.owner = THIS_MODULE,
 	},
-	.remove = __exit_p(coh901331_remove),
+	.remove = coh901331_remove,
 	.suspend = coh901331_suspend,
 	.resume = coh901331_resume,
 	.shutdown = coh901331_shutdown,
-- 
1.7.2.5

[PATCH 09/19] rtc: rtc-pxa: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-pxa.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c
index 03c85ee..eb874d0 100644
--- a/drivers/rtc/rtc-pxa.c
+++ b/drivers/rtc/rtc-pxa.c
@@ -317,7 +317,7 @@ static const struct rtc_class_ops pxa_rtc_ops = {
 	.proc = pxa_rtc_proc,
 };
 
-static int __init pxa_rtc_probe(struct platform_device *pdev)
+static int pxa_rtc_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct pxa_rtc *pxa_rtc;
@@ -390,7 +390,7 @@ err_map:
 	return ret;
 }
 
-static int __exit pxa_rtc_remove(struct platform_device *pdev)
+static int pxa_rtc_remove(struct platform_device *pdev)
 {
 	struct pxa_rtc *pxa_rtc = platform_get_drvdata(pdev);
 
@@ -442,7 +442,7 @@ static const struct dev_pm_ops pxa_rtc_pm_ops = {
 #endif
 
 static struct platform_driver pxa_rtc_driver = {
-	.remove		= __exit_p(pxa_rtc_remove),
+	.remove		= pxa_rtc_remove,
 	.driver		= {
 		.name	= "pxa-rtc",
 		.of_match_table = of_match_ptr(pxa_rtc_dt_ids),
-- 
1.7.2.5

[PATCH 10/19] rtc: rtc-rp5c01: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-rp5c01.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-rp5c01.c b/drivers/rtc/rtc-rp5c01.c
index 359da6d..da4f6c4 100644
--- a/drivers/rtc/rtc-rp5c01.c
+++ b/drivers/rtc/rtc-rp5c01.c
@@ -219,7 +219,7 @@ static ssize_t rp5c01_nvram_write(struct file *filp, struct kobject *kobj,
 	return count;
 }
 
-static int __init rp5c01_rtc_probe(struct platform_device *dev)
+static int rp5c01_rtc_probe(struct platform_device *dev)
 {
 	struct resource *res;
 	struct rp5c01_priv *priv;
@@ -275,7 +275,7 @@ out_free_priv:
 	return error;
 }
 
-static int __exit rp5c01_rtc_remove(struct platform_device *dev)
+static int rp5c01_rtc_remove(struct platform_device *dev)
 {
 	struct rp5c01_priv *priv = platform_get_drvdata(dev);
 
@@ -291,7 +291,7 @@ static struct platform_driver rp5c01_rtc_driver = {
 		.name	= "rtc-rp5c01",
 		.owner	= THIS_MODULE,
 	},
-	.remove	= __exit_p(rp5c01_rtc_remove),
+	.remove	= rp5c01_rtc_remove,
 };
 
 static int __init rp5c01_rtc_init(void)
-- 
1.7.2.5

[PATCH 11/19] rtc: rtc-at32ap700x: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-at32ap700x.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-at32ap700x.c b/drivers/rtc/rtc-at32ap700x.c
index 8dd0830..1f2b262 100644
--- a/drivers/rtc/rtc-at32ap700x.c
+++ b/drivers/rtc/rtc-at32ap700x.c
@@ -195,7 +195,7 @@ static struct rtc_class_ops at32_rtc_ops = {
 	.alarm_irq_enable = at32_rtc_alarm_irq_enable,
 };
 
-static int __init at32_rtc_probe(struct platform_device *pdev)
+static int at32_rtc_probe(struct platform_device *pdev)
 {
 	struct resource	*regs;
 	struct rtc_at32ap700x *rtc;
@@ -277,7 +277,7 @@ out:
 	return ret;
 }
 
-static int __exit at32_rtc_remove(struct platform_device *pdev)
+static int at32_rtc_remove(struct platform_device *pdev)
 {
 	struct rtc_at32ap700x *rtc = platform_get_drvdata(pdev);
 
@@ -295,7 +295,7 @@ static int __exit at32_rtc_remove(struct platform_device *pdev)
 MODULE_ALIAS("platform:at32ap700x_rtc");
 
 static struct platform_driver at32_rtc_driver = {
-	.remove		= __exit_p(at32_rtc_remove),
+	.remove		= at32_rtc_remove,
 	.driver		= {
 		.name	= "at32ap700x_rtc",
 		.owner	= THIS_MODULE,
-- 
1.7.2.5

[PATCH 12/19] rtc: rtc-ab3100: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-ab3100.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-ab3100.c b/drivers/rtc/rtc-ab3100.c
index 261a07e..c02ce69 100644
--- a/drivers/rtc/rtc-ab3100.c
+++ b/drivers/rtc/rtc-ab3100.c
@@ -199,7 +199,7 @@ static const struct rtc_class_ops ab3100_rtc_ops = {
 	.alarm_irq_enable = ab3100_rtc_irq_enable,
 };
 
-static int __init ab3100_rtc_probe(struct platform_device *pdev)
+static int ab3100_rtc_probe(struct platform_device *pdev)
 {
 	int err;
 	u8 regval;
@@ -240,7 +240,7 @@ static int __init ab3100_rtc_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __exit ab3100_rtc_remove(struct platform_device *pdev)
+static int ab3100_rtc_remove(struct platform_device *pdev)
 {
 	struct rtc_device *rtc = platform_get_drvdata(pdev);
 
@@ -254,7 +254,7 @@ static struct platform_driver ab3100_rtc_driver = {
 		.name = "ab3100-rtc",
 		.owner = THIS_MODULE,
 	},
-	.remove	 = __exit_p(ab3100_rtc_remove),
+	.remove	 = ab3100_rtc_remove,
 };
 
 static int __init ab3100_rtc_init(void)
-- 
1.7.2.5

[PATCH 13/19] rtc: rtc-at91rm9200: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-at91rm9200.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index 434ebc3..055dafa 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -260,7 +260,7 @@ static const struct rtc_class_ops at91_rtc_ops = {
 /*
  * Initialize and install RTC driver
  */
-static int __init at91_rtc_probe(struct platform_device *pdev)
+static int at91_rtc_probe(struct platform_device *pdev)
 {
 	struct rtc_device *rtc;
 	struct resource *regs;
@@ -321,7 +321,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
 /*
  * Disable and remove the RTC driver
  */
-static int __exit at91_rtc_remove(struct platform_device *pdev)
+static int at91_rtc_remove(struct platform_device *pdev)
 {
 	struct rtc_device *rtc = platform_get_drvdata(pdev);
 
@@ -382,7 +382,7 @@ static const struct dev_pm_ops at91_rtc_pm = {
 #endif
 
 static struct platform_driver at91_rtc_driver = {
-	.remove		= __exit_p(at91_rtc_remove),
+	.remove		= at91_rtc_remove,
 	.driver		= {
 		.name	= "at91_rtc",
 		.owner	= THIS_MODULE,
-- 
1.7.2.5

[PATCH 14/19] rtc: msm6242: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-msm6242.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-msm6242.c b/drivers/rtc/rtc-msm6242.c
index fcb113c..b1d432f 100644
--- a/drivers/rtc/rtc-msm6242.c
+++ b/drivers/rtc/rtc-msm6242.c
@@ -194,7 +194,7 @@ static const struct rtc_class_ops msm6242_rtc_ops = {
 	.set_time	= msm6242_set_time,
 };
 
-static int __init msm6242_rtc_probe(struct platform_device *dev)
+static int msm6242_rtc_probe(struct platform_device *dev)
 {
 	struct resource *res;
 	struct msm6242_priv *priv;
@@ -234,7 +234,7 @@ out_free_priv:
 	return error;
 }
 
-static int __exit msm6242_rtc_remove(struct platform_device *dev)
+static int msm6242_rtc_remove(struct platform_device *dev)
 {
 	struct msm6242_priv *priv = platform_get_drvdata(dev);
 
@@ -249,7 +249,7 @@ static struct platform_driver msm6242_rtc_driver = {
 		.name	= "rtc-msm6242",
 		.owner	= THIS_MODULE,
 	},
-	.remove	= __exit_p(msm6242_rtc_remove),
+	.remove	= msm6242_rtc_remove,
 };
 
 static int __init msm6242_rtc_init(void)
-- 
1.7.2.5

[PATCH 15/19] rtc: rtc-tx4939: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-tx4939.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c
index a12bfac..f197773 100644
--- a/drivers/rtc/rtc-tx4939.c
+++ b/drivers/rtc/rtc-tx4939.c
@@ -237,7 +237,7 @@ static struct bin_attribute tx4939_rtc_nvram_attr = {
 	.write = tx4939_rtc_nvram_write,
 };
 
-static int __init tx4939_rtc_probe(struct platform_device *pdev)
+static int tx4939_rtc_probe(struct platform_device *pdev)
 {
 	struct rtc_device *rtc;
 	struct tx4939rtc_plat_data *pdata;
@@ -279,7 +279,7 @@ static int __init tx4939_rtc_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __exit tx4939_rtc_remove(struct platform_device *pdev)
+static int tx4939_rtc_remove(struct platform_device *pdev)
 {
 	struct tx4939rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
@@ -292,7 +292,7 @@ static int __exit tx4939_rtc_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver tx4939_rtc_driver = {
-	.remove		= __exit_p(tx4939_rtc_remove),
+	.remove		= tx4939_rtc_remove,
 	.driver		= {
 		.name	= "tx4939rtc",
 		.owner	= THIS_MODULE,
-- 
1.7.2.5

[PATCH 16/19] rtc: rtc-sun4v: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-sun4v.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-sun4v.c b/drivers/rtc/rtc-sun4v.c
index 59b5c2d..a819b7c 100644
--- a/drivers/rtc/rtc-sun4v.c
+++ b/drivers/rtc/rtc-sun4v.c
@@ -79,7 +79,7 @@ static const struct rtc_class_ops sun4v_rtc_ops = {
 	.set_time	= sun4v_set_time,
 };
 
-static int __init sun4v_rtc_probe(struct platform_device *pdev)
+static int sun4v_rtc_probe(struct platform_device *pdev)
 {
 	struct rtc_device *rtc = rtc_device_register("sun4v", &pdev->dev,
 				     &sun4v_rtc_ops, THIS_MODULE);
@@ -90,7 +90,7 @@ static int __init sun4v_rtc_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __exit sun4v_rtc_remove(struct platform_device *pdev)
+static int sun4v_rtc_remove(struct platform_device *pdev)
 {
 	struct rtc_device *rtc = platform_get_drvdata(pdev);
 
@@ -103,7 +103,7 @@ static struct platform_driver sun4v_rtc_driver = {
 		.name	= "rtc-sun4v",
 		.owner	= THIS_MODULE,
 	},
-	.remove		= __exit_p(sun4v_rtc_remove),
+	.remove		= sun4v_rtc_remove,
 };
 
 static int __init sun4v_rtc_init(void)
-- 
1.7.2.5

[PATCH 17/19] rtc: rtc-generic: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-generic.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-generic.c b/drivers/rtc/rtc-generic.c
index 98322004..f7fd59a 100644
--- a/drivers/rtc/rtc-generic.c
+++ b/drivers/rtc/rtc-generic.c
@@ -34,7 +34,7 @@ static const struct rtc_class_ops generic_rtc_ops = {
 	.set_time = generic_set_time,
 };
 
-static int __init generic_rtc_probe(struct platform_device *dev)
+static int generic_rtc_probe(struct platform_device *dev)
 {
 	struct rtc_device *rtc;
 
@@ -48,7 +48,7 @@ static int __init generic_rtc_probe(struct platform_device *dev)
 	return 0;
 }
 
-static int __exit generic_rtc_remove(struct platform_device *dev)
+static int generic_rtc_remove(struct platform_device *dev)
 {
 	struct rtc_device *rtc = platform_get_drvdata(dev);
 
@@ -62,7 +62,7 @@ static struct platform_driver generic_rtc_driver = {
 		.name = "rtc-generic",
 		.owner = THIS_MODULE,
 	},
-	.remove = __exit_p(generic_rtc_remove),
+	.remove = generic_rtc_remove,
 };
 
 static int __init generic_rtc_init(void)
-- 
1.7.2.5

[PATCH 18/19] rtc: rtc-sh: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-sh.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index e55a763..b75eb5c 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -585,7 +585,7 @@ static struct rtc_class_ops sh_rtc_ops = {
 	.alarm_irq_enable = sh_rtc_alarm_irq_enable,
 };
 
-static int __init sh_rtc_probe(struct platform_device *pdev)
+static int sh_rtc_probe(struct platform_device *pdev)
 {
 	struct sh_rtc *rtc;
 	struct resource *res;
@@ -747,7 +747,7 @@ err_badres:
 	return ret;
 }
 
-static int __exit sh_rtc_remove(struct platform_device *pdev)
+static int sh_rtc_remove(struct platform_device *pdev)
 {
 	struct sh_rtc *rtc = platform_get_drvdata(pdev);
 
@@ -817,7 +817,7 @@ static struct platform_driver sh_rtc_platform_driver = {
 		.owner	= THIS_MODULE,
 		.pm	= &sh_rtc_dev_pm_ops,
 	},
-	.remove		= __exit_p(sh_rtc_remove),
+	.remove		= sh_rtc_remove,
 };
 
 static int __init sh_rtc_init(void)
-- 
1.7.2.5

[PATCH 19/19] rtc: rtc-starfire: remove erroneous __init/__exit annotations

[Jingoo Han]

__init/__exit annotations for probe()/remove() are supposed to be
__devinit/__devexit, because __init/__exit for probe()/remove()
are not correct. However, __devinit/__devexit are not used,
because CONFIG_HOTPLUG was removed. Thus, these annotations
should be removed.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/rtc/rtc-starfire.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-starfire.c b/drivers/rtc/rtc-starfire.c
index 5be98bf..d801eb5 100644
--- a/drivers/rtc/rtc-starfire.c
+++ b/drivers/rtc/rtc-starfire.c
@@ -37,7 +37,7 @@ static const struct rtc_class_ops starfire_rtc_ops = {
 	.read_time	= starfire_read_time,
 };
 
-static int __init starfire_rtc_probe(struct platform_device *pdev)
+static int starfire_rtc_probe(struct platform_device *pdev)
 {
 	struct rtc_device *rtc = rtc_device_register("starfire", &pdev->dev,
 				     &starfire_rtc_ops, THIS_MODULE);
@@ -49,7 +49,7 @@ static int __init starfire_rtc_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __exit starfire_rtc_remove(struct platform_device *pdev)
+static int starfire_rtc_remove(struct platform_device *pdev)
 {
 	struct rtc_device *rtc = platform_get_drvdata(pdev);
 
@@ -63,7 +63,7 @@ static struct platform_driver starfire_rtc_driver = {
 		.name	= "rtc-starfire",
 		.owner	= THIS_MODULE,
 	},
-	.remove		= __exit_p(starfire_rtc_remove),
+	.remove		= starfire_rtc_remove,
 };
 
 static int __init starfire_rtc_init(void)
-- 
1.7.2.5