diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 20:28:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 20:28:10 -0400 |
commit | 4c5811bf463b0ef82fabbd1708f8bb2d753aeb18 (patch) | |
tree | ff37d31217c3804ca05de21a55a9b5ca1ca818b2 /drivers/video/tcx.c | |
parent | f74b9444192c60603020c61d7915b72893137edc (diff) | |
parent | 9f15444fefdb33509132ff5c9be60cb315c44cb2 (diff) |
Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
* 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6: (21 commits)
tty: serial: altera_jtaguart: Add device tree support
tty: serial: altera_uart: Add devicetree support
dt: eliminate of_platform_driver shim code
dt: Eliminate of_platform_{,un}register_driver
dt/serial: Eliminate users of of_platform_{,un}register_driver
dt/usb: Eliminate users of of_platform_{,un}register_driver
dt/video: Eliminate users of of_platform_{,un}register_driver
dt/net: Eliminate users of of_platform_{,un}register_driver
dt/sound: Eliminate users of of_platform_{,un}register_driver
dt/spi: Eliminate users of of_platform_{,un}register_driver
dt: uartlite: merge platform and of_platform driver bindings
dt: xilinx_hwicap: merge platform and of_platform driver bindings
ipmi: convert OF driver to platform driver
leds/leds-gpio: merge platform_driver with of_platform_driver
dt/sparc: Eliminate users of of_platform_{,un}register_driver
dt/powerpc: Eliminate users of of_platform_{,un}register_driver
dt/powerpc: move of_bus_type infrastructure to ibmebus
drivercore/dt: add a match table pointer to struct device
dt: Typo fix.
altera_ps2: Add devicetree support
...
Diffstat (limited to 'drivers/video/tcx.c')
-rw-r--r-- | drivers/video/tcx.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c index 77ad27955cf0..855b71993f61 100644 --- a/drivers/video/tcx.c +++ b/drivers/video/tcx.c | |||
@@ -362,8 +362,7 @@ static void tcx_unmap_regs(struct platform_device *op, struct fb_info *info, | |||
362 | info->screen_base, info->fix.smem_len); | 362 | info->screen_base, info->fix.smem_len); |
363 | } | 363 | } |
364 | 364 | ||
365 | static int __devinit tcx_probe(struct platform_device *op, | 365 | static int __devinit tcx_probe(struct platform_device *op) |
366 | const struct of_device_id *match) | ||
367 | { | 366 | { |
368 | struct device_node *dp = op->dev.of_node; | 367 | struct device_node *dp = op->dev.of_node; |
369 | struct fb_info *info; | 368 | struct fb_info *info; |
@@ -511,7 +510,7 @@ static const struct of_device_id tcx_match[] = { | |||
511 | }; | 510 | }; |
512 | MODULE_DEVICE_TABLE(of, tcx_match); | 511 | MODULE_DEVICE_TABLE(of, tcx_match); |
513 | 512 | ||
514 | static struct of_platform_driver tcx_driver = { | 513 | static struct platform_driver tcx_driver = { |
515 | .driver = { | 514 | .driver = { |
516 | .name = "tcx", | 515 | .name = "tcx", |
517 | .owner = THIS_MODULE, | 516 | .owner = THIS_MODULE, |
@@ -526,12 +525,12 @@ static int __init tcx_init(void) | |||
526 | if (fb_get_options("tcxfb", NULL)) | 525 | if (fb_get_options("tcxfb", NULL)) |
527 | return -ENODEV; | 526 | return -ENODEV; |
528 | 527 | ||
529 | return of_register_platform_driver(&tcx_driver); | 528 | return platform_driver_register(&tcx_driver); |
530 | } | 529 | } |
531 | 530 | ||
532 | static void __exit tcx_exit(void) | 531 | static void __exit tcx_exit(void) |
533 | { | 532 | { |
534 | of_unregister_platform_driver(&tcx_driver); | 533 | platform_driver_unregister(&tcx_driver); |
535 | } | 534 | } |
536 | 535 | ||
537 | module_init(tcx_init); | 536 | module_init(tcx_init); |