← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/video/ffb.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/video/ffb.c
893
893
        info->fix.accel = FB_ACCEL_SUN_CREATOR;
894
894
}
895
895
 
896
 
static int __devinit ffb_probe(struct platform_device *op,
897
 
                               const struct of_device_id *match)
 
896
static int __devinit ffb_probe(struct platform_device *op)
898
897
{
899
898
        struct device_node *dp = op->dev.of_node;
900
899
        struct ffb_fbc __iomem *fbc;
1011
1010
        fb_dealloc_cmap(&info->cmap);
1012
1011
 
1013
1012
out_unmap_dac:
1014
 
        of_iounmap(&op->resource[2], par->fbc, sizeof(struct ffb_fbc));
 
1013
        of_iounmap(&op->resource[1], par->dac, sizeof(struct ffb_dac));
1015
1014
 
1016
1015
out_unmap_fbc:
1017
1016
        of_iounmap(&op->resource[2], par->fbc, sizeof(struct ffb_fbc));
1052
1051
};
1053
1052
MODULE_DEVICE_TABLE(of, ffb_match);
1054
1053
 
1055
 
static struct of_platform_driver ffb_driver = {
 
1054
static struct platform_driver ffb_driver = {
1056
1055
        .driver = {
1057
1056
                .name = "ffb",
1058
1057
                .owner = THIS_MODULE,
1067
1066
        if (fb_get_options("ffb", NULL))
1068
1067
                return -ENODEV;
1069
1068
 
1070
 
        return of_register_platform_driver(&ffb_driver);
 
1069
        return platform_driver_register(&ffb_driver);
1071
1070
}
1072
1071
 
1073
1072
static void __exit ffb_exit(void)
1074
1073
{
1075
 
        of_unregister_platform_driver(&ffb_driver);
 
1074
        platform_driver_unregister(&ffb_driver);
1076
1075
}
1077
1076
 
1078
1077
module_init(ffb_init);