* Re: [PATCH] hgafb: convert to new platform driver API (bugzilla #9689)
2008-06-02 17:36 [PATCH] hgafb: convert to new platform driver API (bugzilla #9689) Krzysztof Helt
@ 2008-06-03 23:13 ` Andrew Morton
2008-06-04 0:03 ` Anton Vorontsov
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Morton @ 2008-06-03 23:13 UTC (permalink / raw)
To: Krzysztof Helt; +Cc: Anton Vorontsov, linux-fbdev-devel
On Mon, 2 Jun 2008 19:36:08 +0200
Krzysztof Helt <krzysztof.h1@poczta.fm> wrote:
> From: Krzysztof Helt <krzysztof.h1@wp.pl>
>
> Convert the hgafb driver to use new platform driver API.
> This solves problem reported in Bugzilla #9689.
>
> Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
> ---
>
> diff -urp linux-rc2/drivers/video/hgafb.c linux-new/drivers/video/hgafb.c
> --- linux-rc2/drivers/video/hgafb.c 2008-04-17 04:49:44.000000000 +0200
> +++ linux-new/drivers/video/hgafb.c 2008-06-02 19:20:54.778088766 +0200
> @@ -547,7 +547,7 @@ static struct fb_ops hgafb_ops = {
> * Initialization
> */
>
> -static int __init hgafb_probe(struct device *device)
> +static int __init hgafb_probe(struct platform_device *pdev)
> {
> struct fb_info *info;
>
> @@ -561,7 +561,7 @@ static int __init hgafb_probe(struct dev
> printk(KERN_INFO "hgafb: %s with %ldK of memory detected.\n",
> hga_type_name, hga_vram_len/1024);
>
> - info = framebuffer_alloc(0, NULL);
> + info = framebuffer_alloc(0, &pdev->dev);
> if (!info) {
> iounmap(hga_vram);
> return -ENOMEM;
> @@ -589,13 +589,13 @@ static int __init hgafb_probe(struct dev
>
> printk(KERN_INFO "fb%d: %s frame buffer device\n",
> info->node, info->fix.id);
> - dev_set_drvdata(device, info);
> + platform_set_drvdata(pdev, info);
> return 0;
> }
>
> -static int hgafb_remove(struct device *device)
> +static int hgafb_remove(struct platform_device *pdev)
> {
> - struct fb_info *info = dev_get_drvdata(device);
> + struct fb_info *info = platform_get_drvdata(pdev);
>
> hga_txt_mode();
> hga_clear_screen();
> @@ -616,16 +616,15 @@ static int hgafb_remove(struct device *d
> return 0;
> }
>
> -static struct device_driver hgafb_driver = {
> - .name = "hgafb",
> - .bus = &platform_bus_type,
> +static struct platform_driver hgafb_driver = {
> .probe = hgafb_probe,
> .remove = hgafb_remove,
> + .driver = {
> + .name = "hgafb",
> + },
> };
>
> -static struct platform_device hgafb_device = {
> - .name = "hgafb",
> -};
> +static struct platform_device *hgafb_device;
>
> static int __init hgafb_init(void)
> {
> @@ -634,12 +633,15 @@ static int __init hgafb_init(void)
> if (fb_get_options("hgafb", NULL))
> return -ENODEV;
>
> - ret = driver_register(&hgafb_driver);
> + ret = platform_driver_register(&hgafb_driver);
>
> if (!ret) {
> - ret = platform_device_register(&hgafb_device);
> - if (ret)
> - driver_unregister(&hgafb_driver);
> + hgafb_device = platform_device_register_simple("hgafb", 0, NULL, 0);
> +
> + if (IS_ERR(hgafb_device)) {
> + platform_driver_unregister(&hgafb_driver);
> + ret = PTR_ERR(hgafb_device);
> + }
> }
>
> return ret;
> @@ -647,8 +649,8 @@ static int __init hgafb_init(void)
>
> static void __exit hgafb_exit(void)
> {
> - platform_device_unregister(&hgafb_device);
> - driver_unregister(&hgafb_driver);
> + platform_device_unregister(hgafb_device);
> + platform_driver_unregister(&hgafb_driver);
> }
Oh. I just merged Anton's similar patch, below.
What should we do?
From: Anton Vorontsov <avorontsov@ru.mvista.com>
We should allocate platform device dynamically, otherwise it can't be removed.
Also, back in time it was acceptable to mix devices and platform_devices,
today this might cause all sort of bugs. Fix that too.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Cc: <devzero@web.de>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Greg KH <greg@kroah.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/video/hgafb.c | 41 ++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff -puN drivers/video/hgafb.c~hgafb-fix-module-removal drivers/video/hgafb.c
--- a/drivers/video/hgafb.c~hgafb-fix-module-removal
+++ a/drivers/video/hgafb.c
@@ -547,7 +547,7 @@ static struct fb_ops hgafb_ops = {
* Initialization
*/
-static int __init hgafb_probe(struct device *device)
+static int __init hgafb_probe(struct platform_device *pdev)
{
struct fb_info *info;
@@ -589,13 +589,13 @@ static int __init hgafb_probe(struct dev
printk(KERN_INFO "fb%d: %s frame buffer device\n",
info->node, info->fix.id);
- dev_set_drvdata(device, info);
+ platform_set_drvdata(pdev, info);
return 0;
}
-static int hgafb_remove(struct device *device)
+static int __devexit hgafb_remove(struct platform_device *pdev)
{
- struct fb_info *info = dev_get_drvdata(device);
+ struct fb_info *info = platform_get_drvdata(pdev);
hga_txt_mode();
hga_clear_screen();
@@ -616,16 +616,15 @@ static int hgafb_remove(struct device *d
return 0;
}
-static struct device_driver hgafb_driver = {
- .name = "hgafb",
- .bus = &platform_bus_type,
+static struct platform_driver hgafb_driver = {
+ .driver = {
+ .name = "hgafb",
+ },
.probe = hgafb_probe,
- .remove = hgafb_remove,
+ .remove = __devexit_p(hgafb_remove),
};
-static struct platform_device hgafb_device = {
- .name = "hgafb",
-};
+static struct platform_device *hgafb_device;
static int __init hgafb_init(void)
{
@@ -634,21 +633,23 @@ static int __init hgafb_init(void)
if (fb_get_options("hgafb", NULL))
return -ENODEV;
- ret = driver_register(&hgafb_driver);
-
- if (!ret) {
- ret = platform_device_register(&hgafb_device);
- if (ret)
- driver_unregister(&hgafb_driver);
+ ret = platform_driver_register(&hgafb_driver);
+ if (ret)
+ return ret;
+
+ hgafb_device = platform_device_register_simple("hgafb", -1, NULL, 0);
+ if (!hgafb_device) {
+ platform_driver_unregister(&hgafb_driver);
+ return -ENOMEM;
}
- return ret;
+ return 0;
}
static void __exit hgafb_exit(void)
{
- platform_device_unregister(&hgafb_device);
- driver_unregister(&hgafb_driver);
+ platform_device_unregister(hgafb_device);
+ platform_driver_unregister(&hgafb_driver);
}
/* -------------------------------------------------------------------------
_
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
^ permalink raw reply [flat|nested] 3+ messages in thread