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

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 <[email protected]>
Cc: Alessandro Zummo <[email protected]>
Cc: Srinidhi Kasagar <[email protected]>
Cc: Linus Walleij <[email protected]>
Cc: Mike Frysinger <[email protected]>
Cc: Wan ZongShun <[email protected]>
Cc: Guan Xuetao <[email protected]>
Cc: Mark Brown <[email protected]>
Signed-off-by: default avatarGreg Kroah-Hartman <[email protected]>
parent 6f039790
......@@ -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);
......
......@@ -286,8 +286,8 @@ static void calibrate_vrtc_work(struct work_struct *work)
#endif
#ifdef CONFIG_OF
static int __devinit pm860x_rtc_dt_init(struct platform_device *pdev,
struct pm860x_rtc_info *info)
static int pm860x_rtc_dt_init(struct platform_device *pdev,
struct pm860x_rtc_info *info)
{
struct device_node *np = pdev->dev.parent->of_node;
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)
#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);
......
......@@ -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);
......
......@@ -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,
......
......@@ -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)
......
......@@ -342,7 +342,7 @@ static struct rtc_class_ops bfin_rtc_ops = {
.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 device *dev = &pdev->dev;
......@@ -388,7 +388,7 @@ static int __devinit bfin_rtc_probe(struct platform_device *pdev)
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 device *dev = &pdev->dev;
......@@ -451,7 +451,7 @@ static struct platform_driver bfin_rtc_driver = {
.owner = THIS_MODULE,
},
.probe = bfin_rtc_probe,
.remove = __devexit_p(bfin_rtc_remove),
.remove = bfin_rtc_remove,
.suspend = bfin_rtc_suspend,
.resume = bfin_rtc_resume,
};
......
......@@ -163,7 +163,7 @@ static int bq32k_probe(struct i2c_client *client,
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);
......@@ -183,7 +183,7 @@ static struct i2c_driver bq32k_driver = {
.owner = THIS_MODULE,
},
.probe = bq32k_probe,
.remove = __devexit_p(bq32k_remove),
.remove = bq32k_remove,
.id_table = bq32k_id,
};
......
......@@ -140,7 +140,7 @@ static const struct rtc_class_ops bq4802_ops = {
.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);
int err = -ENOMEM;
......@@ -191,7 +191,7 @@ static int __devinit bq4802_probe(struct platform_device *pdev)
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);
......@@ -215,7 +215,7 @@ static struct platform_driver bq4802_driver = {
.owner = THIS_MODULE,
},
.probe = bq4802_probe,
.remove = __devexit_p(bq4802_remove),
.remove = bq4802_remove,
};
module_platform_driver(bq4802_driver);
......@@ -947,8 +947,7 @@ static void rtc_wake_off(struct device *dev)
*/
static struct cmos_rtc_board_info acpi_rtc_info;
static void __devinit
cmos_wake_setup(struct device *dev)
static void cmos_wake_setup(struct device *dev)
{
if (acpi_disabled)
return;
......@@ -980,8 +979,7 @@ cmos_wake_setup(struct device *dev)
#else
static void __devinit
cmos_wake_setup(struct device *dev)
static void cmos_wake_setup(struct device *dev)
{
}
......@@ -991,8 +989,7 @@ cmos_wake_setup(struct device *dev)
#include <linux/pnp.h>
static int __devinit
cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
{
cmos_wake_setup(&pnp->dev);
......
......@@ -228,7 +228,7 @@ static const struct rtc_class_ops da9052_rtc_ops = {
.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;
int ret;
......@@ -262,7 +262,7 @@ static int __devinit da9052_rtc_probe(struct platform_device *pdev)
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;
......@@ -275,7 +275,7 @@ static int __devexit da9052_rtc_remove(struct platform_device *pdev)
static struct platform_driver da9052_rtc_driver = {
.probe = da9052_rtc_probe,
.remove = __devexit_p(da9052_rtc_remove),
.remove = da9052_rtc_remove,
.driver = {
.name = "da9052-rtc",
.owner = THIS_MODULE,
......
......@@ -567,7 +567,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
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);
......@@ -589,7 +589,7 @@ static int __devexit davinci_rtc_remove(struct platform_device *pdev)
static struct platform_driver davinci_rtc_driver = {
.probe = davinci_rtc_probe,
.remove = __devexit_p(davinci_rtc_remove),
.remove = davinci_rtc_remove,
.driver = {
.name = "rtc_davinci",
.owner = THIS_MODULE,
......
......@@ -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;
......@@ -139,7 +139,7 @@ static int __devinit dm355evm_rtc_probe(struct platform_device *pdev)
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);
......@@ -154,7 +154,7 @@ static int __devexit dm355evm_rtc_remove(struct platform_device *pdev)
*/
static struct platform_driver rtc_dm355evm_driver = {
.probe = dm355evm_rtc_probe,
.remove = __devexit_p(dm355evm_rtc_remove),
.remove = dm355evm_rtc_remove,
.driver = {
.owner = THIS_MODULE,
.name = "rtc-dm355evm",
......
......@@ -329,7 +329,7 @@ static const struct rtc_class_ops ds1286_ops = {
.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 resource *res;
......@@ -376,7 +376,7 @@ static int __devinit ds1286_probe(struct platform_device *pdev)
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);
......@@ -393,7 +393,7 @@ static struct platform_driver ds1286_platform_driver = {
.owner = THIS_MODULE,
},
.probe = ds1286_probe,
.remove = __devexit_p(ds1286_remove),
.remove = ds1286_remove,
};
module_platform_driver(ds1286_platform_driver);
......
......@@ -234,7 +234,7 @@ static int __init ds1302_rtc_probe(struct platform_device *pdev)
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);
......@@ -249,7 +249,7 @@ static struct platform_driver ds1302_platform_driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
},
.remove = __devexit_p(ds1302_rtc_remove),
.remove = ds1302_rtc_remove,
};
static int __init ds1302_rtc_init(void)
......
......@@ -601,7 +601,7 @@ static struct bin_attribute nvram = {
* Interface to SPI stack
*/
static int __devinit ds1305_probe(struct spi_device *spi)
static int ds1305_probe(struct spi_device *spi)
{
struct ds1305 *ds1305;
int status;
......@@ -787,7 +787,7 @@ static int __devinit ds1305_probe(struct spi_device *spi)
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);
......@@ -810,7 +810,7 @@ static struct spi_driver ds1305_driver = {
.driver.name = "rtc-ds1305",
.driver.owner = THIS_MODULE,
.probe = ds1305_probe,
.remove = __devexit_p(ds1305_remove),
.remove = ds1305_remove,
/* REVISIT add suspend/resume */
};
......
......@@ -617,8 +617,8 @@ ds1307_nvram_write(struct file *filp, struct kobject *kobj,
/*----------------------------------------------------------------------*/
static int __devinit ds1307_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int ds1307_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct ds1307 *ds1307;
int err = -ENODEV;
......@@ -938,7 +938,7 @@ static int __devinit ds1307_probe(struct i2c_client *client,
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);
......@@ -963,7 +963,7 @@ static struct i2c_driver ds1307_driver = {
.owner = THIS_MODULE,
},
.probe = ds1307_probe,
.remove = __devexit_p(ds1307_remove),
.remove = ds1307_remove,
.id_table = ds1307_id,
};
......
......@@ -391,7 +391,7 @@ static int ds1374_probe(struct i2c_client *client,
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);
......@@ -442,7 +442,7 @@ static struct i2c_driver ds1374_driver = {
.pm = DS1374_PM,
},
.probe = ds1374_probe,
.remove = __devexit_p(ds1374_remove),
.remove = ds1374_remove,
.id_table = ds1374_id,
};
......
......@@ -121,7 +121,7 @@ static const struct rtc_class_ops ds1390_rtc_ops = {
.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;
struct ds1390 *chip;
......@@ -156,7 +156,7 @@ static int __devinit ds1390_probe(struct spi_device *spi)
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);
......@@ -172,7 +172,7 @@ static struct spi_driver ds1390_driver = {
.owner = THIS_MODULE,
},
.probe = ds1390_probe,
.remove = __devexit_p(ds1390_remove),
.remove = ds1390_remove,
};
module_spi_driver(ds1390_driver);
......
......@@ -476,8 +476,7 @@ static struct bin_attribute ds1511_nvram_attr = {
.write = ds1511_nvram_write,
};
static int __devinit
ds1511_rtc_probe(struct platform_device *pdev)
static int ds1511_rtc_probe(struct platform_device *pdev)
{
struct rtc_device *rtc;
struct resource *res;
......@@ -551,8 +550,7 @@ ds1511_rtc_probe(struct platform_device *pdev)
return ret;
}
static int __devexit
ds1511_rtc_remove(struct platform_device *pdev)
static int ds1511_rtc_remove(struct platform_device *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 = {
.probe = ds1511_rtc_probe,
.remove = __devexit_p(ds1511_rtc_remove),
.remove = ds1511_rtc_remove,
.driver = {
.name = "ds1511",
.owner = THIS_MODULE,
......
......@@ -276,7 +276,7 @@ static struct bin_attribute ds1553_nvram_attr = {
.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 resource *res;
......@@ -338,7 +338,7 @@ static int __devinit ds1553_rtc_probe(struct platform_device *pdev)
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);
......@@ -354,7 +354,7 @@ MODULE_ALIAS("platform:rtc-ds1553");
static struct platform_driver ds1553_rtc_driver = {
.probe = ds1553_rtc_probe,
.remove = __devexit_p(ds1553_rtc_remove),
.remove = ds1553_rtc_remove,
.driver = {
.name = "rtc-ds1553",
.owner = THIS_MODULE,
......
......@@ -159,7 +159,7 @@ static ssize_t ds1742_nvram_write(struct file *filp, struct kobject *kobj,
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 resource *res;
......@@ -222,7 +222,7 @@ static int __devinit ds1742_rtc_probe(struct platform_device *pdev)
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);
......@@ -233,7 +233,7 @@ static int __devexit ds1742_rtc_remove(struct platform_device *pdev)
static struct platform_driver ds1742_rtc_driver = {
.probe = ds1742_rtc_probe,
.remove = __devexit_p(ds1742_rtc_remove),
.remove = ds1742_rtc_remove,
.driver = {
.name = "rtc-ds1742",
.owner = THIS_MODULE,
......
......@@ -391,8 +391,8 @@ static const struct rtc_class_ops ds3232_rtc_ops = {
.alarm_irq_enable = ds3232_alarm_irq_enable,
};
static int __devinit ds3232_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int ds3232_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct ds3232 *ds3232;
int ret;
......@@ -439,7 +439,7 @@ static int __devinit ds3232_probe(struct i2c_client *client,
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);
......@@ -469,7 +469,7 @@ static struct i2c_driver ds3232_driver = {
.owner = THIS_MODULE,
},
.probe = ds3232_probe,
.remove = __devexit_p(ds3232_remove),
.remove = ds3232_remove,
.id_table = ds3232_id,
};
......
......@@ -105,7 +105,7 @@ static const struct rtc_class_ops ds3234_rtc_ops = {
.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;
unsigned char tmp;
......@@ -156,7 +156,7 @@ static int __devinit ds3234_probe(struct spi_device *spi)
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);
......@@ -170,7 +170,7 @@ static struct spi_driver ds3234_driver = {
.owner = THIS_MODULE,
},
.probe = ds3234_probe,
.remove = __devexit_p(ds3234_remove),
.remove = ds3234_remove,
};
module_spi_driver(ds3234_driver);
......
......@@ -127,7 +127,7 @@ static const struct attribute_group ep93xx_rtc_sysfs_files = {
.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 resource *res;
......@@ -174,7 +174,7 @@ static int __devinit ep93xx_rtc_probe(struct platform_device *pdev)
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);
......@@ -192,7 +192,7 @@ static struct platform_driver ep93xx_rtc_driver = {
.owner = THIS_MODULE,
},
.probe = ep93xx_rtc_probe,
.remove = __devexit_p(ep93xx_rtc_remove),
.remove = ep93xx_rtc_remove,
};
module_platform_driver(ep93xx_rtc_driver);
......
......@@ -361,8 +361,8 @@ static const struct rtc_class_ops fm3130_rtc_ops = {
static struct i2c_driver fm3130_driver;
static int __devinit fm3130_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int fm3130_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct fm3130 *fm3130;
int err = -ENODEV;
......@@ -546,7 +546,7 @@ static int __devinit fm3130_probe(struct i2c_client *client,
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);
......@@ -561,7 +561,7 @@ static struct i2c_driver fm3130_driver = {
.owner = THIS_MODULE,
},
.probe = fm3130_probe,
.remove = __devexit_p(fm3130_remove),
.remove = fm3130_remove,
.id_table = fm3130_id,
};
......
......@@ -480,7 +480,7 @@ static int dryice_rtc_probe(struct platform_device *pdev)
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);
......@@ -512,7 +512,7 @@ static struct platform_driver dryice_rtc_driver = {
.owner = THIS_MODULE,
.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)
......
......@@ -210,7 +210,7 @@ void jz4740_rtc_poweroff(struct device *dev)
}
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;
struct jz4740_rtc *rtc;
......@@ -297,7 +297,7 @@ static int __devinit jz4740_rtc_probe(struct platform_device *pdev)
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);
......@@ -347,7 +347,7 @@ static const struct dev_pm_ops jz4740_pm_ops = {
static struct platform_driver jz4740_rtc_driver = {
.probe = jz4740_rtc_probe,
.remove = __devexit_p(jz4740_rtc_remove),
.remove = jz4740_rtc_remove,
.driver = {
.name = "jz4740-rtc",
.owner = THIS_MODULE,
......
......@@ -197,7 +197,7 @@ static const struct rtc_class_ops lpc32xx_rtc_ops = {
.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 lpc32xx_rtc *rtc;
......@@ -299,7 +299,7 @@ static int __devinit lpc32xx_rtc_probe(struct platform_device *pdev)
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);