diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2014-11-20 10:14:46 -0800 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-21 12:32:43 +0100 |
| commit | 2e8a29a1c9aaa41f72a71bb81c3df66da8156c1e (patch) | |
| tree | 05dcac949ede6d728abe7f88c25edef2d5088a7d | |
| parent | a850c427029e5b9953fe4d4fe4fef10a61ee165a (diff) | |
| download | blackbird-op-linux-2e8a29a1c9aaa41f72a71bb81c3df66da8156c1e.tar.gz blackbird-op-linux-2e8a29a1c9aaa41f72a71bb81c3df66da8156c1e.zip | |
bus: brcmstb_gisb: resolve section mismatch
Commit f1bee783dd37 moved the call to hook_fault_code in
brcmstb_gisb_arb_probe() which now calls a function annotated with __init, so
this one must also be annotated with __init.
In order to avoid introducing another section mismatch, call
platform_driver_probe() manually and remove the .probe assignment from
brcmstb_gisb_arb_driver, this is very similar to what
drivers/pci/host/pci-imx6.c does since we basically have the same constraints
here.
Fixes: f1bee783dd37 ("bus: brcmstb_gisb: register the fault code hook")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | drivers/bus/brcmstb_gisb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/bus/brcmstb_gisb.c b/drivers/bus/brcmstb_gisb.c index f2cd6a2d40b4..b801234dfc0d 100644 --- a/drivers/bus/brcmstb_gisb.c +++ b/drivers/bus/brcmstb_gisb.c @@ -192,7 +192,7 @@ static struct attribute_group gisb_arb_sysfs_attr_group = { .attrs = gisb_arb_sysfs_attrs, }; -static int brcmstb_gisb_arb_probe(struct platform_device *pdev) +static int __init brcmstb_gisb_arb_probe(struct platform_device *pdev) { struct device_node *dn = pdev->dev.of_node; struct brcmstb_gisb_arb_device *gdev; @@ -273,7 +273,6 @@ static const struct of_device_id brcmstb_gisb_arb_of_match[] = { }; static struct platform_driver brcmstb_gisb_arb_driver = { - .probe = brcmstb_gisb_arb_probe, .driver = { .name = "brcm-gisb-arb", .owner = THIS_MODULE, @@ -283,7 +282,8 @@ static struct platform_driver brcmstb_gisb_arb_driver = { static int __init brcm_gisb_driver_init(void) { - return platform_driver_register(&brcmstb_gisb_arb_driver); + return platform_driver_probe(&brcmstb_gisb_arb_driver, + brcmstb_gisb_arb_probe); } module_init(brcm_gisb_driver_init); |
