dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 13:09:38 -08:00
parent 6f03979051
commit 5a167f4543
70 changed files with 209 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/rtc/rtc-88pm80x.c
View File

@ -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 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_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct pm80x_platform_data *pm80x_pdata; struct pm80x_platform_data *pm80x_pdata;
@ -342,7 +342,7 @@ out:
return ret; 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); struct pm80x_rtc_info *info = platform_get_drvdata(pdev);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
@ -358,7 +358,7 @@ static struct platform_driver pm80x_rtc_driver = {
.pm = &pm80x_rtc_pm_ops, .pm = &pm80x_rtc_pm_ops,
}, },
.probe = pm80x_rtc_probe, .probe = pm80x_rtc_probe,
.remove = __devexit_p(pm80x_rtc_remove), .remove = pm80x_rtc_remove,
}; };
module_platform_driver(pm80x_rtc_driver); module_platform_driver(pm80x_rtc_driver);

10
drivers/rtc/rtc-88pm860x.c
View File

@ -286,8 +286,8 @@ out:
#endif #endif
#ifdef CONFIG_OF #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 pm860x_rtc_info *info)
{ {
struct device_node *np = pdev->dev.parent->of_node; struct device_node *np = pdev->dev.parent->of_node;
int ret; int ret;
@ -307,7 +307,7 @@ static int __devinit pm860x_rtc_dt_init(struct platform_device *pdev,
#define pm860x_rtc_dt_init(x, y) (-1) #define pm860x_rtc_dt_init(x, y) (-1)
#endif #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_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct pm860x_rtc_pdata *pdata = NULL; struct pm860x_rtc_pdata *pdata = NULL;
@ -412,7 +412,7 @@ out:
return ret; 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); 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, .pm = &pm860x_rtc_pm_ops,
}, },
.probe = pm860x_rtc_probe, .probe = pm860x_rtc_probe,
.remove = __devexit_p(pm860x_rtc_remove), .remove = pm860x_rtc_remove,
}; };
module_platform_driver(pm860x_rtc_driver); module_platform_driver(pm860x_rtc_driver);

6
drivers/rtc/rtc-ab8500.c
View File

@ -389,7 +389,7 @@ static const struct rtc_class_ops ab8500_rtc_ops = {
.alarm_irq_enable = ab8500_rtc_irq_enable, .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; int err;
struct rtc_device *rtc; struct rtc_device *rtc;
@ -448,7 +448,7 @@ static int __devinit ab8500_rtc_probe(struct platform_device *pdev)
return 0; 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); struct rtc_device *rtc = platform_get_drvdata(pdev);
int irq = platform_get_irq_byname(pdev, "ALARM"); int irq = platform_get_irq_byname(pdev, "ALARM");
@ -468,7 +468,7 @@ static struct platform_driver ab8500_rtc_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ab8500_rtc_probe, .probe = ab8500_rtc_probe,
.remove = __devexit_p(ab8500_rtc_remove), .remove = ab8500_rtc_remove,
}; };
module_platform_driver(ab8500_rtc_driver); module_platform_driver(ab8500_rtc_driver);

6
drivers/rtc/rtc-at91sam9.c
View File

@ -289,7 +289,7 @@ static const struct rtc_class_ops at91_rtc_ops = {
/* /*
* Initialize and install RTC driver * 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 resource *r, *r_gpbr;
struct sam9_rtc *rtc; struct sam9_rtc *rtc;
@ -387,7 +387,7 @@ fail:
/* /*
* Disable and remove the RTC driver * 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); struct sam9_rtc *rtc = platform_get_drvdata(pdev);
u32 mr = rtt_readl(rtc, MR); 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 = { static struct platform_driver at91_rtc_driver = {
.probe = at91_rtc_probe, .probe = at91_rtc_probe,
.remove = __devexit_p(at91_rtc_remove), .remove = at91_rtc_remove,
.shutdown = at91_rtc_shutdown, .shutdown = at91_rtc_shutdown,
.suspend = at91_rtc_suspend, .suspend = at91_rtc_suspend,
.resume = at91_rtc_resume, .resume = at91_rtc_resume,

6
drivers/rtc/rtc-au1xxx.c
View File

@ -62,7 +62,7 @@ static struct rtc_class_ops au1xtoy_rtc_ops = {
.set_time = au1xtoy_rtc_set_time, .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; struct rtc_device *rtcdev;
unsigned long t; unsigned long t;
@ -116,7 +116,7 @@ out_err:
return ret; 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); struct rtc_device *rtcdev = platform_get_drvdata(pdev);
@ -131,7 +131,7 @@ static struct platform_driver au1xrtc_driver = {
.name = "rtc-au1xxx", .name = "rtc-au1xxx",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.remove = __devexit_p(au1xtoy_rtc_remove), .remove = au1xtoy_rtc_remove,
}; };
static int __init au1xtoy_rtc_init(void) static int __init au1xtoy_rtc_init(void)

6
drivers/rtc/rtc-bfin.c
View File

@ -342,7 +342,7 @@ static struct rtc_class_ops bfin_rtc_ops = {
.alarm_irq_enable = bfin_rtc_alarm_irq_enable, .alarm_irq_enable = bfin_rtc_alarm_irq_enable,
}; };
static int __devinit bfin_rtc_probe(struct platform_device *pdev) static int bfin_rtc_probe(struct platform_device *pdev)
{ {
struct bfin_rtc *rtc; struct bfin_rtc *rtc;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -388,7 +388,7 @@ err:
return ret; return ret;
} }
static int __devexit bfin_rtc_remove(struct platform_device *pdev) static int bfin_rtc_remove(struct platform_device *pdev)
{ {
struct bfin_rtc *rtc = platform_get_drvdata(pdev); struct bfin_rtc *rtc = platform_get_drvdata(pdev);
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -451,7 +451,7 @@ static struct platform_driver bfin_rtc_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = bfin_rtc_probe, .probe = bfin_rtc_probe,
.remove = __devexit_p(bfin_rtc_remove), .remove = bfin_rtc_remove,
.suspend = bfin_rtc_suspend, .suspend = bfin_rtc_suspend,
.resume = bfin_rtc_resume, .resume = bfin_rtc_resume,
}; };

4
drivers/rtc/rtc-bq32k.c
View File

@ -163,7 +163,7 @@ static int bq32k_probe(struct i2c_client *client,
return 0; return 0;
} }
static int __devexit bq32k_remove(struct i2c_client *client) static int bq32k_remove(struct i2c_client *client)
{ {
struct rtc_device *rtc = i2c_get_clientdata(client); struct rtc_device *rtc = i2c_get_clientdata(client);
@ -183,7 +183,7 @@ static struct i2c_driver bq32k_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = bq32k_probe, .probe = bq32k_probe,
.remove = __devexit_p(bq32k_remove), .remove = bq32k_remove,
.id_table = bq32k_id, .id_table = bq32k_id,
}; };

6
drivers/rtc/rtc-bq4802.c
View File

@ -140,7 +140,7 @@ static const struct rtc_class_ops bq4802_ops = {
.set_time = bq4802_set_time, .set_time = bq4802_set_time,
}; };
static int __devinit bq4802_probe(struct platform_device *pdev) static int bq4802_probe(struct platform_device *pdev)
{ {
struct bq4802 *p = kzalloc(sizeof(*p), GFP_KERNEL); struct bq4802 *p = kzalloc(sizeof(*p), GFP_KERNEL);
int err = -ENOMEM; int err = -ENOMEM;
@ -191,7 +191,7 @@ out_free:
goto out; goto out;
} }
static int __devexit bq4802_remove(struct platform_device *pdev) static int bq4802_remove(struct platform_device *pdev)
{ {
struct bq4802 *p = platform_get_drvdata(pdev); struct bq4802 *p = platform_get_drvdata(pdev);
@ -215,7 +215,7 @@ static struct platform_driver bq4802_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = bq4802_probe, .probe = bq4802_probe,
.remove = __devexit_p(bq4802_remove), .remove = bq4802_remove,
}; };
module_platform_driver(bq4802_driver); module_platform_driver(bq4802_driver);

9
drivers/rtc/rtc-cmos.c
View File

@ -947,8 +947,7 @@ static void rtc_wake_off(struct device *dev)
*/ */
static struct cmos_rtc_board_info acpi_rtc_info; static struct cmos_rtc_board_info acpi_rtc_info;
static void __devinit static void cmos_wake_setup(struct device *dev)
cmos_wake_setup(struct device *dev)
{ {
if (acpi_disabled) if (acpi_disabled)
return; return;
@ -980,8 +979,7 @@ cmos_wake_setup(struct device *dev)
#else #else
static void __devinit static void cmos_wake_setup(struct device *dev)
cmos_wake_setup(struct device *dev)
{ {
} }
@ -991,8 +989,7 @@ cmos_wake_setup(struct device *dev)
#include <linux/pnp.h> #include <linux/pnp.h>
static int __devinit static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
{ {
cmos_wake_setup(&pnp->dev); cmos_wake_setup(&pnp->dev);

6
drivers/rtc/rtc-da9052.c
View File

@ -228,7 +228,7 @@ static const struct rtc_class_ops da9052_rtc_ops = {
.alarm_irq_enable = da9052_rtc_alarm_irq_enable, .alarm_irq_enable = da9052_rtc_alarm_irq_enable,
}; };
static int __devinit da9052_rtc_probe(struct platform_device *pdev) static int da9052_rtc_probe(struct platform_device *pdev)
{ {
struct da9052_rtc *rtc; struct da9052_rtc *rtc;
int ret; int ret;
@ -262,7 +262,7 @@ err_free_irq:
return ret; return ret;
} }
static int __devexit da9052_rtc_remove(struct platform_device *pdev) static int da9052_rtc_remove(struct platform_device *pdev)
{ {
struct da9052_rtc *rtc = pdev->dev.platform_data; struct da9052_rtc *rtc = pdev->dev.platform_data;
@ -275,7 +275,7 @@ static int __devexit da9052_rtc_remove(struct platform_device *pdev)
static struct platform_driver da9052_rtc_driver = { static struct platform_driver da9052_rtc_driver = {
.probe = da9052_rtc_probe, .probe = da9052_rtc_probe,
.remove = __devexit_p(da9052_rtc_remove), .remove = da9052_rtc_remove,
.driver = { .driver = {
.name = "da9052-rtc", .name = "da9052-rtc",
.owner = THIS_MODULE, .owner = THIS_MODULE,

4
drivers/rtc/rtc-davinci.c
View File

@ -567,7 +567,7 @@ fail2:
return ret; return ret;
} }
static int __devexit davinci_rtc_remove(struct platform_device *pdev) static int davinci_rtc_remove(struct platform_device *pdev)
{ {
struct davinci_rtc *davinci_rtc = platform_get_drvdata(pdev); struct davinci_rtc *davinci_rtc = platform_get_drvdata(pdev);
@ -589,7 +589,7 @@ static int __devexit davinci_rtc_remove(struct platform_device *pdev)
static struct platform_driver davinci_rtc_driver = { static struct platform_driver davinci_rtc_driver = {
.probe = davinci_rtc_probe, .probe = davinci_rtc_probe,
.remove = __devexit_p(davinci_rtc_remove), .remove = davinci_rtc_remove,
.driver = { .driver = {
.name = "rtc_davinci", .name = "rtc_davinci",
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/rtc/rtc-dm355evm.c
View File

@ -123,7 +123,7 @@ static struct rtc_class_ops dm355evm_rtc_ops = {
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
static int __devinit dm355evm_rtc_probe(struct platform_device *pdev) static int dm355evm_rtc_probe(struct platform_device *pdev)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
@ -139,7 +139,7 @@ static int __devinit dm355evm_rtc_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit dm355evm_rtc_remove(struct platform_device *pdev) static int dm355evm_rtc_remove(struct platform_device *pdev)
{ {
struct rtc_device *rtc = platform_get_drvdata(pdev); struct rtc_device *rtc = platform_get_drvdata(pdev);
@ -154,7 +154,7 @@ static int __devexit dm355evm_rtc_remove(struct platform_device *pdev)
*/ */
static struct platform_driver rtc_dm355evm_driver = { static struct platform_driver rtc_dm355evm_driver = {
.probe = dm355evm_rtc_probe, .probe = dm355evm_rtc_probe,
.remove = __devexit_p(dm355evm_rtc_remove), .remove = dm355evm_rtc_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "rtc-dm355evm", .name = "rtc-dm355evm",

6
drivers/rtc/rtc-ds1286.c
View File

@ -329,7 +329,7 @@ static const struct rtc_class_ops ds1286_ops = {
.alarm_irq_enable = ds1286_alarm_irq_enable, .alarm_irq_enable = ds1286_alarm_irq_enable,
}; };
static int __devinit ds1286_probe(struct platform_device *pdev) static int ds1286_probe(struct platform_device *pdev)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
struct resource *res; struct resource *res;
@ -376,7 +376,7 @@ out:
return ret; return ret;
} }
static int __devexit ds1286_remove(struct platform_device *pdev) static int ds1286_remove(struct platform_device *pdev)
{ {
struct ds1286_priv *priv = platform_get_drvdata(pdev); struct ds1286_priv *priv = platform_get_drvdata(pdev);
@ -393,7 +393,7 @@ static struct platform_driver ds1286_platform_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ds1286_probe, .probe = ds1286_probe,
.remove = __devexit_p(ds1286_remove), .remove = ds1286_remove,
}; };
module_platform_driver(ds1286_platform_driver); module_platform_driver(ds1286_platform_driver);

4
drivers/rtc/rtc-ds1302.c
View File

@ -234,7 +234,7 @@ static int __init ds1302_rtc_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit ds1302_rtc_remove(struct platform_device *pdev) static int ds1302_rtc_remove(struct platform_device *pdev)
{ {
struct rtc_device *rtc = platform_get_drvdata(pdev); struct rtc_device *rtc = platform_get_drvdata(pdev);
@ -249,7 +249,7 @@ static struct platform_driver ds1302_platform_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.remove = __devexit_p(ds1302_rtc_remove), .remove = ds1302_rtc_remove,
}; };
static int __init ds1302_rtc_init(void) static int __init ds1302_rtc_init(void)

6
drivers/rtc/rtc-ds1305.c
View File

@ -601,7 +601,7 @@ static struct bin_attribute nvram = {
* Interface to SPI stack * Interface to SPI stack
*/ */
static int __devinit ds1305_probe(struct spi_device *spi) static int ds1305_probe(struct spi_device *spi)
{ {
struct ds1305 *ds1305; struct ds1305 *ds1305;
int status; int status;
@ -787,7 +787,7 @@ fail0:
return status; return status;
} }
static int __devexit ds1305_remove(struct spi_device *spi) static int ds1305_remove(struct spi_device *spi)
{ {
struct ds1305 *ds1305 = spi_get_drvdata(spi); struct ds1305 *ds1305 = spi_get_drvdata(spi);
@ -810,7 +810,7 @@ static struct spi_driver ds1305_driver = {
.driver.name = "rtc-ds1305", .driver.name = "rtc-ds1305",
.driver.owner = THIS_MODULE, .driver.owner = THIS_MODULE,
.probe = ds1305_probe, .probe = ds1305_probe,
.remove = __devexit_p(ds1305_remove), .remove = ds1305_remove,
/* REVISIT add suspend/resume */ /* REVISIT add suspend/resume */
}; };

8
drivers/rtc/rtc-ds1307.c
View File

@ -617,8 +617,8 @@ ds1307_nvram_write(struct file *filp, struct kobject *kobj,
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
static int __devinit ds1307_probe(struct i2c_client *client, static int ds1307_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct ds1307 *ds1307; struct ds1307 *ds1307;
int err = -ENODEV; int err = -ENODEV;
@ -938,7 +938,7 @@ exit_free:
return err; return err;
} }
static int __devexit ds1307_remove(struct i2c_client *client) static int ds1307_remove(struct i2c_client *client)
{ {
struct ds1307 *ds1307 = i2c_get_clientdata(client); struct ds1307 *ds1307 = i2c_get_clientdata(client);
@ -963,7 +963,7 @@ static struct i2c_driver ds1307_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ds1307_probe, .probe = ds1307_probe,
.remove = __devexit_p(ds1307_remove), .remove = ds1307_remove,
.id_table = ds1307_id, .id_table = ds1307_id,
}; };

4
drivers/rtc/rtc-ds1374.c
View File

@ -391,7 +391,7 @@ out_free:
return ret; return ret;
} }
static int __devexit ds1374_remove(struct i2c_client *client) static int ds1374_remove(struct i2c_client *client)
{ {
struct ds1374 *ds1374 = i2c_get_clientdata(client); struct ds1374 *ds1374 = i2c_get_clientdata(client);
@ -442,7 +442,7 @@ static struct i2c_driver ds1374_driver = {
.pm = DS1374_PM, .pm = DS1374_PM,
}, },
.probe = ds1374_probe, .probe = ds1374_probe,
.remove = __devexit_p(ds1374_remove), .remove = ds1374_remove,
.id_table = ds1374_id, .id_table = ds1374_id,
}; };

6
drivers/rtc/rtc-ds1390.c
View File

@ -121,7 +121,7 @@ static const struct rtc_class_ops ds1390_rtc_ops = {
.set_time = ds1390_set_time, .set_time = ds1390_set_time,
}; };
static int __devinit ds1390_probe(struct spi_device *spi) static int ds1390_probe(struct spi_device *spi)
{ {
unsigned char tmp; unsigned char tmp;
struct ds1390 *chip; struct ds1390 *chip;
@ -156,7 +156,7 @@ static int __devinit ds1390_probe(struct spi_device *spi)
return res; return res;
} }
static int __devexit ds1390_remove(struct spi_device *spi) static int ds1390_remove(struct spi_device *spi)
{ {
struct ds1390 *chip = spi_get_drvdata(spi); struct ds1390 *chip = spi_get_drvdata(spi);
@ -172,7 +172,7 @@ static struct spi_driver ds1390_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ds1390_probe, .probe = ds1390_probe,
.remove = __devexit_p(ds1390_remove), .remove = ds1390_remove,
}; };
module_spi_driver(ds1390_driver); module_spi_driver(ds1390_driver);

8
drivers/rtc/rtc-ds1511.c
View File

@ -476,8 +476,7 @@ static struct bin_attribute ds1511_nvram_attr = {
.write = ds1511_nvram_write, .write = ds1511_nvram_write,
}; };
static int __devinit static int ds1511_rtc_probe(struct platform_device *pdev)
ds1511_rtc_probe(struct platform_device *pdev)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
struct resource *res; struct resource *res;
@ -551,8 +550,7 @@ ds1511_rtc_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit static int ds1511_rtc_remove(struct platform_device *pdev)
ds1511_rtc_remove(struct platform_device *pdev)
{ {
struct rtc_plat_data *pdata = platform_get_drvdata(pdev); struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
@ -573,7 +571,7 @@ MODULE_ALIAS("platform:ds1511");
static struct platform_driver ds1511_rtc_driver = { static struct platform_driver ds1511_rtc_driver = {
.probe = ds1511_rtc_probe, .probe = ds1511_rtc_probe,
.remove = __devexit_p(ds1511_rtc_remove), .remove = ds1511_rtc_remove,
.driver = { .driver = {
.name = "ds1511", .name = "ds1511",
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/rtc/rtc-ds1553.c
View File

@ -276,7 +276,7 @@ static struct bin_attribute ds1553_nvram_attr = {
.write = ds1553_nvram_write, .write = ds1553_nvram_write,
}; };
static int __devinit ds1553_rtc_probe(struct platform_device *pdev) static int ds1553_rtc_probe(struct platform_device *pdev)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
struct resource *res; struct resource *res;
@ -338,7 +338,7 @@ static int __devinit ds1553_rtc_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit ds1553_rtc_remove(struct platform_device *pdev) static int ds1553_rtc_remove(struct platform_device *pdev)
{ {
struct rtc_plat_data *pdata = platform_get_drvdata(pdev); struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
@ -354,7 +354,7 @@ MODULE_ALIAS("platform:rtc-ds1553");
static struct platform_driver ds1553_rtc_driver = { static struct platform_driver ds1553_rtc_driver = {
.probe = ds1553_rtc_probe, .probe = ds1553_rtc_probe,
.remove = __devexit_p(ds1553_rtc_remove), .remove = ds1553_rtc_remove,
.driver = { .driver = {
.name = "rtc-ds1553", .name = "rtc-ds1553",
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/rtc/rtc-ds1742.c
View File

@ -159,7 +159,7 @@ static ssize_t ds1742_nvram_write(struct file *filp, struct kobject *kobj,
return count; return count;
} }
static int __devinit ds1742_rtc_probe(struct platform_device *pdev) static int ds1742_rtc_probe(struct platform_device *pdev)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
struct resource *res; struct resource *res;
@ -222,7 +222,7 @@ static int __devinit ds1742_rtc_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit ds1742_rtc_remove(struct platform_device *pdev) static int ds1742_rtc_remove(struct platform_device *pdev)
{ {
struct rtc_plat_data *pdata = platform_get_drvdata(pdev); struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
@ -233,7 +233,7 @@ static int __devexit ds1742_rtc_remove(struct platform_device *pdev)
static struct platform_driver ds1742_rtc_driver = { static struct platform_driver ds1742_rtc_driver = {
.probe = ds1742_rtc_probe, .probe = ds1742_rtc_probe,
.remove = __devexit_p(ds1742_rtc_remove), .remove = ds1742_rtc_remove,
.driver = { .driver = {
.name = "rtc-ds1742", .name = "rtc-ds1742",
.owner = THIS_MODULE, .owner = THIS_MODULE,

8
drivers/rtc/rtc-ds3232.c
View File

@ -391,8 +391,8 @@ static const struct rtc_class_ops ds3232_rtc_ops = {
.alarm_irq_enable = ds3232_alarm_irq_enable, .alarm_irq_enable = ds3232_alarm_irq_enable,
}; };
static int __devinit ds3232_probe(struct i2c_client *client, static int ds3232_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct ds3232 *ds3232; struct ds3232 *ds3232;
int ret; int ret;
@ -439,7 +439,7 @@ out_free:
return ret; return ret;
} }
static int __devexit ds3232_remove(struct i2c_client *client) static int ds3232_remove(struct i2c_client *client)
{ {
struct ds3232 *ds3232 = i2c_get_clientdata(client); struct ds3232 *ds3232 = i2c_get_clientdata(client);
@ -469,7 +469,7 @@ static struct i2c_driver ds3232_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ds3232_probe, .probe = ds3232_probe,
.remove = __devexit_p(ds3232_remove), .remove = ds3232_remove,
.id_table = ds3232_id, .id_table = ds3232_id,
}; };

6
drivers/rtc/rtc-ds3234.c
View File

@ -105,7 +105,7 @@ static const struct rtc_class_ops ds3234_rtc_ops = {
.set_time = ds3234_set_time, .set_time = ds3234_set_time,
}; };
static int __devinit ds3234_probe(struct spi_device *spi) static int ds3234_probe(struct spi_device *spi)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
unsigned char tmp; unsigned char tmp;
@ -156,7 +156,7 @@ static int __devinit ds3234_probe(struct spi_device *spi)
return 0; return 0;
} }
static int __devexit ds3234_remove(struct spi_device *spi) static int ds3234_remove(struct spi_device *spi)
{ {
struct rtc_device *rtc = spi_get_drvdata(spi); struct rtc_device *rtc = spi_get_drvdata(spi);
@ -170,7 +170,7 @@ static struct spi_driver ds3234_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ds3234_probe, .probe = ds3234_probe,
.remove = __devexit_p(ds3234_remove), .remove = ds3234_remove,
}; };
module_spi_driver(ds3234_driver); module_spi_driver(ds3234_driver);

6
drivers/rtc/rtc-ep93xx.c
View File

@ -127,7 +127,7 @@ static const struct attribute_group ep93xx_rtc_sysfs_files = {
.attrs = ep93xx_rtc_attrs, .attrs = ep93xx_rtc_attrs,
}; };
static int __devinit ep93xx_rtc_probe(struct platform_device *pdev) static int ep93xx_rtc_probe(struct platform_device *pdev)
{ {
struct ep93xx_rtc *ep93xx_rtc; struct ep93xx_rtc *ep93xx_rtc;
struct resource *res; struct resource *res;
@ -174,7 +174,7 @@ exit:
return err; return err;
} }
static int __devexit ep93xx_rtc_remove(struct platform_device *pdev) static int ep93xx_rtc_remove(struct platform_device *pdev)
{ {
struct ep93xx_rtc *ep93xx_rtc = platform_get_drvdata(pdev); struct ep93xx_rtc *ep93xx_rtc = platform_get_drvdata(pdev);
@ -192,7 +192,7 @@ static struct platform_driver ep93xx_rtc_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ep93xx_rtc_probe, .probe = ep93xx_rtc_probe,
.remove = __devexit_p(ep93xx_rtc_remove), .remove = ep93xx_rtc_remove,
}; };
module_platform_driver(ep93xx_rtc_driver); module_platform_driver(ep93xx_rtc_driver);

8
drivers/rtc/rtc-fm3130.c
View File

@ -361,8 +361,8 @@ static const struct rtc_class_ops fm3130_rtc_ops = {
static struct i2c_driver fm3130_driver; static struct i2c_driver fm3130_driver;
static int __devinit fm3130_probe(struct i2c_client *client, static int fm3130_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct fm3130 *fm3130; struct fm3130 *fm3130;
int err = -ENODEV; int err = -ENODEV;
@ -546,7 +546,7 @@ exit_free:
return err; return err;
} }
static int __devexit fm3130_remove(struct i2c_client *client) static int fm3130_remove(struct i2c_client *client)
{ {
struct fm3130 *fm3130 = i2c_get_clientdata(client); struct fm3130 *fm3130 = i2c_get_clientdata(client);
@ -561,7 +561,7 @@ static struct i2c_driver fm3130_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = fm3130_probe, .probe = fm3130_probe,
.remove = __devexit_p(fm3130_remove), .remove = fm3130_remove,
.id_table = fm3130_id, .id_table = fm3130_id,
}; };

4
drivers/rtc/rtc-imxdi.c
View File

@ -480,7 +480,7 @@ err:
return rc; return rc;
} }
static int __devexit dryice_rtc_remove(struct platform_device *pdev) static int dryice_rtc_remove(struct platform_device *pdev)
{ {
struct imxdi_dev *imxdi = platform_get_drvdata(pdev); struct imxdi_dev *imxdi = platform_get_drvdata(pdev);
@ -512,7 +512,7 @@ static struct platform_driver dryice_rtc_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = of_match_ptr(dryice_dt_ids), .of_match_table = of_match_ptr(dryice_dt_ids),
}, },
.remove = __devexit_p(dryice_rtc_remove), .remove = dryice_rtc_remove,
}; };
static int __init dryice_rtc_init(void) static int __init dryice_rtc_init(void)

6
drivers/rtc/rtc-jz4740.c
View File

@ -210,7 +210,7 @@ void jz4740_rtc_poweroff(struct device *dev)
} }
EXPORT_SYMBOL_GPL(jz4740_rtc_poweroff); EXPORT_SYMBOL_GPL(jz4740_rtc_poweroff);
static int __devinit jz4740_rtc_probe(struct platform_device *pdev) static int jz4740_rtc_probe(struct platform_device *pdev)
{ {
int ret; int ret;
struct jz4740_rtc *rtc; struct jz4740_rtc *rtc;
@ -297,7 +297,7 @@ err_free:
return ret; return ret;
} }
static int __devexit jz4740_rtc_remove(struct platform_device *pdev) static int jz4740_rtc_remove(struct platform_device *pdev)
{ {
struct jz4740_rtc *rtc = platform_get_drvdata(pdev); struct jz4740_rtc *rtc = platform_get_drvdata(pdev);
@ -347,7 +347,7 @@ static const struct dev_pm_ops jz4740_pm_ops = {
static struct platform_driver jz4740_rtc_driver = { static struct platform_driver jz4740_rtc_driver = {
.probe = jz4740_rtc_probe, .probe = jz4740_rtc_probe,
.remove = __devexit_p(jz4740_rtc_remove), .remove = jz4740_rtc_remove,
.driver = { .driver = {
.name = "jz4740-rtc", .name = "jz4740-rtc",
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/rtc/rtc-lpc32xx.c
View File

@ -197,7 +197,7 @@ static const struct rtc_class_ops lpc32xx_rtc_ops = {
.alarm_irq_enable = lpc32xx_rtc_alarm_irq_enable, .alarm_irq_enable = lpc32xx_rtc_alarm_irq_enable,
}; };
static int __devinit lpc32xx_rtc_probe(struct platform_device *pdev) static int lpc32xx_rtc_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct lpc32xx_rtc *rtc; struct lpc32xx_rtc *rtc;
@ -299,7 +299,7 @@ static int __devinit lpc32xx_rtc_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit lpc32xx_rtc_remove(struct platform_device *pdev) static int lpc32xx_rtc_remove(struct platform_device *pdev)
{ {
struct lpc32xx_rtc *rtc = platform_get_drvdata(pdev); struct lpc32xx_rtc *rtc = platform_get_drvdata(pdev);
@ -397,7 +397,7 @@ MODULE_DEVICE_TABLE(of, lpc32xx_rtc_match);
static struct platform_driver lpc32xx_rtc_driver = { static struct platform_driver lpc32xx_rtc_driver = {
.probe = lpc32xx_rtc_probe, .probe = lpc32xx_rtc_probe,
.remove = __devexit_p(lpc32xx_rtc_remove), .remove = lpc32xx_rtc_remove,
.driver = { .driver = {
.name = RTC_NAME, .name = RTC_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/rtc/rtc-ls1x.c
View File

@ -143,7 +143,7 @@ static struct rtc_class_ops ls1x_rtc_ops = {
.set_time = ls1x_rtc_set_time, .set_time = ls1x_rtc_set_time,
}; };
static int __devinit ls1x_rtc_probe(struct platform_device *pdev) static int ls1x_rtc_probe(struct platform_device *pdev)
{ {
struct rtc_device *rtcdev; struct rtc_device *rtcdev;
unsigned long v; unsigned long v;
@ -185,7 +185,7 @@ err:
return ret; return ret;
} }
static int __devexit ls1x_rtc_remove(struct platform_device *pdev) static int ls1x_rtc_remove(struct platform_device *pdev)
{ {
struct rtc_device *rtcdev = platform_get_drvdata(pdev); struct rtc_device *rtcdev = platform_get_drvdata(pdev);
@ -200,7 +200,7 @@ static struct platform_driver ls1x_rtc_driver = {
.name = "ls1x-rtc", .name = "ls1x-rtc",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.remove = __devexit_p(ls1x_rtc_remove), .remove = ls1x_rtc_remove,
.probe = ls1x_rtc_probe, .probe = ls1x_rtc_probe,
}; };

6
drivers/rtc/rtc-m41t93.c
View File

@ -170,7 +170,7 @@ static const struct rtc_class_ops m41t93_rtc_ops = {
static struct spi_driver m41t93_driver; static struct spi_driver m41t93_driver;
static int __devinit m41t93_probe(struct spi_device *spi) static int m41t93_probe(struct spi_device *spi)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
int res; int res;
@ -195,7 +195,7 @@ static int __devinit m41t93_probe(struct spi_device *spi)
} }
static int __devexit m41t93_remove(struct spi_device *spi) static int m41t93_remove(struct spi_device *spi)
{ {
struct rtc_device *rtc = spi_get_drvdata(spi); struct rtc_device *rtc = spi_get_drvdata(spi);
@ -211,7 +211,7 @@ static struct spi_driver m41t93_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = m41t93_probe, .probe = m41t93_probe,
.remove = __devexit_p(m41t93_remove), .remove = m41t93_remove,
}; };
module_spi_driver(m41t93_driver); module_spi_driver(m41t93_driver);

6
drivers/rtc/rtc-m41t94.c
View File

@ -110,7 +110,7 @@ static const struct rtc_class_ops m41t94_rtc_ops = {
static struct spi_driver m41t94_driver; static struct spi_driver m41t94_driver;
static int __devinit m41t94_probe(struct spi_device *spi) static int m41t94_probe(struct spi_device *spi)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
int res; int res;
@ -134,7 +134,7 @@ static int __devinit m41t94_probe(struct spi_device *spi)
return 0; return 0;
} }
static int __devexit m41t94_remove(struct spi_device *spi) static int m41t94_remove(struct spi_device *spi)
{ {
struct rtc_device *rtc = spi_get_drvdata(spi); struct rtc_device *rtc = spi_get_drvdata(spi);
@ -150,7 +150,7 @@ static struct spi_driver m41t94_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = m41t94_probe, .probe = m41t94_probe,
.remove = __devexit_p(m41t94_remove), .remove = m41t94_remove,
}; };
module_spi_driver(m41t94_driver); module_spi_driver(m41t94_driver);

6
drivers/rtc/rtc-m48t35.c
View File

@ -141,7 +141,7 @@ static const struct rtc_class_ops m48t35_ops = {
.set_time = m48t35_set_time, .set_time = m48t35_set_time,
}; };
static int __devinit m48t35_probe(struct platform_device *pdev) static int m48t35_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct m48t35_priv *priv; struct m48t35_priv *priv;
@ -194,7 +194,7 @@ out:
return ret; return ret;
} }
static int __devexit m48t35_remove(struct platform_device *pdev) static int m48t35_remove(struct platform_device *pdev)
{ {
struct m48t35_priv *priv = platform_get_drvdata(pdev); struct m48t35_priv *priv = platform_get_drvdata(pdev);
@ -213,7 +213,7 @@ static struct platform_driver m48t35_platform_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = m48t35_probe, .probe = m48t35_probe,
.remove = __devexit_p(m48t35_remove), .remove = m48t35_remove,
}; };
module_platform_driver(m48t35_platform_driver); module_platform_driver(m48t35_platform_driver);

6
drivers/rtc/rtc-m48t59.c
View File

@ -383,7 +383,7 @@ static struct bin_attribute m48t59_nvram_attr = {
.write = m48t59_nvram_write, .write = m48t59_nvram_write,
}; };
static int __devinit m48t59_rtc_probe(struct platform_device *pdev) static int m48t59_rtc_probe(struct platform_device *pdev)
{ {
struct m48t59_plat_data *pdata = pdev->dev.platform_data; struct m48t59_plat_data *pdata = pdev->dev.platform_data;
struct m48t59_private *m48t59 = NULL; struct m48t59_private *m48t59 = NULL;
@ -501,7 +501,7 @@ out:
return ret; return ret;
} }
static int __devexit m48t59_rtc_remove(struct platform_device *pdev) static int m48t59_rtc_remove(struct platform_device *pdev)
{ {
struct m48t59_private *m48t59 = platform_get_drvdata(pdev); struct m48t59_private *m48t59 = platform_get_drvdata(pdev);
struct m48t59_plat_data *pdata = pdev->dev.platform_data; struct m48t59_plat_data *pdata = pdev->dev.platform_data;
@ -527,7 +527,7 @@ static struct platform_driver m48t59_rtc_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = m48t59_rtc_probe, .probe = m48t59_rtc_probe,
.remove = __devexit_p(m48t59_rtc_remove), .remove = m48t59_rtc_remove,
}; };
module_platform_driver(m48t59_rtc_driver); module_platform_driver(m48t59_rtc_driver);

6
drivers/rtc/rtc-m48t86.c
View File

@ -144,7 +144,7 @@ static const struct rtc_class_ops m48t86_rtc_ops = {
.proc = m48t86_rtc_proc, .proc = m48t86_rtc_proc,
}; };
static int __devinit m48t86_rtc_probe(struct platform_device *dev) static int m48t86_rtc_probe(struct platform_device *dev)
{ {
unsigned char reg; unsigned char reg;
struct m48t86_ops *ops = dev->dev.platform_data; struct m48t86_ops *ops = dev->dev.platform_data;
@ -164,7 +164,7 @@ static int __devinit m48t86_rtc_probe(struct platform_device *dev)
return 0; return 0;
} }
static int __devexit m48t86_rtc_remove(struct platform_device *dev) static int m48t86_rtc_remove(struct platform_device *dev)
{ {
struct rtc_device *rtc = platform_get_drvdata(dev); struct rtc_device *rtc = platform_get_drvdata(dev);
@ -182,7 +182,7 @@ static struct platform_driver m48t86_rtc_platform_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = m48t86_rtc_probe, .probe = m48t86_rtc_probe,
.remove = __devexit_p(m48t86_rtc_remove), .remove = m48t86_rtc_remove,
}; };
module_platform_driver(m48t86_rtc_platform_driver); module_platform_driver(m48t86_rtc_platform_driver);

6
drivers/rtc/rtc-max6902.c
View File

@ -120,7 +120,7 @@ static const struct rtc_class_ops max6902_rtc_ops = {
.set_time = max6902_set_time, .set_time = max6902_set_time,
}; };
static int __devinit max6902_probe(struct spi_device *spi) static int max6902_probe(struct spi_device *spi)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
unsigned char tmp; unsigned char tmp;
@ -143,7 +143,7 @@ static int __devinit max6902_probe(struct spi_device *spi)
return 0; return 0;
} }
static int __devexit max6902_remove(struct spi_device *spi) static int max6902_remove(struct spi_device *spi)
{ {
struct rtc_device *rtc = dev_get_drvdata(&spi->dev); struct rtc_device *rtc = dev_get_drvdata(&spi->dev);
@ -157,7 +157,7 @@ static struct spi_driver max6902_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = max6902_probe, .probe = max6902_probe,
.remove = __devexit_p(max6902_remove), .remove = max6902_remove,
}; };
module_spi_driver(max6902_driver); module_spi_driver(max6902_driver);

6
drivers/rtc/rtc-max8907.c
View File

@ -176,7 +176,7 @@ static const struct rtc_class_ops max8907_rtc_ops = {
.set_alarm = max8907_rtc_set_alarm, .set_alarm = max8907_rtc_set_alarm,
}; };
static int __devinit max8907_rtc_probe(struct platform_device *pdev) static int max8907_rtc_probe(struct platform_device *pdev)
{ {
struct max8907 *max8907 = dev_get_drvdata(pdev->dev.parent); struct max8907 *max8907 = dev_get_drvdata(pdev->dev.parent);
struct max8907_rtc *rtc; struct max8907_rtc *rtc;
@ -220,7 +220,7 @@ err_unregister:
return ret; return ret;
} }
static int __devexit max8907_rtc_remove(struct platform_device *pdev) static int max8907_rtc_remove(struct platform_device *pdev)
{ {
struct max8907_rtc *rtc = platform_get_drvdata(pdev); struct max8907_rtc *rtc = platform_get_drvdata(pdev);
@ -236,7 +236,7 @@ static struct platform_driver max8907_rtc_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = max8907_rtc_probe, .probe = max8907_rtc_probe,
.remove = __devexit_p(max8907_rtc_remove), .remove = max8907_rtc_remove,
}; };
module_platform_driver(max8907_rtc_driver); module_platform_driver(max8907_rtc_driver);

6
drivers/rtc/rtc-max8925.c
View File

@ -247,7 +247,7 @@ static const struct rtc_class_ops max8925_rtc_ops = {
.set_alarm = max8925_rtc_set_alarm, .set_alarm = max8925_rtc_set_alarm,
}; };
static int __devinit max8925_rtc_probe(struct platform_device *pdev) static int max8925_rtc_probe(struct platform_device *pdev)
{ {
struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent); struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
struct max8925_rtc_info *info; struct max8925_rtc_info *info;
@ -292,7 +292,7 @@ out_irq:
return ret; return ret;
} }
static int __devexit max8925_rtc_remove(struct platform_device *pdev) static int max8925_rtc_remove(struct platform_device *pdev)
{ {
struct max8925_rtc_info *info = platform_get_drvdata(pdev); struct max8925_rtc_info *info = platform_get_drvdata(pdev);
@ -334,7 +334,7 @@ static struct platform_driver max8925_rtc_driver = {
.pm = &max8925_rtc_pm_ops, .pm = &max8925_rtc_pm_ops,
}, },
.probe = max8925_rtc_probe, .probe = max8925_rtc_probe,
.remove = __devexit_p(max8925_rtc_remove), .remove = max8925_rtc_remove,
}; };
module_platform_driver(max8925_rtc_driver); module_platform_driver(max8925_rtc_driver);

6
drivers/rtc/rtc-max8998.c
View File

@ -249,7 +249,7 @@ static const struct rtc_class_ops max8998_rtc_ops = {
.alarm_irq_enable = max8998_rtc_alarm_irq_enable, .alarm_irq_enable = max8998_rtc_alarm_irq_enable,
}; };
static int __devinit max8998_rtc_probe(struct platform_device *pdev) static int max8998_rtc_probe(struct platform_device *pdev)
{ {
struct max8998_dev *max8998 = dev_get_drvdata(pdev->dev.parent); struct max8998_dev *max8998 = dev_get_drvdata(pdev->dev.parent);
struct max8998_platform_data *pdata = dev_get_platdata(max8998->dev); struct max8998_platform_data *pdata = dev_get_platdata(max8998->dev);
@ -298,7 +298,7 @@ out_rtc:
return ret; return ret;
} }
static int __devexit max8998_rtc_remove(struct platform_device *pdev) static int max8998_rtc_remove(struct platform_device *pdev)
{ {
struct max8998_rtc_info *info = platform_get_drvdata(pdev); struct max8998_rtc_info *info = platform_get_drvdata(pdev);
@ -323,7 +323,7 @@ static struct platform_driver max8998_rtc_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = max8998_rtc_probe, .probe = max8998_rtc_probe,
.remove = __devexit_p(max8998_rtc_remove), .remove = max8998_rtc_remove,
.id_table = max8998_rtc_id, .id_table = max8998_rtc_id,
}; };

8
drivers/rtc/rtc-mpc5121.c
View File

@ -306,7 +306,7 @@ static const struct rtc_class_ops mpc5200_rtc_ops = {
.alarm_irq_enable = mpc5121_rtc_alarm_irq_enable, .alarm_irq_enable = mpc5121_rtc_alarm_irq_enable,
}; };
static int __devinit mpc5121_rtc_probe(struct platform_device *op) static int mpc5121_rtc_probe(struct platform_device *op)
{ {
struct mpc5121_rtc_data *rtc; struct mpc5121_rtc_data *rtc;
int err = 0; int err = 0;
@ -382,7 +382,7 @@ out_free:
return err; return err;
} }
static int __devexit mpc5121_rtc_remove(struct platform_device *op) static int mpc5121_rtc_remove(struct platform_device *op)
{ {
struct mpc5121_rtc_data *rtc = dev_get_drvdata(&op->dev); struct mpc5121_rtc_data *rtc = dev_get_drvdata(&op->dev);
struct mpc5121_rtc_regs __iomem *regs = rtc->regs; struct mpc5121_rtc_regs __iomem *regs = rtc->regs;
@ -403,7 +403,7 @@ static int __devexit mpc5121_rtc_remove(struct platform_device *op)
return 0; return 0;
} }
static struct of_device_id mpc5121_rtc_match[] __devinitdata = { static struct of_device_id mpc5121_rtc_match[] = {
{ .compatible = "fsl,mpc5121-rtc", }, { .compatible = "fsl,mpc5121-rtc", },
{ .compatible = "fsl,mpc5200-rtc", }, { .compatible = "fsl,mpc5200-rtc", },
{}, {},
@ -416,7 +416,7 @@ static struct platform_driver mpc5121_rtc_driver = {
.of_match_table = mpc5121_rtc_match, .of_match_table = mpc5121_rtc_match,
}, },
.probe = mpc5121_rtc_probe, .probe = mpc5121_rtc_probe,
.remove = __devexit_p(mpc5121_rtc_remove), .remove = mpc5121_rtc_remove,
}; };
module_platform_driver(mpc5121_rtc_driver); module_platform_driver(mpc5121_rtc_driver);

12
drivers/rtc/rtc-mrst.c
View File

@ -322,8 +322,8 @@ static irqreturn_t mrst_rtc_irq(int irq, void *p)
return IRQ_NONE; return IRQ_NONE;
} }
static int __devinit static int vrtc_mrst_do_probe(struct device *dev, struct resource *iomem,
vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq) int rtc_irq)
{ {
int retval = 0; int retval = 0;
unsigned char rtc_control; unsigned char rtc_control;
@ -394,7 +394,7 @@ static void rtc_mrst_do_shutdown(void)
spin_unlock_irq(&rtc_lock); spin_unlock_irq(&rtc_lock);
} }
static void __devexit rtc_mrst_do_remove(struct device *dev) static void rtc_mrst_do_remove(struct device *dev)
{ {
struct mrst_rtc *mrst = dev_get_drvdata(dev); struct mrst_rtc *mrst = dev_get_drvdata(dev);
struct resource *iomem; struct resource *iomem;
@ -503,14 +503,14 @@ static inline int mrst_poweroff(struct device *dev)
#endif #endif
static int __devinit vrtc_mrst_platform_probe(struct platform_device *pdev) static int vrtc_mrst_platform_probe(struct platform_device *pdev)
{ {
return vrtc_mrst_do_probe(&pdev->dev, return vrtc_mrst_do_probe(&pdev->dev,
platform_get_resource(pdev, IORESOURCE_MEM, 0), platform_get_resource(pdev, IORESOURCE_MEM, 0),
platform_get_irq(pdev, 0)); platform_get_irq(pdev, 0));
} }
static int __devexit vrtc_mrst_platform_remove(struct platform_device *pdev) static int vrtc_mrst_platform_remove(struct platform_device *pdev)
{ {
rtc_mrst_do_remove(&pdev->dev); rtc_mrst_do_remove(&pdev->dev);
return 0; return 0;
@ -528,7 +528,7 @@ MODULE_ALIAS("platform:vrtc_mrst");
static struct platform_driver vrtc_mrst_platform_driver = { static struct platform_driver vrtc_mrst_platform_driver = {
.probe = vrtc_mrst_platform_probe, .probe = vrtc_mrst_platform_probe,
.remove = __devexit_p(vrtc_mrst_platform_remove), .remove = vrtc_mrst_platform_remove,
.shutdown = vrtc_mrst_platform_shutdown, .shutdown = vrtc_mrst_platform_shutdown,
.driver = { .driver = {
.name = (char *) driver_name, .name = (char *) driver_name,

2
drivers/rtc/rtc-mv.c
View File

@ -215,7 +215,7 @@ static const struct rtc_class_ops mv_rtc_alarm_ops = {
.alarm_irq_enable = mv_rtc_alarm_irq_enable, .alarm_irq_enable = mv_rtc_alarm_irq_enable,
}; };
static int __devinit mv_rtc_probe(struct platform_device *pdev) static int mv_rtc_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct rtc_plat_data *pdata; struct rtc_plat_data *pdata;

6
drivers/rtc/rtc-mxc.c
View File

@ -368,7 +368,7 @@ static struct rtc_class_ops mxc_rtc_ops = {
.alarm_irq_enable = mxc_rtc_alarm_irq_enable, .alarm_irq_enable = mxc_rtc_alarm_irq_enable,
}; };
static int __devinit mxc_rtc_probe(struct platform_device *pdev) static int mxc_rtc_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct rtc_device *rtc; struct rtc_device *rtc;
@ -460,7 +460,7 @@ exit_free_pdata:
return ret; return ret;
} }
static int __devexit mxc_rtc_remove(struct platform_device *pdev) static int mxc_rtc_remove(struct platform_device *pdev)
{ {
struct rtc_plat_data *pdata = platform_get_drvdata(pdev); struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
@ -509,7 +509,7 @@ static struct platform_driver mxc_rtc_driver = {
}, },
.id_table = imx_rtc_devtype, .id_table = imx_rtc_devtype,
.probe = mxc_rtc_probe, .probe = mxc_rtc_probe,
.remove = __devexit_p(mxc_rtc_remove), .remove = mxc_rtc_remove,
}; };
module_platform_driver(mxc_rtc_driver) module_platform_driver(mxc_rtc_driver)

6
drivers/rtc/rtc-nuc900.c
View File

@ -222,7 +222,7 @@ static struct rtc_class_ops nuc900_rtc_ops = {
.alarm_irq_enable = nuc900_alarm_irq_enable, .alarm_irq_enable = nuc900_alarm_irq_enable,
}; };
static int __devinit nuc900_rtc_probe(struct platform_device *pdev) static int nuc900_rtc_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct nuc900_rtc *nuc900_rtc; struct nuc900_rtc *nuc900_rtc;
@ -284,7 +284,7 @@ fail1: kfree(nuc900_rtc);
return err; return err;
} }
static int __devexit nuc900_rtc_remove(struct platform_device *pdev) static int nuc900_rtc_remove(struct platform_device *pdev)
{ {
struct nuc900_rtc *nuc900_rtc = platform_get_drvdata(pdev); struct nuc900_rtc *nuc900_rtc = platform_get_drvdata(pdev);
struct resource *res; struct resource *res;
@ -304,7 +304,7 @@ static int __devexit nuc900_rtc_remove(struct platform_device *pdev)
} }
static struct platform_driver nuc900_rtc_driver = { static struct platform_driver nuc900_rtc_driver = {
.remove = __devexit_p(nuc900_rtc_remove), .remove = nuc900_rtc_remove,
.driver = { .driver = {
.name = "nuc900-rtc", .name = "nuc900-rtc",
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/rtc/rtc-pcap.c
View File

@ -139,7 +139,7 @@ static const struct rtc_class_ops pcap_rtc_ops = {
.alarm_irq_enable = pcap_rtc_alarm_irq_enable, .alarm_irq_enable = pcap_rtc_alarm_irq_enable,
}; };
static int __devinit pcap_rtc_probe(struct platform_device *pdev) static int pcap_rtc_probe(struct platform_device *pdev)
{ {
struct pcap_rtc *pcap_rtc; struct pcap_rtc *pcap_rtc;
int timer_irq, alarm_irq; int timer_irq, alarm_irq;
@ -183,7 +183,7 @@ fail_rtc:
return err; return err;
} }
static int __devexit pcap_rtc_remove(struct platform_device *pdev) static int pcap_rtc_remove(struct platform_device *pdev)
{ {
struct pcap_rtc *pcap_rtc = platform_get_drvdata(pdev); struct pcap_rtc *pcap_rtc = platform_get_drvdata(pdev);
@ -196,7 +196,7 @@ static int __devexit pcap_rtc_remove(struct platform_device *pdev)
} }
static struct platform_driver pcap_rtc_driver = { static struct platform_driver pcap_rtc_driver = {
.remove = __devexit_p(pcap_rtc_remove), .remove = pcap_rtc_remove,
.driver = { .driver = {
.name = "pcap-rtc", .name = "pcap-rtc",
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/rtc/rtc-pcf2123.c
View File

@ -219,7 +219,7 @@ static const struct rtc_class_ops pcf2123_rtc_ops = {
.set_time = pcf2123_rtc_set_time, .set_time = pcf2123_rtc_set_time,
}; };
static int __devinit pcf2123_probe(struct spi_device *spi) static int pcf2123_probe(struct spi_device *spi)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
struct pcf2123_plat_data *pdata; struct pcf2123_plat_data *pdata;
@ -319,7 +319,7 @@ kfree_exit:
return ret; return ret;
} }
static int __devexit pcf2123_remove(struct spi_device *spi) static int pcf2123_remove(struct spi_device *spi)
{ {
struct pcf2123_plat_data *pdata = spi->dev.platform_data; struct pcf2123_plat_data *pdata = spi->dev.platform_data;
int i; int i;
@ -345,7 +345,7 @@ static struct spi_driver pcf2123_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = pcf2123_probe, .probe = pcf2123_probe,
.remove = __devexit_p(pcf2123_remove), .remove = pcf2123_remove,
}; };
module_spi_driver(pcf2123_driver); module_spi_driver(pcf2123_driver);

6
drivers/rtc/rtc-pcf50633.c
View File

@ -248,7 +248,7 @@ static void pcf50633_rtc_irq(int irq, void *data)
rtc->alarm_pending = 1; rtc->alarm_pending = 1;
} }
static int __devinit pcf50633_rtc_probe(struct platform_device *pdev) static int pcf50633_rtc_probe(struct platform_device *pdev)
{ {
struct pcf50633_rtc *rtc; struct pcf50633_rtc *rtc;
@ -272,7 +272,7 @@ static int __devinit pcf50633_rtc_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit pcf50633_rtc_remove(struct platform_device *pdev) static int pcf50633_rtc_remove(struct platform_device *pdev)
{ {
struct pcf50633_rtc *rtc; struct pcf50633_rtc *rtc;
@ -291,7 +291,7 @@ static struct platform_driver pcf50633_rtc_driver = {
.name = "pcf50633-rtc", .name = "pcf50633-rtc",
}, },
.probe = pcf50633_rtc_probe, .probe = pcf50633_rtc_probe,
.remove = __devexit_p(pcf50633_rtc_remove), .remove = pcf50633_rtc_remove,
}; };
module_platform_driver(pcf50633_rtc_driver); module_platform_driver(pcf50633_rtc_driver);

2
drivers/rtc/rtc-pcf8563.c
View File

@ -296,7 +296,7 @@ static const struct i2c_device_id pcf8563_id[] = {
MODULE_DEVICE_TABLE(i2c, pcf8563_id); MODULE_DEVICE_TABLE(i2c, pcf8563_id);
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id pcf8563_of_match[] __devinitconst = { static const struct of_device_id pcf8563_of_match[] = {
{ .compatible = "nxp,pcf8563" }, { .compatible = "nxp,pcf8563" },
{} {}
}; };

4
drivers/rtc/rtc-pcf8583.c
View File

@ -294,7 +294,7 @@ exit_kfree:
return err; return err;
} }
static int __devexit pcf8583_remove(struct i2c_client *client) static int pcf8583_remove(struct i2c_client *client)
{ {
struct pcf8583 *pcf8583 = i2c_get_clientdata(client); struct pcf8583 *pcf8583 = i2c_get_clientdata(client);
@ -316,7 +316,7 @@ static struct i2c_driver pcf8583_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = pcf8583_probe, .probe = pcf8583_probe,
.remove = __devexit_p(pcf8583_remove), .remove = pcf8583_remove,
.id_table = pcf8583_id, .id_table = pcf8583_id,
}; };

6
drivers/rtc/rtc-pm8xxx.c
View File

@ -382,7 +382,7 @@ rtc_alarm_handled:
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit pm8xxx_rtc_probe(struct platform_device *pdev) static int pm8xxx_rtc_probe(struct platform_device *pdev)
{ {
int rc; int rc;
u8 ctrl_reg; u8 ctrl_reg;
@ -485,7 +485,7 @@ fail_rtc_enable:
return rc; return rc;
} }
static int __devexit pm8xxx_rtc_remove(struct platform_device *pdev) static int pm8xxx_rtc_remove(struct platform_device *pdev)
{ {
struct pm8xxx_rtc *rtc_dd = platform_get_drvdata(pdev); struct pm8xxx_rtc *rtc_dd = platform_get_drvdata(pdev);
@ -524,7 +524,7 @@ static SIMPLE_DEV_PM_OPS(pm8xxx_rtc_pm_ops, pm8xxx_rtc_suspend, pm8xxx_rtc_resum
static struct platform_driver pm8xxx_rtc_driver = { static struct platform_driver pm8xxx_rtc_driver = {
.probe = pm8xxx_rtc_probe, .probe = pm8xxx_rtc_probe,
.remove = __devexit_p(pm8xxx_rtc_remove), .remove = pm8xxx_rtc_remove,
.driver = { .driver = {
.name = PM8XXX_RTC_DEV_NAME, .name = PM8XXX_RTC_DEV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/rtc/rtc-puv3.c
View File

@ -220,7 +220,7 @@ static void puv3_rtc_enable(struct platform_device *pdev, int en)
} }
} }
static int __devexit puv3_rtc_remove(struct platform_device *dev) static int puv3_rtc_remove(struct platform_device *dev)
{ {
struct rtc_device *rtc = platform_get_drvdata(dev); struct rtc_device *rtc = platform_get_drvdata(dev);
@ -236,7 +236,7 @@ static int __devexit puv3_rtc_remove(struct platform_device *dev)
return 0; return 0;
} }
static int __devinit puv3_rtc_probe(struct platform_device *pdev) static int puv3_rtc_probe(struct platform_device *pdev)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
struct resource *res; struct resource *res;
@ -328,7 +328,7 @@ static int puv3_rtc_resume(struct platform_device *pdev)
static struct platform_driver puv3_rtc_driver = { static struct platform_driver puv3_rtc_driver = {
.probe = puv3_rtc_probe, .probe = puv3_rtc_probe,
.remove = __devexit_p(puv3_rtc_remove), .remove = puv3_rtc_remove,
.suspend = puv3_rtc_suspend, .suspend = puv3_rtc_suspend,
.resume = puv3_rtc_resume, .resume = puv3_rtc_resume,
.driver = { .driver = {

6
drivers/rtc/rtc-r9701.c
View File

@ -119,7 +119,7 @@ static const struct rtc_class_ops r9701_rtc_ops = {
.set_time = r9701_set_datetime, .set_time = r9701_set_datetime,
}; };
static int __devinit r9701_probe(struct spi_device *spi) static int r9701_probe(struct spi_device *spi)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
struct rtc_time dt; struct rtc_time dt;
@ -164,7 +164,7 @@ static int __devinit r9701_probe(struct spi_device *spi)
return 0; return 0;
} }
static int __devexit r9701_remove(struct spi_device *spi) static int r9701_remove(struct spi_device *spi)
{ {
struct rtc_device *rtc = dev_get_drvdata(&spi->dev); struct rtc_device *rtc = dev_get_drvdata(&spi->dev);
@ -178,7 +178,7 @@ static struct spi_driver r9701_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = r9701_probe, .probe = r9701_probe,
.remove = __devexit_p(r9701_remove), .remove = r9701_remove,
}; };
module_spi_driver(r9701_driver); module_spi_driver(r9701_driver);

6
drivers/rtc/rtc-rc5t583.c
View File

@ -211,7 +211,7 @@ static const struct rtc_class_ops rc5t583_rtc_ops = {
.alarm_irq_enable = rc5t583_rtc_alarm_irq_enable, .alarm_irq_enable = rc5t583_rtc_alarm_irq_enable,
}; };
static int __devinit rc5t583_rtc_probe(struct platform_device *pdev) static int rc5t583_rtc_probe(struct platform_device *pdev)
{ {
struct rc5t583 *rc5t583 = dev_get_drvdata(pdev->dev.parent); struct rc5t583 *rc5t583 = dev_get_drvdata(pdev->dev.parent);
struct rc5t583_rtc *ricoh_rtc; struct rc5t583_rtc *ricoh_rtc;
@ -271,7 +271,7 @@ static int __devinit rc5t583_rtc_probe(struct platform_device *pdev)
* Disable rc5t583 RTC interrupts. * Disable rc5t583 RTC interrupts.
* Sets status flag to free. * Sets status flag to free.
*/ */
static int __devexit rc5t583_rtc_remove(struct platform_device *pdev) static int rc5t583_rtc_remove(struct platform_device *pdev)
{ {
struct rc5t583_rtc *rc5t583_rtc = dev_get_drvdata(&pdev->dev); struct rc5t583_rtc *rc5t583_rtc = dev_get_drvdata(&pdev->dev);
@ -317,7 +317,7 @@ static const struct dev_pm_ops rc5t583_rtc_pm_ops = {
static struct platform_driver rc5t583_rtc_driver = { static struct platform_driver rc5t583_rtc_driver = {
.probe = rc5t583_rtc_probe, .probe = rc5t583_rtc_probe,
.remove = __devexit_p(rc5t583_rtc_remove), .remove = rc5t583_rtc_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "rtc-rc5t583", .name = "rtc-rc5t583",

4
drivers/rtc/rtc-rs5c313.c
View File

@ -377,7 +377,7 @@ static int rs5c313_rtc_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit rs5c313_rtc_remove(struct platform_device *pdev) static int rs5c313_rtc_remove(struct platform_device *pdev)
{ {
struct rtc_device *rtc = platform_get_drvdata( pdev ); struct rtc_device *rtc = platform_get_drvdata( pdev );
@ -392,7 +392,7 @@ static struct platform_driver rs5c313_rtc_platform_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = rs5c313_rtc_probe, .probe = rs5c313_rtc_probe,
.remove = __devexit_p( rs5c313_rtc_remove ), .remove = rs5c313_rtc_remove,
}; };
static int __init rs5c313_rtc_init(void) static int __init rs5c313_rtc_init(void)

6
drivers/rtc/rtc-rs5c348.c
View File

@ -152,7 +152,7 @@ static const struct rtc_class_ops rs5c348_rtc_ops = {
static struct spi_driver rs5c348_driver; static struct spi_driver rs5c348_driver;
static int __devinit rs5c348_probe(struct spi_device *spi) static int rs5c348_probe(struct spi_device *spi)
{ {
int ret; int ret;
struct rtc_device *rtc; struct rtc_device *rtc;
@ -218,7 +218,7 @@ static int __devinit rs5c348_probe(struct spi_device *spi)
return ret; return ret;
} }
static int __devexit rs5c348_remove(struct spi_device *spi) static int rs5c348_remove(struct spi_device *spi)
{ {
struct rs5c348_plat_data *pdata = spi->dev.platform_data; struct rs5c348_plat_data *pdata = spi->dev.platform_data;
struct rtc_device *rtc = pdata->rtc; struct rtc_device *rtc = pdata->rtc;
@ -235,7 +235,7 @@ static struct spi_driver rs5c348_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = rs5c348_probe, .probe = rs5c348_probe,
.remove = __devexit_p(rs5c348_remove), .remove = rs5c348_remove,
}; };
module_spi_driver(rs5c348_driver); module_spi_driver(rs5c348_driver);

8
drivers/rtc/rtc-rv3029c2.c
View File

@ -385,8 +385,8 @@ static struct i2c_device_id rv3029c2_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, rv3029c2_id); MODULE_DEVICE_TABLE(i2c, rv3029c2_id);
static int __devinit static int rv3029c2_probe(struct i2c_client *client,
rv3029c2_probe(struct i2c_client *client, const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
int rc = 0; int rc = 0;
@ -418,7 +418,7 @@ exit_unregister:
return rc; return rc;
} }
static int __devexit rv3029c2_remove(struct i2c_client *client) static int rv3029c2_remove(struct i2c_client *client)
{ {
struct rtc_device *rtc = i2c_get_clientdata(client); struct rtc_device *rtc = i2c_get_clientdata(client);
@ -432,7 +432,7 @@ static struct i2c_driver rv3029c2_driver = {
.name = "rtc-rv3029c2", .name = "rtc-rv3029c2",
}, },
.probe = rv3029c2_probe, .probe = rv3029c2_probe,
.remove = __devexit_p(rv3029c2_remove), .remove = rv3029c2_remove,
.id_table = rv3029c2_id, .id_table = rv3029c2_id,
}; };

8
drivers/rtc/rtc-rx8025.c
View File

@ -534,8 +534,8 @@ static void rx8025_sysfs_unregister(struct device *dev)
device_remove_file(dev, &dev_attr_clock_adjust_ppb); device_remove_file(dev, &dev_attr_clock_adjust_ppb);
} }
static int __devinit rx8025_probe(struct i2c_client *client, static int rx8025_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
struct rx8025_data *rx8025; struct rx8025_data *rx8025;
@ -614,7 +614,7 @@ errout:
return err; return err;
} }
static int __devexit rx8025_remove(struct i2c_client *client) static int rx8025_remove(struct i2c_client *client)
{ {
struct rx8025_data *rx8025 = i2c_get_clientdata(client); struct rx8025_data *rx8025 = i2c_get_clientdata(client);
struct mutex *lock = &rx8025->rtc->ops_lock; struct mutex *lock = &rx8025->rtc->ops_lock;
@ -640,7 +640,7 @@ static struct i2c_driver rx8025_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = rx8025_probe, .probe = rx8025_probe,
.remove = __devexit_p(rx8025_remove), .remove = rx8025_remove,
.id_table = rx8025_id, .id_table = rx8025_id,
}; };

8
drivers/rtc/rtc-rx8581.c
View File

@ -228,8 +228,8 @@ static const struct rtc_class_ops rx8581_rtc_ops = {
.set_time = rx8581_rtc_set_time, .set_time = rx8581_rtc_set_time,
}; };
static int __devinit rx8581_probe(struct i2c_client *client, static int rx8581_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
@ -251,7 +251,7 @@ static int __devinit rx8581_probe(struct i2c_client *client,
return 0; return 0;
} }
static int __devexit rx8581_remove(struct i2c_client *client) static int rx8581_remove(struct i2c_client *client)
{ {
struct rtc_device *rtc = i2c_get_clientdata(client); struct rtc_device *rtc = i2c_get_clientdata(client);
@ -272,7 +272,7 @@ static struct i2c_driver rx8581_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = rx8581_probe, .probe = rx8581_probe,
.remove = __devexit_p(rx8581_remove), .remove = rx8581_remove,
.id_table = rx8581_id, .id_table = rx8581_id,
}; };

6
drivers/rtc/rtc-s3c.c
View File

@ -421,7 +421,7 @@ static void s3c_rtc_enable(struct platform_device *pdev, int en)
clk_disable(rtc_clk); clk_disable(rtc_clk);
} }
static int __devexit s3c_rtc_remove(struct platform_device *dev) static int s3c_rtc_remove(struct platform_device *dev)
{ {
struct rtc_device *rtc = platform_get_drvdata(dev); struct rtc_device *rtc = platform_get_drvdata(dev);
@ -451,7 +451,7 @@ static inline int s3c_rtc_get_driver_data(struct platform_device *pdev)
return platform_get_device_id(pdev)->driver_data; return platform_get_device_id(pdev)->driver_data;
} }
static int __devinit s3c_rtc_probe(struct platform_device *pdev) static int s3c_rtc_probe(struct platform_device *pdev)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
struct rtc_time rtc_tm; struct rtc_time rtc_tm;
@ -686,7 +686,7 @@ MODULE_DEVICE_TABLE(platform, s3c_rtc_driver_ids);
static struct platform_driver s3c_rtc_driver = { static struct platform_driver s3c_rtc_driver = {
.probe = s3c_rtc_probe, .probe = s3c_rtc_probe,
.remove = __devexit_p(s3c_rtc_remove), .remove = s3c_rtc_remove,
.suspend = s3c_rtc_suspend, .suspend = s3c_rtc_suspend,
.resume = s3c_rtc_resume, .resume = s3c_rtc_resume,
.id_table = s3c_rtc_driver_ids, .id_table = s3c_rtc_driver_ids,

8
drivers/rtc/rtc-snvs.c
View File

@ -241,7 +241,7 @@ static irqreturn_t snvs_rtc_irq_handler(int irq, void *dev_id)
return events ? IRQ_HANDLED : IRQ_NONE; return events ? IRQ_HANDLED : IRQ_NONE;
} }
static int __devinit snvs_rtc_probe(struct platform_device *pdev) static int snvs_rtc_probe(struct platform_device *pdev)
{ {
struct snvs_rtc_data *data; struct snvs_rtc_data *data;
struct resource *res; struct resource *res;
@ -294,7 +294,7 @@ static int __devinit snvs_rtc_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit snvs_rtc_remove(struct platform_device *pdev) static int snvs_rtc_remove(struct platform_device *pdev)
{ {
struct snvs_rtc_data *data = platform_get_drvdata(pdev); struct snvs_rtc_data *data = platform_get_drvdata(pdev);
@ -327,7 +327,7 @@ static int snvs_rtc_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(snvs_rtc_pm_ops, snvs_rtc_suspend, snvs_rtc_resume); static SIMPLE_DEV_PM_OPS(snvs_rtc_pm_ops, snvs_rtc_suspend, snvs_rtc_resume);
static const struct of_device_id __devinitconst snvs_dt_ids[] = { static const struct of_device_id snvs_dt_ids[] = {
{ .compatible = "fsl,sec-v4.0-mon-rtc-lp", }, { .compatible = "fsl,sec-v4.0-mon-rtc-lp", },
{ /* sentinel */ } { /* sentinel */ }
}; };
@ -341,7 +341,7 @@ static struct platform_driver snvs_rtc_driver = {
.of_match_table = snvs_dt_ids, .of_match_table = snvs_dt_ids,
}, },
.probe = snvs_rtc_probe, .probe = snvs_rtc_probe,
.remove = __devexit_p(snvs_rtc_remove), .remove = snvs_rtc_remove,
}; };
module_platform_driver(snvs_rtc_driver); module_platform_driver(snvs_rtc_driver);

6
drivers/rtc/rtc-spear.c
View File

@ -351,7 +351,7 @@ static struct rtc_class_ops spear_rtc_ops = {
.alarm_irq_enable = spear_alarm_irq_enable, .alarm_irq_enable = spear_alarm_irq_enable,
}; };
static int __devinit spear_rtc_probe(struct platform_device *pdev) static int spear_rtc_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct spear_rtc_config *config; struct spear_rtc_config *config;
@ -425,7 +425,7 @@ err_disable_clock:
return status; return status;
} }
static int __devexit spear_rtc_remove(struct platform_device *pdev) static int spear_rtc_remove(struct platform_device *pdev)
{ {
struct spear_rtc_config *config = platform_get_drvdata(pdev); struct spear_rtc_config *config = platform_get_drvdata(pdev);
@ -499,7 +499,7 @@ MODULE_DEVICE_TABLE(of, spear_rtc_id_table);
static struct platform_driver spear_rtc_driver = { static struct platform_driver spear_rtc_driver = {
.probe = spear_rtc_probe, .probe = spear_rtc_probe,
.remove = __devexit_p(spear_rtc_remove), .remove = spear_rtc_remove,
.suspend = spear_rtc_suspend, .suspend = spear_rtc_suspend,
.resume = spear_rtc_resume, .resume = spear_rtc_resume,
.shutdown = spear_rtc_shutdown, .shutdown = spear_rtc_shutdown,

6
drivers/rtc/rtc-stk17ta8.c
View File

@ -285,7 +285,7 @@ static struct bin_attribute stk17ta8_nvram_attr = {
.write = stk17ta8_nvram_write, .write = stk17ta8_nvram_write,
}; };
static int __devinit stk17ta8_rtc_probe(struct platform_device *pdev) static int stk17ta8_rtc_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
unsigned int cal; unsigned int cal;
@ -347,7 +347,7 @@ static int __devinit stk17ta8_rtc_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit stk17ta8_rtc_remove(struct platform_device *pdev) static int stk17ta8_rtc_remove(struct platform_device *pdev)
{ {
struct rtc_plat_data *pdata = platform_get_drvdata(pdev); struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
@ -363,7 +363,7 @@ MODULE_ALIAS("platform:stk17ta8");
static struct platform_driver stk17ta8_rtc_driver = { static struct platform_driver stk17ta8_rtc_driver = {
.probe = stk17ta8_rtc_probe, .probe = stk17ta8_rtc_probe,
.remove = __devexit_p(stk17ta8_rtc_remove), .remove = stk17ta8_rtc_remove,
.driver = { .driver = {
.name = "stk17ta8", .name = "stk17ta8",
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/rtc/rtc-tegra.c
View File

@ -303,7 +303,7 @@ static struct rtc_class_ops tegra_rtc_ops = {
.alarm_irq_enable = tegra_rtc_alarm_irq_enable, .alarm_irq_enable = tegra_rtc_alarm_irq_enable,
}; };
static int __devinit tegra_rtc_probe(struct platform_device *pdev) static int tegra_rtc_probe(struct platform_device *pdev)
{ {
struct tegra_rtc_info *info; struct tegra_rtc_info *info;
struct resource *res; struct resource *res;
@ -375,7 +375,7 @@ err_dev_unreg:
return ret; return ret;
} }
static int __devexit tegra_rtc_remove(struct platform_device *pdev) static int tegra_rtc_remove(struct platform_device *pdev)
{ {
struct tegra_rtc_info *info = platform_get_drvdata(pdev); struct tegra_rtc_info *info = platform_get_drvdata(pdev);
@ -435,7 +435,7 @@ static void tegra_rtc_shutdown(struct platform_device *pdev)
MODULE_ALIAS("platform:tegra_rtc"); MODULE_ALIAS("platform:tegra_rtc");
static struct platform_driver tegra_rtc_driver = { static struct platform_driver tegra_rtc_driver = {
.remove = __devexit_p(tegra_rtc_remove), .remove = tegra_rtc_remove,
.shutdown = tegra_rtc_shutdown, .shutdown = tegra_rtc_shutdown,
.driver = { .driver = {
.name = "tegra_rtc", .name = "tegra_rtc",

4
drivers/rtc/rtc-test.c
View File

@ -119,7 +119,7 @@ err:
return err; return err;
} }
static int __devexit test_remove(struct platform_device *plat_dev) static int test_remove(struct platform_device *plat_dev)
{ {
struct rtc_device *rtc = platform_get_drvdata(plat_dev); struct rtc_device *rtc = platform_get_drvdata(plat_dev);
@ -131,7 +131,7 @@ static int __devexit test_remove(struct platform_device *plat_dev)
static struct platform_driver test_driver = { static struct platform_driver test_driver = {
.probe = test_probe, .probe = test_probe,
.remove = __devexit_p(test_remove), .remove = test_remove,
.driver = { .driver = {
.name = "rtc-test", .name = "rtc-test",
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/rtc/rtc-tile.c
View File

@ -76,7 +76,7 @@ static const struct rtc_class_ops tile_rtc_ops = {
/* /*
* Device probe routine. * Device probe routine.
*/ */
static int __devinit tile_rtc_probe(struct platform_device *dev) static int tile_rtc_probe(struct platform_device *dev)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
@ -94,7 +94,7 @@ static int __devinit tile_rtc_probe(struct platform_device *dev)
/* /*
* Device cleanup routine. * Device cleanup routine.
*/ */
static int __devexit tile_rtc_remove(struct platform_device *dev) static int tile_rtc_remove(struct platform_device *dev)
{ {
struct rtc_device *rtc = platform_get_drvdata(dev); struct rtc_device *rtc = platform_get_drvdata(dev);
@ -112,7 +112,7 @@ static struct platform_driver tile_rtc_platform_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = tile_rtc_probe, .probe = tile_rtc_probe,
.remove = __devexit_p(tile_rtc_remove), .remove = tile_rtc_remove,
}; };
/* /*

6
drivers/rtc/rtc-tps65910.c
View File

@ -222,7 +222,7 @@ static const struct rtc_class_ops tps65910_rtc_ops = {
.alarm_irq_enable = tps65910_rtc_alarm_irq_enable, .alarm_irq_enable = tps65910_rtc_alarm_irq_enable,
}; };
static int __devinit tps65910_rtc_probe(struct platform_device *pdev) static int tps65910_rtc_probe(struct platform_device *pdev)
{ {
struct tps65910 *tps65910 = NULL; struct tps65910 *tps65910 = NULL;
struct tps65910_rtc *tps_rtc = NULL; struct tps65910_rtc *tps_rtc = NULL;
@ -292,7 +292,7 @@ static int __devinit tps65910_rtc_probe(struct platform_device *pdev)
* Disable tps65910 RTC interrupts. * Disable tps65910 RTC interrupts.
* Sets status flag to free. * Sets status flag to free.
*/ */
static int __devexit tps65910_rtc_remove(struct platform_device *pdev) static int tps65910_rtc_remove(struct platform_device *pdev)
{ {
/* leave rtc running, but disable irqs */ /* leave rtc running, but disable irqs */
struct tps65910_rtc *tps_rtc = platform_get_drvdata(pdev); struct tps65910_rtc *tps_rtc = platform_get_drvdata(pdev);
@ -342,7 +342,7 @@ static const struct dev_pm_ops tps65910_rtc_pm_ops = {
static struct platform_driver tps65910_rtc_driver = { static struct platform_driver tps65910_rtc_driver = {
.probe = tps65910_rtc_probe, .probe = tps65910_rtc_probe,
.remove = __devexit_p(tps65910_rtc_remove), .remove = tps65910_rtc_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "tps65910-rtc", .name = "tps65910-rtc",

6
drivers/rtc/rtc-twl.c
View File

@ -458,7 +458,7 @@ static struct rtc_class_ops twl_rtc_ops = {
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
static int __devinit twl_rtc_probe(struct platform_device *pdev) static int twl_rtc_probe(struct platform_device *pdev)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
int ret = -EINVAL; int ret = -EINVAL;
@ -535,7 +535,7 @@ out1:
* Disable all TWL RTC module interrupts. * Disable all TWL RTC module interrupts.
* Sets status flag to free. * Sets status flag to free.
*/ */
static int __devexit twl_rtc_remove(struct platform_device *pdev) static int twl_rtc_remove(struct platform_device *pdev)
{ {
/* leave rtc running, but disable irqs */ /* leave rtc running, but disable irqs */
struct rtc_device *rtc = platform_get_drvdata(pdev); struct rtc_device *rtc = platform_get_drvdata(pdev);
@ -597,7 +597,7 @@ MODULE_ALIAS("platform:twl_rtc");
static struct platform_driver twl4030rtc_driver = { static struct platform_driver twl4030rtc_driver = {
.probe = twl_rtc_probe, .probe = twl_rtc_probe,
.remove = __devexit_p(twl_rtc_remove), .remove = twl_rtc_remove,
.shutdown = twl_rtc_shutdown, .shutdown = twl_rtc_shutdown,
.suspend = twl_rtc_suspend, .suspend = twl_rtc_suspend,
.resume = twl_rtc_resume, .resume = twl_rtc_resume,

6
drivers/rtc/rtc-vr41xx.c
View File

@ -280,7 +280,7 @@ static const struct rtc_class_ops vr41xx_rtc_ops = {
.set_alarm = vr41xx_rtc_set_alarm, .set_alarm = vr41xx_rtc_set_alarm,
}; };
static int __devinit rtc_probe(struct platform_device *pdev) static int rtc_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
struct rtc_device *rtc; struct rtc_device *rtc;
@ -373,7 +373,7 @@ err_rtc1_iounmap:
return retval; return retval;
} }
static int __devexit rtc_remove(struct platform_device *pdev) static int rtc_remove(struct platform_device *pdev)
{ {
struct rtc_device *rtc; struct rtc_device *rtc;
@ -398,7 +398,7 @@ MODULE_ALIAS("platform:RTC");
static struct platform_driver rtc_platform_driver = { static struct platform_driver rtc_platform_driver = {
.probe = rtc_probe, .probe = rtc_probe,
.remove = __devexit_p(rtc_remove), .remove = rtc_remove,
.driver = { .driver = {
.name = rtc_name, .name = rtc_name,
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/rtc/rtc-vt8500.c
View File

@ -205,7 +205,7 @@ static const struct rtc_class_ops vt8500_rtc_ops = {
.alarm_irq_enable = vt8500_alarm_irq_enable, .alarm_irq_enable = vt8500_alarm_irq_enable,
}; };
static int __devinit vt8500_rtc_probe(struct platform_device *pdev) static int vt8500_rtc_probe(struct platform_device *pdev)
{ {
struct vt8500_rtc *vt8500_rtc; struct vt8500_rtc *vt8500_rtc;
int ret; int ret;
@ -279,7 +279,7 @@ err_release:
return ret; return ret;
} }
static int __devexit vt8500_rtc_remove(struct platform_device *pdev) static int vt8500_rtc_remove(struct platform_device *pdev)
{ {
struct vt8500_rtc *vt8500_rtc = platform_get_drvdata(pdev); struct vt8500_rtc *vt8500_rtc = platform_get_drvdata(pdev);
@ -305,7 +305,7 @@ static const struct of_device_id wmt_dt_ids[] = {
static struct platform_driver vt8500_rtc_driver = { static struct platform_driver vt8500_rtc_driver = {
.probe = vt8500_rtc_probe, .probe = vt8500_rtc_probe,
.remove = __devexit_p(vt8500_rtc_remove), .remove = vt8500_rtc_remove,
.driver = { .driver = {
.name = "vt8500-rtc", .name = "vt8500-rtc",
.owner = THIS_MODULE, .owner = THIS_MODULE,

4
drivers/rtc/rtc-wm831x.c
View File

@ -459,7 +459,7 @@ err:
return ret; return ret;
} }
static int __devexit wm831x_rtc_remove(struct platform_device *pdev) static int wm831x_rtc_remove(struct platform_device *pdev)
{ {
struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev); struct wm831x_rtc *wm831x_rtc = platform_get_drvdata(pdev);
int alm_irq = platform_get_irq_byname(pdev, "ALM"); int alm_irq = platform_get_irq_byname(pdev, "ALM");
@ -483,7 +483,7 @@ static const struct dev_pm_ops wm831x_rtc_pm_ops = {
static struct platform_driver wm831x_rtc_driver = { static struct platform_driver wm831x_rtc_driver = {
.probe = wm831x_rtc_probe, .probe = wm831x_rtc_probe,
.remove = __devexit_p(wm831x_rtc_remove), .remove = wm831x_rtc_remove,
.driver = { .driver = {
.name = "wm831x-rtc", .name = "wm831x-rtc",
.pm = &wm831x_rtc_pm_ops, .pm = &wm831x_rtc_pm_ops,

4
drivers/rtc/rtc-wm8350.c
View File

@ -459,7 +459,7 @@ static int wm8350_rtc_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit wm8350_rtc_remove(struct platform_device *pdev) static int wm8350_rtc_remove(struct platform_device *pdev)
{ {
struct wm8350 *wm8350 = platform_get_drvdata(pdev); struct wm8350 *wm8350 = platform_get_drvdata(pdev);
struct wm8350_rtc *wm_rtc = &wm8350->rtc; struct wm8350_rtc *wm_rtc = &wm8350->rtc;
@ -479,7 +479,7 @@ static struct dev_pm_ops wm8350_rtc_pm_ops = {
static struct platform_driver wm8350_rtc_driver = { static struct platform_driver wm8350_rtc_driver = {
.probe = wm8350_rtc_probe, .probe = wm8350_rtc_probe,
.remove = __devexit_p(wm8350_rtc_remove), .remove = wm8350_rtc_remove,
.driver = { .driver = {
.name = "wm8350-rtc", .name = "wm8350-rtc",
.pm = &wm8350_rtc_pm_ops, .pm = &wm8350_rtc_pm_ops,