Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a167f45 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Drivers: rtc: remove __dev* attributes. 



CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
__devinitconst, and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f039790

drivers/rtc/rtc-88pm80x.c

+3 −3
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static int pm80x_rtc_resume(struct device *dev) 


static SIMPLE_DEV_PM_OPS(pm80x_rtc_pm_ops, pm80x_rtc_suspend, pm80x_rtc_resume);



static int __devinit pm80x_rtc_probe(struct platform_device *pdev)

static int pm80x_rtc_probe(struct platform_device *pdev)

{

	struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent);

	struct pm80x_platform_data *pm80x_pdata;
@@ -342,7 +342,7 @@ static int __devinit pm80x_rtc_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit pm80x_rtc_remove(struct platform_device *pdev)

static int pm80x_rtc_remove(struct platform_device *pdev)

{

	struct pm80x_rtc_info *info = platform_get_drvdata(pdev);

	platform_set_drvdata(pdev, NULL);
@@ -358,7 +358,7 @@ static struct platform_driver pm80x_rtc_driver = { 
		   .pm = &pm80x_rtc_pm_ops,

		   },

	.probe = pm80x_rtc_probe,

	.remove = __devexit_p(pm80x_rtc_remove),

	.remove = pm80x_rtc_remove,

};



module_platform_driver(pm80x_rtc_driver);

drivers/rtc/rtc-88pm860x.c

+5 −5
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static void calibrate_vrtc_work(struct work_struct *work) 
#endif



#ifdef CONFIG_OF

static int __devinit pm860x_rtc_dt_init(struct platform_device *pdev,

static int pm860x_rtc_dt_init(struct platform_device *pdev,

			      struct pm860x_rtc_info *info)

{

	struct device_node *np = pdev->dev.parent->of_node;
@@ -307,7 +307,7 @@ static int __devinit pm860x_rtc_dt_init(struct platform_device *pdev, 
#define pm860x_rtc_dt_init(x, y)	(-1)

#endif



static int __devinit pm860x_rtc_probe(struct platform_device *pdev)

static int pm860x_rtc_probe(struct platform_device *pdev)

{

	struct pm860x_chip *chip = dev_get_drvdata(pdev->dev.parent);

	struct pm860x_rtc_pdata *pdata = NULL;
@@ -412,7 +412,7 @@ static int __devinit pm860x_rtc_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit pm860x_rtc_remove(struct platform_device *pdev)

static int pm860x_rtc_remove(struct platform_device *pdev)

{

	struct pm860x_rtc_info *info = platform_get_drvdata(pdev);
@@ -459,7 +459,7 @@ static struct platform_driver pm860x_rtc_driver = { 
		.pm	= &pm860x_rtc_pm_ops,

	},

	.probe		= pm860x_rtc_probe,

	.remove		= __devexit_p(pm860x_rtc_remove),

	.remove		= pm860x_rtc_remove,

};



module_platform_driver(pm860x_rtc_driver);

drivers/rtc/rtc-ab8500.c

+3 −3
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static const struct rtc_class_ops ab8500_rtc_ops = { 
	.alarm_irq_enable	= ab8500_rtc_irq_enable,

};



static int __devinit ab8500_rtc_probe(struct platform_device *pdev)

static int ab8500_rtc_probe(struct platform_device *pdev)

{

	int err;

	struct rtc_device *rtc;
@@ -448,7 +448,7 @@ static int __devinit ab8500_rtc_probe(struct platform_device *pdev) 
	return 0;

}



static int __devexit ab8500_rtc_remove(struct platform_device *pdev)

static int ab8500_rtc_remove(struct platform_device *pdev)

{

	struct rtc_device *rtc = platform_get_drvdata(pdev);

	int irq = platform_get_irq_byname(pdev, "ALARM");
@@ -468,7 +468,7 @@ static struct platform_driver ab8500_rtc_driver = { 
		.owner = THIS_MODULE,

	},

	.probe	= ab8500_rtc_probe,

	.remove = __devexit_p(ab8500_rtc_remove),

	.remove = ab8500_rtc_remove,

};



module_platform_driver(ab8500_rtc_driver);

drivers/rtc/rtc-at91sam9.c

+3 −3
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static const struct rtc_class_ops at91_rtc_ops = { 
/*

 * Initialize and install RTC driver

 */

static int __devinit at91_rtc_probe(struct platform_device *pdev)

static int at91_rtc_probe(struct platform_device *pdev)

{

	struct resource	*r, *r_gpbr;

	struct sam9_rtc	*rtc;
@@ -387,7 +387,7 @@ static int __devinit at91_rtc_probe(struct platform_device *pdev) 
/*

 * Disable and remove the RTC driver

 */

static int __devexit at91_rtc_remove(struct platform_device *pdev)

static int at91_rtc_remove(struct platform_device *pdev)

{

	struct sam9_rtc	*rtc = platform_get_drvdata(pdev);

	u32		mr = rtt_readl(rtc, MR);
@@ -463,7 +463,7 @@ static int at91_rtc_resume(struct platform_device *pdev) 


static struct platform_driver at91_rtc_driver = {

	.probe		= at91_rtc_probe,

	.remove		= __devexit_p(at91_rtc_remove),

	.remove		= at91_rtc_remove,

	.shutdown	= at91_rtc_shutdown,

	.suspend	= at91_rtc_suspend,

	.resume		= at91_rtc_resume,

drivers/rtc/rtc-au1xxx.c

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static struct rtc_class_ops au1xtoy_rtc_ops = { 
	.set_time	= au1xtoy_rtc_set_time,

};



static int __devinit au1xtoy_rtc_probe(struct platform_device *pdev)

static int au1xtoy_rtc_probe(struct platform_device *pdev)

{

	struct rtc_device *rtcdev;

	unsigned long t;
@@ -116,7 +116,7 @@ static int __devinit au1xtoy_rtc_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit au1xtoy_rtc_remove(struct platform_device *pdev)

static int au1xtoy_rtc_remove(struct platform_device *pdev)

{

	struct rtc_device *rtcdev = platform_get_drvdata(pdev);
@@ -131,7 +131,7 @@ static struct platform_driver au1xrtc_driver = { 
		.name	= "rtc-au1xxx",

		.owner	= THIS_MODULE,

	},

	.remove		= __devexit_p(au1xtoy_rtc_remove),

	.remove		= au1xtoy_rtc_remove,

};



static int __init au1xtoy_rtc_init(void)