redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

bus: brcmstb_gisb: resolve section mismatch 

Commit f1bee783dd 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: f1bee783dd ("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>
hifive-unleashed-5.1
Florian Fainelli 2014-11-20 10:14:46 -08:00 committed by Arnd Bergmann
parent a850c42702
commit 2e8a29a1c9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/bus/brcmstb_gisb.c
View File

@ -192,7 +192,7 @@ static struct attribute_group gisb_arb_sysfs_attr_group = {
.attrs = gisb_arb_sysfs_attrs, .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 device_node *dn = pdev->dev.of_node;
struct brcmstb_gisb_arb_device *gdev; 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 = { static struct platform_driver brcmstb_gisb_arb_driver = {
.probe = brcmstb_gisb_arb_probe,
.driver = { .driver = {
.name = "brcm-gisb-arb", .name = "brcm-gisb-arb",
.owner = THIS_MODULE, .owner = THIS_MODULE,
@ -283,7 +282,8 @@ static struct platform_driver brcmstb_gisb_arb_driver = {
static int __init brcm_gisb_driver_init(void) 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); module_init(brcm_gisb_driver_init);