From patchwork Wed Jul 23 17:07:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Moll X-Patchwork-Id: 34171 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A41302206B for ; Wed, 23 Jul 2014 17:09:40 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id d1sf1694649wiv.11 for ; Wed, 23 Jul 2014 10:09:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=Q1u/Mj78yNMSEPx3VczlrV6xCzoSKBZ0A4wJKeH8u2c=; b=TxJLxhbLLXjruleFmE4rU6u9pRP5iLm0hfUPcp3hhXBrP5gmz6G2Y5fHrP8Gf82w5P VMoBDgf7whzXKjN3T7pDZbP1a8ycF2jFCwoB777ZkA9jndiKV2/qzg0xBevin9eVJfts bFGMCeEaHazbntq+kF936yktiBJVZkUXKGKAB7qqdP42wsyzoULLecl0SyW2OLF3wP5x Iyp9U6185ALERS0UoGGj3TPqeAL8Seq0CsC2qnszBZ41UB6jX7HdllvdWpSwDaJDoK/b d/ugaz8vpkT0BNm5qrSqWxf5xspWhulwz42PvhQghRoBHIbGhute1KmkUkoVNB/gdEFF gbvA== X-Gm-Message-State: ALoCoQkpXXgqaJ29ovthBC/WuUgINiCfRp6YkMGL9SGjOtEvoe4zP5utMuxTPymiSVvx0ptIyF0W X-Received: by 10.112.126.196 with SMTP id na4mr286940lbb.17.1406135377658; Wed, 23 Jul 2014 10:09:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.239 with SMTP id l102ls414179qgd.81.gmail; Wed, 23 Jul 2014 10:09:37 -0700 (PDT) X-Received: by 10.221.55.70 with SMTP id vx6mr4045040vcb.23.1406135377377; Wed, 23 Jul 2014 10:09:37 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id q2si2823766vcz.47.2014.07.23.10.09.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Jul 2014 10:09:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id ij19so2665231vcb.25 for ; Wed, 23 Jul 2014 10:09:35 -0700 (PDT) X-Received: by 10.52.129.200 with SMTP id ny8mr3410934vdb.27.1406135375819; Wed, 23 Jul 2014 10:09:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp297112vcb; Wed, 23 Jul 2014 10:09:35 -0700 (PDT) X-Received: by 10.66.150.228 with SMTP id ul4mr3832230pab.16.1406135374789; Wed, 23 Jul 2014 10:09:34 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id sc6si3187477pbb.70.2014.07.23.10.09.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Jul 2014 10:09:34 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 1XA01B-0001nb-0E; Wed, 23 Jul 2014 17:07:53 +0000 Received: from fw-tnat.austin.arm.com ([217.140.110.23] helo=collaborate-mta1.arm.com) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XA017-0001b6-TM for linux-arm-kernel@lists.infradead.org; Wed, 23 Jul 2014 17:07:51 +0000 Received: from hornet.Cambridge.Arm.com (hornet.cambridge.arm.com [10.2.201.42]) by collaborate-mta1.arm.com (Postfix) with ESMTP id 44E0913FA3E; Wed, 23 Jul 2014 12:07:25 -0500 (CDT) From: Pawel Moll To: Greg Kroah-Hartman Subject: [PATCH v4 2/2] platform: Make platform_bus device a platform device Date: Wed, 23 Jul 2014 18:07:19 +0100 Message-Id: <1406135239-17550-2-git-send-email-pawel.moll@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406135239-17550-1-git-send-email-pawel.moll@arm.com> References: <1406135239-17550-1-git-send-email-pawel.moll@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140723_100750_047212_22C16723 X-CRM114-Status: GOOD ( 15.25 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record Cc: paul@pwsan.com, Pawel Moll , Arnd Bergmann , Stephen Warren , Catalin Marinas , Peter De Schrijver , linux-tegra@vger.kernel.org, arm@kernel.org, Olof Johansson , linux-arm-kernel@lists.infradead.org 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pawel.moll@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 ... describing the root of the device tree, so one can write a platform driver initializing the platform. Signed-off-by: Pawel Moll Tested-by: Olof Johansson Acked-by: Olof Johansson --- Changes since v3: * split the platform_bus->NULL changes into a separate patch * added #ifdef CONFIG_OF around of_allnodes Changes since v2: * replaced references to platform_bus.dev with NULL in places where it shouldn't make any difference Changes since v1: * rebased on top of v3.16-rc6 * fixed up all new explicit references to platform_bus, with majority in mach-shmobile; 99% of them seem completely useless and I was *very* tempted to replace them with NULL - all reasons for and against this are welcomed arch/arm/mach-imx/devices/devices.c | 4 ++-- drivers/base/platform.c | 20 ++++++++++++++------ drivers/char/tile-srom.c | 2 +- drivers/mmc/host/sdhci-pltfm.c | 2 +- drivers/scsi/hosts.c | 2 +- include/linux/platform_device.h | 2 +- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-imx/devices/devices.c b/arch/arm/mach-imx/devices/devices.c index 1b4366a..48c3817 100644 --- a/arch/arm/mach-imx/devices/devices.c +++ b/arch/arm/mach-imx/devices/devices.c @@ -24,12 +24,12 @@ struct device mxc_aips_bus = { .init_name = "mxc_aips", - .parent = &platform_bus, + .parent = &platform_bus.dev, }; struct device mxc_ahb_bus = { .init_name = "mxc_ahb", - .parent = &platform_bus, + .parent = &platform_bus.dev, }; int __init mxc_device_init(void) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index eee48c4..9caffa7 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -30,8 +30,8 @@ /* For automatically allocated device IDs */ static DEFINE_IDA(platform_devid_ida); -struct device platform_bus = { - .init_name = "platform", +struct platform_device platform_bus = { + .name = "platform", }; EXPORT_SYMBOL_GPL(platform_bus); @@ -300,7 +300,7 @@ int platform_device_add(struct platform_device *pdev) return -EINVAL; if (!pdev->dev.parent) - pdev->dev.parent = &platform_bus; + pdev->dev.parent = &platform_bus.dev; pdev->dev.bus = &platform_bus_type; @@ -946,12 +946,20 @@ int __init platform_bus_init(void) early_platform_cleanup(); - error = device_register(&platform_bus); + dev_set_name(&platform_bus.dev, "%s", platform_bus.name); + error = device_register(&platform_bus.dev); if (error) return error; error = bus_register(&platform_bus_type); - if (error) - device_unregister(&platform_bus); + if (!error) { +#ifdef CONFIG_OF + platform_bus.dev.of_node = of_allnodes; +#endif + platform_bus.dev.bus = &platform_bus_type; + bus_add_device(&platform_bus.dev); + } else { + device_unregister(&platform_bus.dev); + } return error; } diff --git a/drivers/char/tile-srom.c b/drivers/char/tile-srom.c index bd37747..4e4b7a2 100644 --- a/drivers/char/tile-srom.c +++ b/drivers/char/tile-srom.c @@ -350,7 +350,7 @@ static int srom_setup_minor(struct srom_dev *srom, int index) SROM_PAGE_SIZE_OFF, sizeof(srom->page_size)) < 0) return -EIO; - dev = device_create(srom_class, &platform_bus, + dev = device_create(srom_class, &platform_bus.dev, MKDEV(srom_major, index), srom, "%d", index); return PTR_ERR_OR_ZERO(dev); } diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index 7e834fb..9a2b0d0 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -137,7 +137,7 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, dev_err(&pdev->dev, "Invalid iomem size!\n"); /* Some PCI-based MFD need the parent here */ - if (pdev->dev.parent != &platform_bus && !np) + if (pdev->dev.parent != &platform_bus.dev && !np) host = sdhci_alloc_host(pdev->dev.parent, sizeof(struct sdhci_pltfm_host) + priv_size); else diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 3cbb57a..c14c36f 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -218,7 +218,7 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, goto fail; if (!shost->shost_gendev.parent) - shost->shost_gendev.parent = dev ? dev : &platform_bus; + shost->shost_gendev.parent = dev ? dev : &platform_bus.dev; if (!dma_dev) dma_dev = shost->shost_gendev.parent; diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 16f6654..a99032a 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -44,7 +44,7 @@ extern int platform_device_register(struct platform_device *); extern void platform_device_unregister(struct platform_device *); extern struct bus_type platform_bus_type; -extern struct device platform_bus; +extern struct platform_device platform_bus; extern void arch_setup_pdev_archdata(struct platform_device *); extern struct resource *platform_get_resource(struct platform_device *,