From patchwork Thu Nov 20 18:14:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 5350251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B21AFC11AC for ; Thu, 20 Nov 2014 18:17:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D59C3201B4 for ; Thu, 20 Nov 2014 18:17:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 115B2200F0 for ; Thu, 20 Nov 2014 18:17:02 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XrWGN-0008AH-Mz; Thu, 20 Nov 2014 18:15:27 +0000 Received: from mail-pd0-x230.google.com ([2607:f8b0:400e:c02::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XrWGK-00072I-CR for linux-arm-kernel@lists.infradead.org; Thu, 20 Nov 2014 18:15:25 +0000 Received: by mail-pd0-f176.google.com with SMTP id y10so3525485pdj.7 for ; Thu, 20 Nov 2014 10:15:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=kXdYK5BP3g804Tg86VE59iWT5M0zp8uIETQuc6pXP1w=; b=WDgY8453Yigc7Q83jgjHURq81mfYv1ESBeAcxNtTe/fQdjhqLsOoUdGHfIuHetbAlO vd7LbrgTkm9RwAUAlh7/4pnRQdsXEIQ9mbH02r3Cxgg3CyS2xuTOgWsknTZ1oU1YShnX p+Z36ZmjmMaXcVC9jWXJiqUahUvOI00ONTzBr5ewYz3NoIYyhb3JhfYj0FKvflwEA8cp UQQ3JAc/0CJoZ3KvhEdapDy1/9XcUgnWsL9ChqwGgushJYRVdErFWNJJ0yjTiCXI8oRa 8meNxkvLl/PmVW+zs8W+wcWBKyYRp90Kk5kPQ6BnVl/OHrVQiYe/sG3pLO9qNoJ/a603 SyWw== X-Received: by 10.66.154.10 with SMTP id vk10mr57112303pab.26.1416507303268; Thu, 20 Nov 2014 10:15:03 -0800 (PST) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPSA id bb3sm2665930pbc.15.2014.11.20.10.15.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Nov 2014 10:15:02 -0800 (PST) From: Florian Fainelli To: arm@kernel.org Subject: [PATCH arm-soc/next/soc] bus: brcmstb_gisb: resolve section mismatch Date: Thu, 20 Nov 2014 10:14:46 -0800 Message-Id: <1416507286-14083-1-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141120_101524_528616_BC6459DA X-CRM114-Status: GOOD ( 12.69 ) X-Spam-Score: -0.8 (/) Cc: olof@lixom.net, Florian Fainelli , computersforpeace@gmail.com, linux-arm-kernel@lists.infradead.org, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Arnd, Olof, This patch resolves a section mismatch found in the arm-soc tree in the next/soc branch which merged my two previous GISB patches. Thanks! 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 e7ccd21..27c319d 100644 --- a/drivers/bus/brcmstb_gisb.c +++ b/drivers/bus/brcmstb_gisb.c @@ -188,7 +188,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; @@ -305,7 +305,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, @@ -316,7 +315,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);