From patchwork Tue Jun 23 19:52:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 191541 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp2292905ile; Tue, 23 Jun 2020 13:06:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyLbCZGNNBeZoxllGoRhGJCPycw3Xo3PYQrd2Q9b3v7rIgoH6FjiYl09+yZFZNDgCq3U+aq X-Received: by 2002:a17:906:2bd1:: with SMTP id n17mr21152972ejg.147.1592942813070; Tue, 23 Jun 2020 13:06:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592942813; cv=none; d=google.com; s=arc-20160816; b=GqWGAIfimCF7extCIaqHAlXHs/lq4nvlravrAyYbGNvz5Ro+UKhOijwmDDs14ahumn kQSoHi+HbdA5c86RV9CDHKPU9Pji04btn5q2qESqo//+M6N3uY65iHLZDvzy60FsECj9 anr20gD/IgLzGvBqi0LGD9KV3UVkS46qm4xxF/ODPt5dN6mu0hfeCvchxFFNo6BVAd/N 4O8qdvlAAG5KJT1fv359iIoAfjuwpvzsY/Wy6XmZy/gjDCqPwl2i54WEMiO/fr+2C0SD y1BOzCgLxPROQ0oNoinzr1dED6X+aaKV3oOP+f+BZ4L6Ygsx6jk4emh1EnXSJVx3rM+5 NILQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fUOmGCEXv7UMrtJu9oNcwWdthuRJ9yFLoGsnE1X7AOo=; b=IILN/cPK+jSrmoFtEzdBIEVYfyhMSw1VHx+2YDhXxAbkytZebwSB2IFb5Z9Q8WF7LK TYcNoMnmflyCd7GjBy257cqhqlSCn97WoImiHIffcpgOcKafVF7u9EHLJMmCkocednxB hJhtKHL3BcnRiXZGEj0zleWh812x5wDJ/Wuv/GRKO89F3u1Bz7Vv3gYG5FZkMNR0679V Oib8H62AtNsJfxNdtK1XfpWUMmMiCITvwUMoGDwWWG4ONLoIj3O+LwjdcA7mKmoSnPKQ UA4Ld0WyOUDIclAEw3ENIApqkOeRO6JPyHEcvBd3j1fNZM4GPO+z8crfTOBq/esYyXP0 0TUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LlgvOXLA; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n93si3268119edc.420.2020.06.23.13.06.52; Tue, 23 Jun 2020 13:06:53 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LlgvOXLA; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388113AbgFWUGu (ORCPT + 15 others); Tue, 23 Jun 2020 16:06:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:47086 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388524AbgFWUGt (ORCPT ); Tue, 23 Jun 2020 16:06:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 31B262064B; Tue, 23 Jun 2020 20:06:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942808; bh=cotzsTwSSR7gusIu00ZW7+RcgJzuYzN5XTv6IKlB3LA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LlgvOXLAP+pTbZE4zvidX3fnOhsDdOYZCA/EicM+9VxGOHhAUvmtRSwhKp6BA6UyX LoXRLCZ0buj7jjPjZcpo+dQcess7oTCuxfTYSOyrR4SWRfwMHz705l6qIqzaf40D20 HsF/cqIQC04w2Shm6W7Tkxkoedg2wxmsI7cK7sgg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Sasha Levin Subject: [PATCH 5.7 144/477] slimbus: ngd: get drvdata from correct device Date: Tue, 23 Jun 2020 21:52:21 +0200 Message-Id: <20200623195414.406011456@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Srinivas Kandagatla [ Upstream commit b58c663059b484f7ff547d076a34cf6d7a302e56 ] Get drvdata directly from parent instead of ngd dev, as ngd dev can probe defer and previously set drvdata will become null. Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20200417093618.7929-1-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/slimbus/qcom-ngd-ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index fc2575fef51ba..7426b5884218a 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1361,7 +1361,6 @@ static int of_qcom_slim_ngd_register(struct device *parent, ngd->pdev->driver_override = QCOM_SLIM_NGD_DRV_NAME; ngd->pdev->dev.of_node = node; ctrl->ngd = ngd; - platform_set_drvdata(ngd->pdev, ctrl); platform_device_add(ngd->pdev); ngd->base = ctrl->base + ngd->id * data->offset + @@ -1376,12 +1375,13 @@ static int of_qcom_slim_ngd_register(struct device *parent, static int qcom_slim_ngd_probe(struct platform_device *pdev) { - struct qcom_slim_ngd_ctrl *ctrl = platform_get_drvdata(pdev); struct device *dev = &pdev->dev; + struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev->parent); int ret; ctrl->ctrl.dev = dev; + platform_set_drvdata(pdev, ctrl); pm_runtime_use_autosuspend(dev); pm_runtime_set_autosuspend_delay(dev, QCOM_SLIM_NGD_AUTOSUSPEND); pm_runtime_set_suspended(dev);