diff options
Diffstat (limited to 'drivers/rtc/rtc-mrst.c')
| -rw-r--r-- | drivers/rtc/rtc-mrst.c | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c index f51719bf4a7..578baf9d972 100644 --- a/drivers/rtc/rtc-mrst.c +++ b/drivers/rtc/rtc-mrst.c @@ -322,8 +322,8 @@ static irqreturn_t mrst_rtc_irq(int irq, void *p)  	return IRQ_NONE;  } -static int __devinit -vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq) +static int vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, +			      int rtc_irq)  {  	int retval = 0;  	unsigned char rtc_control; @@ -394,7 +394,7 @@ static void rtc_mrst_do_shutdown(void)  	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 resource *iomem; @@ -503,14 +503,14 @@ static inline int mrst_poweroff(struct device *dev)  #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,  			platform_get_resource(pdev, IORESOURCE_MEM, 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);  	return 0; @@ -528,7 +528,7 @@ MODULE_ALIAS("platform:vrtc_mrst");  static struct platform_driver vrtc_mrst_platform_driver = {  	.probe		= vrtc_mrst_platform_probe, -	.remove		= __devexit_p(vrtc_mrst_platform_remove), +	.remove		= vrtc_mrst_platform_remove,  	.shutdown	= vrtc_mrst_platform_shutdown,  	.driver = {  		.name		= (char *) driver_name,  |