mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
This commit is contained in:
Linus Torvalds
commit
5643f000c1
95 changed files with 1501 additions and 1416 deletions
|
|
@ -382,7 +382,7 @@ static struct rtc_ops s3c2410_rtcops = {
|
|||
.proc = s3c2410_rtc_proc,
|
||||
};
|
||||
|
||||
static void s3c2410_rtc_enable(struct device *dev, int en)
|
||||
static void s3c2410_rtc_enable(struct platform_device *pdev, int en)
|
||||
{
|
||||
unsigned int tmp;
|
||||
|
||||
|
|
@ -399,21 +399,21 @@ static void s3c2410_rtc_enable(struct device *dev, int en)
|
|||
/* re-enable the device, and check it is ok */
|
||||
|
||||
if ((readb(S3C2410_RTCCON) & S3C2410_RTCCON_RTCEN) == 0){
|
||||
dev_info(dev, "rtc disabled, re-enabling\n");
|
||||
dev_info(&pdev->dev, "rtc disabled, re-enabling\n");
|
||||
|
||||
tmp = readb(S3C2410_RTCCON);
|
||||
writeb(tmp | S3C2410_RTCCON_RTCEN , S3C2410_RTCCON);
|
||||
}
|
||||
|
||||
if ((readb(S3C2410_RTCCON) & S3C2410_RTCCON_CNTSEL)){
|
||||
dev_info(dev, "removing S3C2410_RTCCON_CNTSEL\n");
|
||||
dev_info(&pdev->dev, "removing S3C2410_RTCCON_CNTSEL\n");
|
||||
|
||||
tmp = readb(S3C2410_RTCCON);
|
||||
writeb(tmp& ~S3C2410_RTCCON_CNTSEL , S3C2410_RTCCON);
|
||||
}
|
||||
|
||||
if ((readb(S3C2410_RTCCON) & S3C2410_RTCCON_CLKRST)){
|
||||
dev_info(dev, "removing S3C2410_RTCCON_CLKRST\n");
|
||||
dev_info(&pdev->dev, "removing S3C2410_RTCCON_CLKRST\n");
|
||||
|
||||
tmp = readb(S3C2410_RTCCON);
|
||||
writeb(tmp & ~S3C2410_RTCCON_CLKRST, S3C2410_RTCCON);
|
||||
|
|
@ -421,7 +421,7 @@ static void s3c2410_rtc_enable(struct device *dev, int en)
|
|||
}
|
||||
}
|
||||
|
||||
static int s3c2410_rtc_remove(struct device *dev)
|
||||
static int s3c2410_rtc_remove(struct platform_device *dev)
|
||||
{
|
||||
unregister_rtc(&s3c2410_rtcops);
|
||||
|
||||
|
|
@ -438,25 +438,24 @@ static int s3c2410_rtc_remove(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int s3c2410_rtc_probe(struct device *dev)
|
||||
static int s3c2410_rtc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct resource *res;
|
||||
int ret;
|
||||
|
||||
pr_debug("%s: probe=%p, device=%p\n", __FUNCTION__, pdev, dev);
|
||||
pr_debug("%s: probe=%p\n", __FUNCTION__, pdev);
|
||||
|
||||
/* find the IRQs */
|
||||
|
||||
s3c2410_rtc_tickno = platform_get_irq(pdev, 1);
|
||||
if (s3c2410_rtc_tickno <= 0) {
|
||||
dev_err(dev, "no irq for rtc tick\n");
|
||||
dev_err(&pdev->dev, "no irq for rtc tick\n");
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
s3c2410_rtc_alarmno = platform_get_irq(pdev, 0);
|
||||
if (s3c2410_rtc_alarmno <= 0) {
|
||||
dev_err(dev, "no irq for alarm\n");
|
||||
dev_err(&pdev->dev, "no irq for alarm\n");
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
|
|
@ -467,7 +466,7 @@ static int s3c2410_rtc_probe(struct device *dev)
|
|||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (res == NULL) {
|
||||
dev_err(dev, "failed to get memory region resource\n");
|
||||
dev_err(&pdev->dev, "failed to get memory region resource\n");
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
|
|
@ -475,14 +474,14 @@ static int s3c2410_rtc_probe(struct device *dev)
|
|||
pdev->name);
|
||||
|
||||
if (s3c2410_rtc_mem == NULL) {
|
||||
dev_err(dev, "failed to reserve memory region\n");
|
||||
dev_err(&pdev->dev, "failed to reserve memory region\n");
|
||||
ret = -ENOENT;
|
||||
goto exit_err;
|
||||
}
|
||||
|
||||
s3c2410_rtc_base = ioremap(res->start, res->end - res->start + 1);
|
||||
if (s3c2410_rtc_base == NULL) {
|
||||
dev_err(dev, "failed ioremap()\n");
|
||||
dev_err(&pdev->dev, "failed ioremap()\n");
|
||||
ret = -EINVAL;
|
||||
goto exit_err;
|
||||
}
|
||||
|
|
@ -494,7 +493,7 @@ static int s3c2410_rtc_probe(struct device *dev)
|
|||
|
||||
/* check to see if everything is setup correctly */
|
||||
|
||||
s3c2410_rtc_enable(dev, 1);
|
||||
s3c2410_rtc_enable(pdev, 1);
|
||||
|
||||
pr_debug("s3c2410_rtc: RTCCON=%02x\n", readb(S3C2410_RTCCON));
|
||||
|
||||
|
|
@ -506,7 +505,7 @@ static int s3c2410_rtc_probe(struct device *dev)
|
|||
return 0;
|
||||
|
||||
exit_err:
|
||||
dev_err(dev, "error %d during initialisation\n", ret);
|
||||
dev_err(&pdev->dev, "error %d during initialisation\n", ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -519,7 +518,7 @@ static struct timespec s3c2410_rtc_delta;
|
|||
|
||||
static int ticnt_save;
|
||||
|
||||
static int s3c2410_rtc_suspend(struct device *dev, pm_message_t state)
|
||||
static int s3c2410_rtc_suspend(struct platform_device *pdev, pm_message_t state)
|
||||
{
|
||||
struct rtc_time tm;
|
||||
struct timespec time;
|
||||
|
|
@ -535,19 +534,19 @@ static int s3c2410_rtc_suspend(struct device *dev, pm_message_t state)
|
|||
s3c2410_rtc_gettime(&tm);
|
||||
rtc_tm_to_time(&tm, &time.tv_sec);
|
||||
save_time_delta(&s3c2410_rtc_delta, &time);
|
||||
s3c2410_rtc_enable(dev, 0);
|
||||
s3c2410_rtc_enable(pdev, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int s3c2410_rtc_resume(struct device *dev)
|
||||
static int s3c2410_rtc_resume(struct platform_device *pdev)
|
||||
{
|
||||
struct rtc_time tm;
|
||||
struct timespec time;
|
||||
|
||||
time.tv_nsec = 0;
|
||||
|
||||
s3c2410_rtc_enable(dev, 1);
|
||||
s3c2410_rtc_enable(pdev, 1);
|
||||
s3c2410_rtc_gettime(&tm);
|
||||
rtc_tm_to_time(&tm, &time.tv_sec);
|
||||
restore_time_delta(&s3c2410_rtc_delta, &time);
|
||||
|
|
@ -560,14 +559,15 @@ static int s3c2410_rtc_resume(struct device *dev)
|
|||
#define s3c2410_rtc_resume NULL
|
||||
#endif
|
||||
|
||||
static struct device_driver s3c2410_rtcdrv = {
|
||||
.name = "s3c2410-rtc",
|
||||
.owner = THIS_MODULE,
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver s3c2410_rtcdrv = {
|
||||
.probe = s3c2410_rtc_probe,
|
||||
.remove = s3c2410_rtc_remove,
|
||||
.suspend = s3c2410_rtc_suspend,
|
||||
.resume = s3c2410_rtc_resume,
|
||||
.driver = {
|
||||
.name = "s3c2410-rtc",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
static char __initdata banner[] = "S3C2410 RTC, (c) 2004 Simtec Electronics\n";
|
||||
|
|
@ -575,12 +575,12 @@ static char __initdata banner[] = "S3C2410 RTC, (c) 2004 Simtec Electronics\n";
|
|||
static int __init s3c2410_rtc_init(void)
|
||||
{
|
||||
printk(banner);
|
||||
return driver_register(&s3c2410_rtcdrv);
|
||||
return platform_driver_register(&s3c2410_rtcdrv);
|
||||
}
|
||||
|
||||
static void __exit s3c2410_rtc_exit(void)
|
||||
{
|
||||
driver_unregister(&s3c2410_rtcdrv);
|
||||
platform_driver_unregister(&s3c2410_rtcdrv);
|
||||
}
|
||||
|
||||
module_init(s3c2410_rtc_init);
|
||||
|
|
|
|||
|
|
@ -1168,7 +1168,7 @@ static int sonypi_disable(void)
|
|||
#ifdef CONFIG_PM
|
||||
static int old_camera_power;
|
||||
|
||||
static int sonypi_suspend(struct device *dev, pm_message_t state)
|
||||
static int sonypi_suspend(struct platform_device *dev, pm_message_t state)
|
||||
{
|
||||
old_camera_power = sonypi_device.camera_power;
|
||||
sonypi_disable();
|
||||
|
|
@ -1176,26 +1176,27 @@ static int sonypi_suspend(struct device *dev, pm_message_t state)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sonypi_resume(struct device *dev)
|
||||
static int sonypi_resume(struct platform_device *dev)
|
||||
{
|
||||
sonypi_enable(old_camera_power);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void sonypi_shutdown(struct device *dev)
|
||||
static void sonypi_shutdown(struct platform_device *dev)
|
||||
{
|
||||
sonypi_disable();
|
||||
}
|
||||
|
||||
static struct device_driver sonypi_driver = {
|
||||
.name = "sonypi",
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver sonypi_driver = {
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = sonypi_suspend,
|
||||
.resume = sonypi_resume,
|
||||
#endif
|
||||
.shutdown = sonypi_shutdown,
|
||||
.driver = {
|
||||
.name = "sonypi",
|
||||
},
|
||||
};
|
||||
|
||||
static int __devinit sonypi_create_input_devices(void)
|
||||
|
|
@ -1455,20 +1456,20 @@ static int __init sonypi_init(void)
|
|||
if (!dmi_check_system(sonypi_dmi_table))
|
||||
return -ENODEV;
|
||||
|
||||
ret = driver_register(&sonypi_driver);
|
||||
ret = platform_driver_register(&sonypi_driver);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = sonypi_probe();
|
||||
if (ret)
|
||||
driver_unregister(&sonypi_driver);
|
||||
platform_driver_unregister(&sonypi_driver);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void __exit sonypi_exit(void)
|
||||
{
|
||||
driver_unregister(&sonypi_driver);
|
||||
platform_driver_unregister(&sonypi_driver);
|
||||
sonypi_remove();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@ static void tb0219_pci_irq_init(void)
|
|||
vr41xx_set_irq_level(TB0219_PCI_SLOT3_PIN, IRQ_LEVEL_LOW);
|
||||
}
|
||||
|
||||
static int tb0219_probe(struct device *dev)
|
||||
static int tb0219_probe(struct platform_device *dev)
|
||||
{
|
||||
int retval;
|
||||
|
||||
|
|
@ -319,7 +319,7 @@ static int tb0219_probe(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int tb0219_remove(struct device *dev)
|
||||
static int tb0219_remove(struct platform_device *dev)
|
||||
{
|
||||
_machine_restart = old_machine_restart;
|
||||
|
||||
|
|
@ -333,11 +333,12 @@ static int tb0219_remove(struct device *dev)
|
|||
|
||||
static struct platform_device *tb0219_platform_device;
|
||||
|
||||
static struct device_driver tb0219_device_driver = {
|
||||
.name = "TB0219",
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver tb0219_device_driver = {
|
||||
.probe = tb0219_probe,
|
||||
.remove = tb0219_remove,
|
||||
.driver = {
|
||||
.name = "TB0219",
|
||||
},
|
||||
};
|
||||
|
||||
static int __devinit tanbac_tb0219_init(void)
|
||||
|
|
@ -348,7 +349,7 @@ static int __devinit tanbac_tb0219_init(void)
|
|||
if (IS_ERR(tb0219_platform_device))
|
||||
return PTR_ERR(tb0219_platform_device);
|
||||
|
||||
retval = driver_register(&tb0219_device_driver);
|
||||
retval = platform_driver_register(&tb0219_device_driver);
|
||||
if (retval < 0)
|
||||
platform_device_unregister(tb0219_platform_device);
|
||||
|
||||
|
|
@ -357,7 +358,7 @@ static int __devinit tanbac_tb0219_init(void)
|
|||
|
||||
static void __devexit tanbac_tb0219_exit(void)
|
||||
{
|
||||
driver_unregister(&tb0219_device_driver);
|
||||
platform_driver_unregister(&tb0219_device_driver);
|
||||
|
||||
platform_device_unregister(tb0219_platform_device);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -613,7 +613,7 @@ static struct file_operations gpio_fops = {
|
|||
.release = gpio_release,
|
||||
};
|
||||
|
||||
static int giu_probe(struct device *dev)
|
||||
static int giu_probe(struct platform_device *dev)
|
||||
{
|
||||
unsigned long start, size, flags = 0;
|
||||
unsigned int nr_pins = 0;
|
||||
|
|
@ -697,7 +697,7 @@ static int giu_probe(struct device *dev)
|
|||
return cascade_irq(GIUINT_IRQ, giu_get_irq);
|
||||
}
|
||||
|
||||
static int giu_remove(struct device *dev)
|
||||
static int giu_remove(struct platform_device *dev)
|
||||
{
|
||||
iounmap(giu_base);
|
||||
|
||||
|
|
@ -710,11 +710,12 @@ static int giu_remove(struct device *dev)
|
|||
|
||||
static struct platform_device *giu_platform_device;
|
||||
|
||||
static struct device_driver giu_device_driver = {
|
||||
.name = "GIU",
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver giu_device_driver = {
|
||||
.probe = giu_probe,
|
||||
.remove = giu_remove,
|
||||
.driver = {
|
||||
.name = "GIU",
|
||||
},
|
||||
};
|
||||
|
||||
static int __devinit vr41xx_giu_init(void)
|
||||
|
|
@ -725,7 +726,7 @@ static int __devinit vr41xx_giu_init(void)
|
|||
if (IS_ERR(giu_platform_device))
|
||||
return PTR_ERR(giu_platform_device);
|
||||
|
||||
retval = driver_register(&giu_device_driver);
|
||||
retval = platform_driver_register(&giu_device_driver);
|
||||
if (retval < 0)
|
||||
platform_device_unregister(giu_platform_device);
|
||||
|
||||
|
|
@ -734,7 +735,7 @@ static int __devinit vr41xx_giu_init(void)
|
|||
|
||||
static void __devexit vr41xx_giu_exit(void)
|
||||
{
|
||||
driver_unregister(&giu_device_driver);
|
||||
platform_driver_unregister(&giu_device_driver);
|
||||
|
||||
platform_device_unregister(giu_platform_device);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -560,13 +560,11 @@ static struct miscdevice rtc_miscdevice = {
|
|||
.fops = &rtc_fops,
|
||||
};
|
||||
|
||||
static int rtc_probe(struct device *dev)
|
||||
static int rtc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct platform_device *pdev;
|
||||
unsigned int irq;
|
||||
int retval;
|
||||
|
||||
pdev = to_platform_device(dev);
|
||||
if (pdev->num_resources != 2)
|
||||
return -EBUSY;
|
||||
|
||||
|
|
@ -635,7 +633,7 @@ static int rtc_probe(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int rtc_remove(struct device *dev)
|
||||
static int rtc_remove(struct platform_device *dev)
|
||||
{
|
||||
int retval;
|
||||
|
||||
|
|
@ -655,11 +653,12 @@ static int rtc_remove(struct device *dev)
|
|||
|
||||
static struct platform_device *rtc_platform_device;
|
||||
|
||||
static struct device_driver rtc_device_driver = {
|
||||
.name = rtc_name,
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver rtc_device_driver = {
|
||||
.probe = rtc_probe,
|
||||
.remove = rtc_remove,
|
||||
.driver = {
|
||||
.name = rtc_name,
|
||||
},
|
||||
};
|
||||
|
||||
static int __devinit vr41xx_rtc_init(void)
|
||||
|
|
@ -691,7 +690,7 @@ static int __devinit vr41xx_rtc_init(void)
|
|||
if (IS_ERR(rtc_platform_device))
|
||||
return PTR_ERR(rtc_platform_device);
|
||||
|
||||
retval = driver_register(&rtc_device_driver);
|
||||
retval = platform_driver_register(&rtc_device_driver);
|
||||
if (retval < 0)
|
||||
platform_device_unregister(rtc_platform_device);
|
||||
|
||||
|
|
@ -700,7 +699,7 @@ static int __devinit vr41xx_rtc_init(void)
|
|||
|
||||
static void __devexit vr41xx_rtc_exit(void)
|
||||
{
|
||||
driver_unregister(&rtc_device_driver);
|
||||
platform_driver_unregister(&rtc_device_driver);
|
||||
|
||||
platform_device_unregister(rtc_platform_device);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ static int mpcore_wdt_set_heartbeat(int t)
|
|||
*/
|
||||
static int mpcore_wdt_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
struct mpcore_wdt *wdt = dev_get_drvdata(&mpcore_wdt_dev->dev);
|
||||
struct mpcore_wdt *wdt = platform_get_drvdata(mpcore_wdt_dev);
|
||||
|
||||
if (test_and_set_bit(0, &wdt->timer_alive))
|
||||
return -EBUSY;
|
||||
|
|
@ -291,9 +291,9 @@ static int mpcore_wdt_ioctl(struct inode *inode, struct file *file,
|
|||
* System shutdown handler. Turn off the watchdog if we're
|
||||
* restarting or halting the system.
|
||||
*/
|
||||
static void mpcore_wdt_shutdown(struct device *_dev)
|
||||
static void mpcore_wdt_shutdown(struct platform_device *dev)
|
||||
{
|
||||
struct mpcore_wdt *wdt = dev_get_drvdata(_dev);
|
||||
struct mpcore_wdt *wdt = platform_get_drvdata(dev);
|
||||
|
||||
if (system_state == SYSTEM_RESTART || system_state == SYSTEM_HALT)
|
||||
mpcore_wdt_stop(wdt);
|
||||
|
|
@ -317,9 +317,8 @@ static struct miscdevice mpcore_wdt_miscdev = {
|
|||
.fops = &mpcore_wdt_fops,
|
||||
};
|
||||
|
||||
static int __devinit mpcore_wdt_probe(struct device *_dev)
|
||||
static int __devinit mpcore_wdt_probe(struct platform_device *dev)
|
||||
{
|
||||
struct platform_device *dev = to_platform_device(_dev);
|
||||
struct mpcore_wdt *wdt;
|
||||
struct resource *res;
|
||||
int ret;
|
||||
|
|
@ -364,7 +363,7 @@ static int __devinit mpcore_wdt_probe(struct device *_dev)
|
|||
}
|
||||
|
||||
mpcore_wdt_stop(wdt);
|
||||
dev_set_drvdata(&dev->dev, wdt);
|
||||
platform_set_drvdata(&dev->dev, wdt);
|
||||
mpcore_wdt_dev = dev;
|
||||
|
||||
return 0;
|
||||
|
|
@ -379,11 +378,11 @@ static int __devinit mpcore_wdt_probe(struct device *_dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit mpcore_wdt_remove(struct device *dev)
|
||||
static int __devexit mpcore_wdt_remove(struct platform_device *dev)
|
||||
{
|
||||
struct mpcore_wdt *wdt = dev_get_drvdata(dev);
|
||||
struct mpcore_wdt *wdt = platform_get_drvdata(dev);
|
||||
|
||||
dev_set_drvdata(dev, NULL);
|
||||
platform_set_drvdata(dev, NULL);
|
||||
|
||||
misc_deregister(&mpcore_wdt_miscdev);
|
||||
|
||||
|
|
@ -395,13 +394,14 @@ static int __devexit mpcore_wdt_remove(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct device_driver mpcore_wdt_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "mpcore_wdt",
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver mpcore_wdt_driver = {
|
||||
.probe = mpcore_wdt_probe,
|
||||
.remove = __devexit_p(mpcore_wdt_remove),
|
||||
.shutdown = mpcore_wdt_shutdown,
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "mpcore_wdt",
|
||||
},
|
||||
};
|
||||
|
||||
static char banner[] __initdata = KERN_INFO "MPcore Watchdog Timer: 0.1. mpcore_noboot=%d mpcore_margin=%d sec (nowayout= %d)\n";
|
||||
|
|
@ -420,12 +420,12 @@ static int __init mpcore_wdt_init(void)
|
|||
|
||||
printk(banner, mpcore_noboot, mpcore_margin, nowayout);
|
||||
|
||||
return driver_register(&mpcore_wdt_driver);
|
||||
return platform_driver_register(&mpcore_wdt_driver);
|
||||
}
|
||||
|
||||
static void __exit mpcore_wdt_exit(void)
|
||||
{
|
||||
driver_unregister(&mpcore_wdt_driver);
|
||||
platform_driver_unregister(&mpcore_wdt_driver);
|
||||
}
|
||||
|
||||
module_init(mpcore_wdt_init);
|
||||
|
|
|
|||
|
|
@ -182,10 +182,9 @@ static struct miscdevice mv64x60_wdt_miscdev = {
|
|||
.fops = &mv64x60_wdt_fops,
|
||||
};
|
||||
|
||||
static int __devinit mv64x60_wdt_probe(struct device *dev)
|
||||
static int __devinit mv64x60_wdt_probe(struct platform_device *dev)
|
||||
{
|
||||
struct platform_device *pd = to_platform_device(dev);
|
||||
struct mv64x60_wdt_pdata *pdata = pd->dev.platform_data;
|
||||
struct mv64x60_wdt_pdata *pdata = dev->dev.platform_data;
|
||||
int bus_clk = 133;
|
||||
|
||||
mv64x60_wdt_timeout = 10;
|
||||
|
|
@ -202,7 +201,7 @@ static int __devinit mv64x60_wdt_probe(struct device *dev)
|
|||
return misc_register(&mv64x60_wdt_miscdev);
|
||||
}
|
||||
|
||||
static int __devexit mv64x60_wdt_remove(struct device *dev)
|
||||
static int __devexit mv64x60_wdt_remove(struct platform_device *dev)
|
||||
{
|
||||
misc_deregister(&mv64x60_wdt_miscdev);
|
||||
|
||||
|
|
@ -212,12 +211,13 @@ static int __devexit mv64x60_wdt_remove(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct device_driver mv64x60_wdt_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = MV64x60_WDT_NAME,
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver mv64x60_wdt_driver = {
|
||||
.probe = mv64x60_wdt_probe,
|
||||
.remove = __devexit_p(mv64x60_wdt_remove),
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = MV64x60_WDT_NAME,
|
||||
},
|
||||
};
|
||||
|
||||
static struct platform_device *mv64x60_wdt_dev;
|
||||
|
|
@ -235,14 +235,14 @@ static int __init mv64x60_wdt_init(void)
|
|||
goto out;
|
||||
}
|
||||
|
||||
ret = driver_register(&mv64x60_wdt_driver);
|
||||
ret = platform_driver_register(&mv64x60_wdt_driver);
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void __exit mv64x60_wdt_exit(void)
|
||||
{
|
||||
driver_unregister(&mv64x60_wdt_driver);
|
||||
platform_driver_unregister(&mv64x60_wdt_driver);
|
||||
platform_device_unregister(mv64x60_wdt_dev);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -347,15 +347,14 @@ static irqreturn_t s3c2410wdt_irq(int irqno, void *param,
|
|||
}
|
||||
/* device interface */
|
||||
|
||||
static int s3c2410wdt_probe(struct device *dev)
|
||||
static int s3c2410wdt_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct resource *res;
|
||||
int started = 0;
|
||||
int ret;
|
||||
int size;
|
||||
|
||||
DBG("%s: probe=%p, device=%p\n", __FUNCTION__, pdev, dev);
|
||||
DBG("%s: probe=%p\n", __FUNCTION__, pdev);
|
||||
|
||||
/* get the memory region for the watchdog timer */
|
||||
|
||||
|
|
@ -386,13 +385,13 @@ static int s3c2410wdt_probe(struct device *dev)
|
|||
return -ENOENT;
|
||||
}
|
||||
|
||||
ret = request_irq(res->start, s3c2410wdt_irq, 0, pdev->name, dev);
|
||||
ret = request_irq(res->start, s3c2410wdt_irq, 0, pdev->name, pdev);
|
||||
if (ret != 0) {
|
||||
printk(KERN_INFO PFX "failed to install irq (%d)\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
wdt_clock = clk_get(dev, "watchdog");
|
||||
wdt_clock = clk_get(&pdev->dev, "watchdog");
|
||||
if (wdt_clock == NULL) {
|
||||
printk(KERN_INFO PFX "failed to find watchdog clock source\n");
|
||||
return -ENOENT;
|
||||
|
|
@ -430,7 +429,7 @@ static int s3c2410wdt_probe(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int s3c2410wdt_remove(struct device *dev)
|
||||
static int s3c2410wdt_remove(struct platform_device *dev)
|
||||
{
|
||||
if (wdt_mem != NULL) {
|
||||
release_resource(wdt_mem);
|
||||
|
|
@ -454,7 +453,7 @@ static int s3c2410wdt_remove(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void s3c2410wdt_shutdown(struct device *dev)
|
||||
static void s3c2410wdt_shutdown(struct platform_device *dev)
|
||||
{
|
||||
s3c2410wdt_stop();
|
||||
}
|
||||
|
|
@ -464,7 +463,7 @@ static void s3c2410wdt_shutdown(struct device *dev)
|
|||
static unsigned long wtcon_save;
|
||||
static unsigned long wtdat_save;
|
||||
|
||||
static int s3c2410wdt_suspend(struct device *dev, pm_message_t state)
|
||||
static int s3c2410wdt_suspend(struct platform_device *dev, pm_message_t state)
|
||||
{
|
||||
/* Save watchdog state, and turn it off. */
|
||||
wtcon_save = readl(wdt_base + S3C2410_WTCON);
|
||||
|
|
@ -476,7 +475,7 @@ static int s3c2410wdt_suspend(struct device *dev, pm_message_t state)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int s3c2410wdt_resume(struct device *dev)
|
||||
static int s3c2410wdt_resume(struct platform_device *dev)
|
||||
{
|
||||
/* Restore watchdog state. */
|
||||
|
||||
|
|
@ -496,15 +495,16 @@ static int s3c2410wdt_resume(struct device *dev)
|
|||
#endif /* CONFIG_PM */
|
||||
|
||||
|
||||
static struct device_driver s3c2410wdt_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "s3c2410-wdt",
|
||||
.bus = &platform_bus_type,
|
||||
static struct platform_driver s3c2410wdt_driver = {
|
||||
.probe = s3c2410wdt_probe,
|
||||
.remove = s3c2410wdt_remove,
|
||||
.shutdown = s3c2410wdt_shutdown,
|
||||
.suspend = s3c2410wdt_suspend,
|
||||
.resume = s3c2410wdt_resume,
|
||||
.driver = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "s3c2410-wdt",
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -513,12 +513,12 @@ static char banner[] __initdata = KERN_INFO "S3C2410 Watchdog Timer, (c) 2004 Si
|
|||
static int __init watchdog_init(void)
|
||||
{
|
||||
printk(banner);
|
||||
return driver_register(&s3c2410wdt_driver);
|
||||
return platform_driver_register(&s3c2410wdt_driver);
|
||||
}
|
||||
|
||||
static void __exit watchdog_exit(void)
|
||||
{
|
||||
driver_unregister(&s3c2410wdt_driver);
|
||||
platform_driver_unregister(&s3c2410wdt_driver);
|
||||
}
|
||||
|
||||
module_init(watchdog_init);
|
||||
|
|
|
|||
Loading…
Reference in a new issue