dasharo/linux
0
0
Fork 0
mirror of https://github.com/Dasharo/linux.git synced 2026-03-06 15:25:10 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel

Browse Source
This commit is contained in:
Linus Torvalds
2005-11-11 09:24:26 -08:00
parent 177294d191 3ae5eaec1d
commit 5643f000c1
95 changed files with 1501 additions and 1416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/video/backlight/corgi_bl.c
+11 -10
View File
@@ -79,13 +79,13 @@ static void corgibl_blank(int blank)
}
#ifdef CONFIG_PM
static int corgibl_suspend(struct device *dev, pm_message_t state)
static int corgibl_suspend(struct platform_device *dev, pm_message_t state)
{
corgibl_blank(FB_BLANK_POWERDOWN);
return 0;
}
static int corgibl_resume(struct device *dev)
static int corgibl_resume(struct platform_device *dev)
{
corgibl_blank(FB_BLANK_UNBLANK);
return 0;
@@ -143,9 +143,9 @@ static struct backlight_properties corgibl_data = {
static struct backlight_device *corgi_backlight_device;
static int __init corgibl_probe(struct device *dev)
static int __init corgibl_probe(struct platform_device *pdev)
{
struct corgibl_machinfo *machinfo = dev->platform_data;
struct corgibl_machinfo *machinfo = pdev->dev.platform_data;
corgibl_data.max_brightness = machinfo->max_intensity;
corgibl_mach_set_intensity = machinfo->set_bl_intensity;
@@ -162,7 +162,7 @@ static int __init corgibl_probe(struct device *dev)
return 0;
}
static int corgibl_remove(struct device *dev)
static int corgibl_remove(struct platform_device *dev)
{
backlight_device_unregister(corgi_backlight_device);
@@ -172,23 +172,24 @@ static int corgibl_remove(struct device *dev)
return 0;
}
static struct device_driver corgibl_driver = {
.name = "corgi-bl",
.bus = &platform_bus_type,
static struct platform_driver corgibl_driver = {
.probe = corgibl_probe,
.remove = corgibl_remove,
.suspend = corgibl_suspend,
.resume = corgibl_resume,
.driver = {
.name = "corgi-bl",
},
};
static int __init corgibl_init(void)
{
return driver_register(&corgibl_driver);
return platform_driver_register(&corgibl_driver);
}
static void __exit corgibl_exit(void)
{
driver_unregister(&corgibl_driver);
platform_driver_unregister(&corgibl_driver);
}
module_init(corgibl_init);