From patchwork Thu May 20 00:25:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 12268713 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F083DC43460 for ; Thu, 20 May 2021 00:25:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D7B9B6008E for ; Thu, 20 May 2021 00:25:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230280AbhETA0y (ORCPT ); Wed, 19 May 2021 20:26:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230171AbhETA0s (ORCPT ); Wed, 19 May 2021 20:26:48 -0400 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C48DC061761 for ; Wed, 19 May 2021 17:25:28 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id k15so10610882pgb.10 for ; Wed, 19 May 2021 17:25:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Gm72nwXpdE7RmMD+c9dyNsOFYFMq7AQj3MbF+XKSlWQ=; b=UqC0yWQ9R5JvKixzeUdDD01pWSLv+fpdp/03qcIkZhAwK5Kap/ew8RZePWbSbXRD46 q7WXLSHmfaKhKooj+IesNu1xcAVOJFXJF81IxZikgaJSTDZ0fwlQ2IFnCrPfQSqsVVO3 Gk1Kmcp7VlHe8VSzzpXYjlL4s0Q2kRDPsORxU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Gm72nwXpdE7RmMD+c9dyNsOFYFMq7AQj3MbF+XKSlWQ=; b=ApTSnT43AxRrQ4fNj1n8hXXP037ODfrCZU8ENRCyBu1QyZGv+jOg01H4pySe1nF0Lg +Oop4xIZ/gwajWHKna34pti/CQa/yFCEH3L5yBpmJhDq7aB2yN/brjqcY+Xy532LjFoK aRFK4d+q58qEwmiITm59zfQKLEgsdV9RWxl1C6RIv9onVANlkXkMwQCKiOORYLXO05Pu +Ue1qnqXeBOPUoiJt0Vdgz3Tym7aXMymmz98Gd/lNr+p0hs5doLb9YCcEWx6DPQXCXJG OO0ftY0YP3Z4BjL8EJ2NUPCT6eSfjHCtB82oMimTgAKEw0l8tKwc1o/aVqLxl3Sue6EY cTfQ== X-Gm-Message-State: AOAM533tMohjOZhCD0vs6toyX+OQZ2dnu7ZR3etkSTE3dsRwGo4qhdo4 T9uyloLmOgspMhRc4jI15epkxg== X-Google-Smtp-Source: ABdhPJwNWO63s1Z5yApVrizJPTmgihkFNM8TC2kJOBfC18nrxp5jGPb+J16z/e7HhYyam76qI+Pa9Q== X-Received: by 2002:aa7:870c:0:b029:2a1:f060:f17d with SMTP id b12-20020aa7870c0000b02902a1f060f17dmr1648391pfo.24.1621470327798; Wed, 19 May 2021 17:25:27 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:200b:db75:4e6c:8b96]) by smtp.gmail.com with ESMTPSA id i14sm398904pfk.130.2021.05.19.17.25.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 17:25:27 -0700 (PDT) From: Stephen Boyd To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, Daniel Vetter , "Rafael J. Wysocki" , Rob Clark , Russell King , Saravana Kannan Subject: [PATCH 6/7] component: Move struct aggregate_device out to header file Date: Wed, 19 May 2021 17:25:18 -0700 Message-Id: <20210520002519.3538432-7-swboyd@chromium.org> X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd-goog In-Reply-To: <20210520002519.3538432-1-swboyd@chromium.org> References: <20210520002519.3538432-1-swboyd@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This allows aggregate driver writers to use the device passed to their probe/remove/shutdown functions properly instead of treating it as an opaque pointer. Cc: Daniel Vetter Cc: "Rafael J. Wysocki" Cc: Rob Clark Cc: Russell King Cc: Saravana Kannan Signed-off-by: Stephen Boyd --- drivers/base/component.c | 13 ------------- include/linux/component.h | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/base/component.c b/drivers/base/component.c index 155aab7eefa6..1b4c84453319 100644 --- a/drivers/base/component.c +++ b/drivers/base/component.c @@ -62,19 +62,6 @@ struct component_match { struct component_match_array *compare; }; -struct aggregate_device { - const struct component_master_ops *ops; - struct device dev; - struct component_match *match; - - int id; -}; - -static inline struct aggregate_device *to_aggregate_device(struct device *d) -{ - return container_of(d, struct aggregate_device, dev); -} - struct component { struct list_head node; struct aggregate_device *adev; diff --git a/include/linux/component.h b/include/linux/component.h index bc71d34a3416..d19cc3418d12 100644 --- a/include/linux/component.h +++ b/include/linux/component.h @@ -39,7 +39,7 @@ void component_del(struct device *, const struct component_ops *); int component_bind_all(struct device *master, void *master_data); void component_unbind_all(struct device *master, void *master_data); -struct aggregate_device; +struct component_match; /** * struct component_master_ops - callback for the aggregate driver @@ -80,7 +80,18 @@ struct component_master_ops { void (*unbind)(struct device *master); }; -struct component_match; +struct aggregate_device { + const struct component_master_ops *ops; + struct device dev; + struct component_match *match; + + int id; +}; + +static inline struct aggregate_device *to_aggregate_device(struct device *d) +{ + return container_of(d, struct aggregate_device, dev); +} /** * struct aggregate_driver - Aggregate driver (made up of other drivers)