From c04a33df79ec287d0a4eab5fc03be3c84cc50f35 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 15 Dec 2012 23:50:54 +0100 Subject: [PATCH] --- yaml --- r: 355348 b: refs/heads/master c: 40ee6fce7a0d3a2b2a1f2a14900af98a49a9ff40 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/sh/pfc/core.c | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index d45d8d7351d3..4e5b1100e6e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4aeacd5bd5c354c1b36bfe3d5d72806ecd9605a0 +refs/heads/master: 40ee6fce7a0d3a2b2a1f2a14900af98a49a9ff40 diff --git a/trunk/drivers/sh/pfc/core.c b/trunk/drivers/sh/pfc/core.c index 1bb38e8b36ad..cd8f09dcea95 100644 --- a/trunk/drivers/sh/pfc/core.c +++ b/trunk/drivers/sh/pfc/core.c @@ -573,19 +573,16 @@ static struct platform_device sh_pfc_device = { int __init register_sh_pfc(struct sh_pfc_platform_data *pdata) { - int rc; - sh_pfc_device.dev.platform_data = pdata; - rc = platform_driver_register(&sh_pfc_driver); - if (likely(!rc)) { - rc = platform_device_register(&sh_pfc_device); - if (unlikely(rc)) - platform_driver_unregister(&sh_pfc_driver); - } + return platform_device_register(&sh_pfc_device); +} - return rc; +static int __init sh_pfc_init(void) +{ + return platform_driver_register(&sh_pfc_driver); } +postcore_initcall(sh_pfc_init); static void __exit sh_pfc_exit(void) {