From patchwork Tue Jun 23 19:56:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 191565 Delivered-To: patch@linaro.org Received: by 2002:a92:1f07:0:0:0:0:0 with SMTP id i7csp2316428ile; Tue, 23 Jun 2020 13:38:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx92G34I4pAv7jyJElcTM23MpyOIMTQLWM/bcGW+1eZ9sgPYuBMeIld57dJcVdO9Csq4huV X-Received: by 2002:a17:906:cc58:: with SMTP id mm24mr23363291ejb.134.1592944713469; Tue, 23 Jun 2020 13:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592944713; cv=none; d=google.com; s=arc-20160816; b=j8fU6pfHZ2qXNli9HUSMFBGs7W0xY/k1hOB1jU05+ZxYNVSlfMxH49l5X2vGoH1gIW UrwFi0Xkb9lVZpMffDCiShka/0fB6OYNedvxMfvi8rPItFYV14OBN1MaEzi0j8R2rcri tgzyDa5++L9flOhBdVIH07jV2bGSwAgVnx97itLMnLVh9vAMPmzU+0DmuA7JMVdal2x9 6zLsusuAw1pR+SWkcwEQHaCV64jD/lPBTPUWy3AeCShbQ2VhdNsLMHL+Ju8E63YI1Byw fXX9fmQzB6HC2ikXwFVnND8JA1QBJXsFYoE6JSjDh5GZ8xVdLSuAfV8xdvtQVfevPHqN wg8w== 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=aAM7QzKdNHWv0AQCYke/eiw/Td5wSbHHX3YRoIez8B8=; b=Heu4dByqrTN1sINO5+sPYbXK36l8LfFyN6Ugj7OFug5nwXkbIhkEy4AuffZncK5qMw K5w6d3mxQ8bPNiWyLs5U8CQG7lFXLCtSRe5hEbnoQr0z/K/OVzIx5hQDiKvnWbdylEjn Tkq82mtHzypI0l23Bgo3UobOBGx1df3CUkSzOz1woX3/OPdKfamlOPn8dPlbp1zvVRku +myD9KQfy6aWtspvPFgVf0bid6O0+OVQouCzWnZAhtNYL2Ou4gFbpf5f4/mwMArkKxmh Fp1kuPVTErgov/NkJRw0+SlD49t72zZq9xNwVlzLMt1nUjE0yxPlg64tNoXwlvIdqU05 IPQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=DhOeuClC; 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 v18si11998564edx.378.2020.06.23.13.38.33; Tue, 23 Jun 2020 13:38:33 -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=DhOeuClC; 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 S2391962AbgFWUia (ORCPT + 15 others); Tue, 23 Jun 2020 16:38:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:33976 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391961AbgFWUi3 (ORCPT ); Tue, 23 Jun 2020 16:38:29 -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 E9B9C21556; Tue, 23 Jun 2020 20:38:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592944709; bh=tvk3lkQAhBulXXvXBScmOgBTACOXiX/TZWI2NS9OV30=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DhOeuClCWnNVVu/ndv3dbo0D+gbY2LLPLHlMMUxYwWT8xElNuZGzNT4yBW6022ah3 yydKwoVSMPtjbDet289F9RN0AaHVWYiIQxEfNLnLeOYCaa3xuldZSSFIcwdxHbVo1+ FhsByWn99wR/U/j6xPfSHa7U68RoJ5Dm4IGjOfpI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Sasha Levin Subject: [PATCH 4.19 064/206] slimbus: ngd: get drvdata from correct device Date: Tue, 23 Jun 2020 21:56:32 +0200 Message-Id: <20200623195320.115096893@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195316.864547658@linuxfoundation.org> References: <20200623195316.864547658@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 9221ba7b78637..f40ac8dcb0817 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1350,7 +1350,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 + @@ -1365,12 +1364,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);