From patchwork Sat Feb 18 08:32:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 58900 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp280593wrn; Sat, 18 Feb 2023 00:40:35 -0800 (PST) X-Google-Smtp-Source: AK7set9L/pc/8O4sWnDbmyMRWwWj7qccNvc0xXRHsF1YzBT2TWjWHr9mFKFWySwGBg1eWchrgy2i X-Received: by 2002:a17:906:3c6:b0:878:78bc:975c with SMTP id c6-20020a17090603c600b0087878bc975cmr2166134eja.36.1676709635634; Sat, 18 Feb 2023 00:40:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676709635; cv=none; d=google.com; s=arc-20160816; b=mkMyIyC+Q3Ss3IHLNDU7uiHYpai6CwH7TsBvysif2frQ04/sUZrl9IyVjTXtmpXM5f RQf+Hctc4jTzUYz2Ws+ngedZpvNo06dx2hGgyHwg7lnJRbJmFWkGqy8kpWsKR5UgadMl InZKeAAjoA2meZQ/KqrNV2vT5iLU2g5BLW8BkDq2+bZk+RmjVU70hSA9Sib9V1cbg6mo HRrI329J8JpGnfj7SXucRtuWaSLZZ0CtNob2C8gTP0US3RWaTfLpD+ay/9Oc4w2TcFLV 4j5SEMSZ5xmhHx52XmiuMCLO5TovnCnHwy8m+ebog4uez2TqQCd/HylmVeJ2iP5zO2c6 6orA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=Kp1QbPjY6w8y+NO/uU7s1tByY9HWUIkH8CY141/p1Bw=; b=OsZ9Hdc/wP0OsSxMM8OEEemPLEdr7FYPbZJ2rXvpS5DQR/3tuSZ/VPl7hb13I3tleH aGDsW8+DJt422jqRJBXDW1oZDK51jNQs4kSdNNVb5w4kqDuJ1KTNNu0wc3mjTGQFqLbw bT+bJ4rsnTPReTfEf76Xr8oAwfUDj8EGeWhB0R3yv2jh0w1Fdv31DWZ4RurxCFeCLyRP jNvCL7r64BoLi5aUXnyvVZ7Dej9ZpRrABG+q+KFIJ29fsvO22jHkyS97qOfe+GlOAi6r vKbUoWoH6B0zwUPiQvZxdhdnjOQg2Xq88bDZwbm9eReItT2OCRLnGIA8P1whHjlYP+NW ImxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=rTZzHduX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fp36-20020a1709069e2400b008b13f5bb248si7494168ejc.309.2023.02.18.00.40.13; Sat, 18 Feb 2023 00:40:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=rTZzHduX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229800AbjBRIdF (ORCPT + 99 others); Sat, 18 Feb 2023 03:33:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229563AbjBRIdB (ORCPT ); Sat, 18 Feb 2023 03:33:01 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C683C3B672 for ; Sat, 18 Feb 2023 00:32:59 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-536629fa4ceso25129197b3.16 for ; Sat, 18 Feb 2023 00:32:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Kp1QbPjY6w8y+NO/uU7s1tByY9HWUIkH8CY141/p1Bw=; b=rTZzHduXbHELGzBYp2cxb7eG1N/9akFJXJjXnGRACIXOuguCjzoX9z0hXDTI96wh+I JFzx+h++S/vEheLmbd9a1WHdaawwRSNzK+p8nZuK/E+A4VPcqspje6CYkI5ORiQVpKxK vWV8ljEeB6aJJbQNEDj+6l/ynEqsPtLZ4YZVQeaRaHkj+coBPO2V+Djgh47VH19ztR2L i/X4AcxYu2IzRmbvQUdTZMtfL4UyfS20FXeH2K0j7ji524mBNUnu8sEXBN1jo2n1Nkdl qtfNPJiBJP0hgXaF/LvbUraJFt0Il/nttBByjo3HROfGG+/UvQk9pvBgXPqZ6gMHrgYb G7/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Kp1QbPjY6w8y+NO/uU7s1tByY9HWUIkH8CY141/p1Bw=; b=YpgDyftNL7DROQzNy6icd/pXWjgAXusJBUeboZvmbU7UgxrRGsXfaUkBs7BIXhtv/y 9BxyJJdOAroUaEpnsdFGecY3+hIiumr5Agd/FfXDqASPet8Tg1tx0dleFx3+Vtj2l1tQ dKU7moKZY8gp8QdJJjck7nm+kJ05ptoUCHWqIae4IaQCbtaXDVSJ0djw2jSBaeqPtMxr T406V9v4RUEeRHbcAmHso8iwSn2KZPubv0kvRNRBCb0bfmLzfeEKkyUX0WgyheM9cdIB LYtOci0zlwwz2NZuMj8euZpKiTibJ9/o4oHRyIBXyTrxvUg21o1hpJZgOX/a3ArAbT4A gvOQ== X-Gm-Message-State: AO0yUKVDtF5sdG4CSzzu9j/02HxRrl/5wptgEAOJonxIVu7ttV8hWpM+ oPfktRdP6Mgt0t4LhED5+1OIiXAjwxGykiE= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:382:7632:f7fc:4737]) (user=saravanak job=sendgmr) by 2002:a5b:ec1:0:b0:905:372:12ad with SMTP id a1-20020a5b0ec1000000b00905037212admr1825699ybs.539.1676709179075; Sat, 18 Feb 2023 00:32:59 -0800 (PST) Date: Sat, 18 Feb 2023 00:32:48 -0800 In-Reply-To: <20230218083252.2044423-1-saravanak@google.com> Message-Id: <20230218083252.2044423-2-saravanak@google.com> Mime-Version: 1.0 References: <20230218083252.2044423-1-saravanak@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Subject: [RFC v1 1/4] regulator: core: Add regulator devices to bus instead of class From: Saravana Kannan To: Liam Girdwood , Mark Brown Cc: Saravana Kannan , Greg Kroah-Hartman , Geert Uytterhoeven , Marek Szyprowski , Bjorn Andersson , Sudeep Holla , Tony Lindgren , Doug Anderson , Guenter Roeck , Luca Weiss , kernel-team@android.com, linux-kernel@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758157482996628169?= X-GMAIL-MSGID: =?utf-8?q?1758157482996628169?= Add regulator devices to a bus instead of a class. This allows us to probe these devices in later patches. Signed-off-by: Saravana Kannan --- drivers/regulator/core.c | 45 ++++++++++++++++---------------- drivers/regulator/internal.h | 2 +- drivers/regulator/of_regulator.c | 2 +- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index ae69e493913d..1a212edcf216 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1918,7 +1918,7 @@ static struct regulator_dev *regulator_lookup_by_name(const char *name) { struct device *dev; - dev = class_find_device(®ulator_class, NULL, name, regulator_match); + dev = bus_find_device(®ulator_bus, NULL, name, regulator_match); return dev ? dev_to_rdev(dev) : NULL; } @@ -5539,7 +5539,7 @@ regulator_register(struct device *dev, rdev->supply_name = regulator_desc->supply_name; /* register with sysfs */ - rdev->dev.class = ®ulator_class; + rdev->dev.bus = ®ulator_bus; rdev->dev.parent = config->dev; dev_set_name(&rdev->dev, "regulator.%lu", (unsigned long) atomic_inc_return(®ulator_no)); @@ -5644,8 +5644,8 @@ regulator_register(struct device *dev, mutex_unlock(®ulator_list_mutex); /* try to resolve regulators supply since a new one was registered */ - class_for_each_device(®ulator_class, NULL, NULL, - regulator_register_resolve_supply); + bus_for_each_dev(®ulator_bus, NULL, NULL, + regulator_register_resolve_supply); kfree(config); return rdev; @@ -5772,14 +5772,15 @@ static const struct dev_pm_ops __maybe_unused regulator_pm_ops = { }; #endif -struct class regulator_class = { +struct bus_type regulator_bus = { .name = "regulator", - .dev_release = regulator_dev_release, + .remove = regulator_dev_release, .dev_groups = regulator_dev_groups, #ifdef CONFIG_PM .pm = ®ulator_pm_ops, #endif }; + /** * regulator_has_full_constraints - the system has fully specified constraints * @@ -5939,7 +5940,7 @@ static void regulator_summary_show_subtree(struct seq_file *s, seq_puts(s, "\n"); list_for_each_entry(consumer, &rdev->consumer_list, list) { - if (consumer->dev && consumer->dev->class == ®ulator_class) + if (consumer->dev && consumer->dev->bus == ®ulator_bus) continue; seq_printf(s, "%*s%-*s ", @@ -5969,8 +5970,8 @@ static void regulator_summary_show_subtree(struct seq_file *s, summary_data.level = level; summary_data.parent = rdev; - class_for_each_device(®ulator_class, NULL, &summary_data, - regulator_summary_show_children); + bus_for_each_dev(®ulator_bus, NULL, &summary_data, + regulator_summary_show_children); } struct summary_lock_data { @@ -6025,11 +6026,11 @@ static int regulator_summary_lock_all(struct ww_acquire_ctx *ww_ctx, lock_data.new_contended_rdev = new_contended_rdev; lock_data.old_contended_rdev = old_contended_rdev; - ret = class_for_each_device(®ulator_class, NULL, &lock_data, - regulator_summary_lock_one); + ret = bus_for_each_dev(®ulator_bus, NULL, &lock_data, + regulator_summary_lock_one); if (ret) - class_for_each_device(®ulator_class, NULL, &lock_data, - regulator_summary_unlock_one); + bus_for_each_dev(®ulator_bus, NULL, &lock_data, + regulator_summary_unlock_one); return ret; } @@ -6065,8 +6066,8 @@ static void regulator_summary_lock(struct ww_acquire_ctx *ww_ctx) static void regulator_summary_unlock(struct ww_acquire_ctx *ww_ctx) { - class_for_each_device(®ulator_class, NULL, NULL, - regulator_summary_unlock_one); + bus_for_each_dev(®ulator_bus, NULL, NULL, + regulator_summary_unlock_one); ww_acquire_fini(ww_ctx); mutex_unlock(®ulator_list_mutex); @@ -6092,8 +6093,8 @@ static int regulator_summary_show(struct seq_file *s, void *data) regulator_summary_lock(&ww_ctx); - class_for_each_device(®ulator_class, NULL, s, - regulator_summary_show_roots); + bus_for_each_dev(®ulator_bus, NULL, s, + regulator_summary_show_roots); regulator_summary_unlock(&ww_ctx); @@ -6106,7 +6107,7 @@ static int __init regulator_init(void) { int ret; - ret = class_register(®ulator_class); + ret = bus_register(®ulator_bus); debugfs_root = debugfs_create_dir("regulator", NULL); if (!debugfs_root) @@ -6182,16 +6183,16 @@ static void regulator_init_complete_work_function(struct work_struct *work) * bound yet. So attempt to resolve the input supplies for * pending regulators before trying to disable unused ones. */ - class_for_each_device(®ulator_class, NULL, NULL, - regulator_register_resolve_supply); + bus_for_each_dev(®ulator_bus, NULL, NULL, + regulator_register_resolve_supply); /* If we have a full configuration then disable any regulators * we have permission to change the status for and which are * not in use or always_on. This is effectively the default * for DT and ACPI as they have full constraints. */ - class_for_each_device(®ulator_class, NULL, NULL, - regulator_late_cleanup); + bus_for_each_dev(®ulator_bus, NULL, NULL, + regulator_late_cleanup); } static DECLARE_DELAYED_WORK(regulator_init_complete_work, diff --git a/drivers/regulator/internal.h b/drivers/regulator/internal.h index fb4433068d29..6e489b3cffad 100644 --- a/drivers/regulator/internal.h +++ b/drivers/regulator/internal.h @@ -58,7 +58,7 @@ struct regulator { struct dentry *debugfs; }; -extern struct class regulator_class; +extern struct bus_type regulator_bus; static inline struct regulator_dev *dev_to_rdev(struct device *dev) { diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 1b65e5e4e40f..f0590e68f31d 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -545,7 +545,7 @@ struct regulator_dev *of_find_regulator_by_node(struct device_node *np) { struct device *dev; - dev = class_find_device_by_of_node(®ulator_class, np); + dev = bus_find_device_by_of_node(®ulator_bus, np); return dev ? dev_to_rdev(dev) : NULL; } From patchwork Sat Feb 18 08:32:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 58898 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp280147wrn; Sat, 18 Feb 2023 00:38:55 -0800 (PST) X-Google-Smtp-Source: AK7set+HUHZkUOOvEQwOB86aw+0+3+gkcOIX1cLqNmLTV00l7jKVr95keN0bsn8KTZwIGuKwGsK0 X-Received: by 2002:a17:907:a583:b0:8af:3c9f:6e5d with SMTP id vs3-20020a170907a58300b008af3c9f6e5dmr3405745ejc.12.1676709534845; Sat, 18 Feb 2023 00:38:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676709534; cv=none; d=google.com; s=arc-20160816; b=1C8DMkMIZbDqjDmdgNygEI3tIqLWfCWEvLmmqIyYyA+AJC6YaN9ZQ7bSfabVNqbPkS /jOPAE0EJaW/VGrGqREqnUUyXRUBrJ8T8TWfAWkoA2C06vTCQ788uVWQTIPR/Tnxlenu iCoBuyP+ej4LUf15lbCSe9PDbAN4kkbZKH6Mr+jMz92YIZko6ly7VdCe1THPI65o/M22 4ENIWdcvOGM1cB7i099UTr9oZyrGH4eRb9LQKhs4UxEj7KHKXA+gIZ6rJE1cSCNWsRP9 QP20VOzX/1T7xjuSu2wmjqFzRBX7A87Mrez0ezOSrbtgtP6wZ3yl7nO4vn8sLezAK29a +ikw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=Qjy8cu1Mo/UjSfKWZ07U2cuwjaexJWXy+SB7TrdOfOk=; b=oKZSyhmtUzxxgY7OnMq/TWzI1sYZ+dnUjlvXJbYPP5qyf3g90EAkKJgsfGNCyPCLI8 qAXYZnZye/rYeJRT1Z46cX/lL6ZQdgu22E3m313Imr4tu7aaQmnrZhkee0zNIVkRSe3T NYkNsfnVM/nTIYUYATyRAzLT7PWevJtjo7XlvA1CsHHlhbjnCA8XG0v5j6J7cvZvnscm ksV2fJF451peRrTKm4+es/asF7pIES3n2aJEtXkNRXBjECQSHsFtCmOzSz12UyU45HfS C9V3hKrfEsfgiGQ8Prg0zNTCDZ0Zlfn065Bx3QpuQkP/BuzvrZ5Rg2KvipkZKDz0cfmN fIGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=f53tiO60; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fh17-20020a1709073a9100b008b12dc842e4si7364873ejc.907.2023.02.18.00.38.32; Sat, 18 Feb 2023 00:38:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=f53tiO60; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229563AbjBRIdI (ORCPT + 99 others); Sat, 18 Feb 2023 03:33:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229780AbjBRIdD (ORCPT ); Sat, 18 Feb 2023 03:33:03 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43D5D42BE1 for ; Sat, 18 Feb 2023 00:33:02 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5365a8dd33aso26531997b3.22 for ; Sat, 18 Feb 2023 00:33:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Qjy8cu1Mo/UjSfKWZ07U2cuwjaexJWXy+SB7TrdOfOk=; b=f53tiO60I7XJ6TYtB0DYyxwXSpcAe/3+SEcd0gpn65PwjUBmVPmeN9N9fDUOBYx5B4 +X7KrrUprexujhvtlkEgvIfjbcMWCznLWm9Q2HYqghq4BXq9y2mFTVxVx9jn5Y7y1eaZ ffgr0uY71tCr9u2eDrFwAts+aRI1E/vJIOLkcQ91jVmvN1VQrZjcdFFzvqqHIslrdbWF zE0iNSA99G7liBZMABYJlwRR+RuoBa0pi01AOq5G9xUZwbkpk56WZEVQz5Dhs1UiItM7 ns4h02cjsUESNq7Mu34jCsSe1nJzft00ohzoO6r6GKzCXjmwM8yYdk/4KBW9yf2aOPnQ Edxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Qjy8cu1Mo/UjSfKWZ07U2cuwjaexJWXy+SB7TrdOfOk=; b=Dz/LjpEo0lpa62nAwfMfQ3COzt+XGNLzmHodpi/utgV44vPTSjrVk/ovJywE2zwFuy CtOui4jb+Z0FYmt1sEb8PWgK24VDsFiD004pG6ekTzQWL5fBtXw/QHYIWZLx3TWE9Iqv ccaBCZijN+Scj3lsi41r1sIcF9pDnlkH+lvxWjkUhshaOriiJV32mH2+dvp0gI1AZLYg 93eiNlX55TSOAwYn21GedpXxZPhJha8VOo/QvOMYR74SIYzS46f8JcYkcLKsmbbYwy63 XBWP56Wa/TurR5ruwa9dRvKUSLXKtLtGOqdB51QprHKb7sVZkZrPdTwMVqNj2+SSd8AA HhXQ== X-Gm-Message-State: AO0yUKVGB80veUV+39yJqMbBuT699ob+JR1Z9CYs9WlndtZxAQKdtmD8 6ESe1+0lAUXPpFvMf4PAHj5iFKgfi7LqkmY= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:382:7632:f7fc:4737]) (user=saravanak job=sendgmr) by 2002:a5b:688:0:b0:931:2b11:6584 with SMTP id j8-20020a5b0688000000b009312b116584mr1169840ybq.591.1676709181337; Sat, 18 Feb 2023 00:33:01 -0800 (PST) Date: Sat, 18 Feb 2023 00:32:49 -0800 In-Reply-To: <20230218083252.2044423-1-saravanak@google.com> Message-Id: <20230218083252.2044423-3-saravanak@google.com> Mime-Version: 1.0 References: <20230218083252.2044423-1-saravanak@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Subject: [RFC v1 2/4] regulator: core: Add sysfs class backward compatibility From: Saravana Kannan To: Liam Girdwood , Mark Brown Cc: Saravana Kannan , Greg Kroah-Hartman , Geert Uytterhoeven , Marek Szyprowski , Bjorn Andersson , Sudeep Holla , Tony Lindgren , Doug Anderson , Guenter Roeck , Luca Weiss , kernel-team@android.com, linux-kernel@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758157377162520102?= X-GMAIL-MSGID: =?utf-8?q?1758157377162520102?= A regulator device's sysfs directory used to be created under /sys/class/regulator when it is added to a class. Since the device is now moved to be under a bus, add symlinks from /sys/class/regulator to the real device sysfs directory. Signed-off-by: Saravana Kannan --- drivers/regulator/core.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 1a212edcf216..b6700d50d230 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -43,6 +43,7 @@ static LIST_HEAD(regulator_coupler_list); static bool has_full_constraints; static struct dentry *debugfs_root; +static struct class_compat *regulator_compat_class; /* * struct regulator_map @@ -5636,6 +5637,11 @@ regulator_register(struct device *dev, if (ret != 0) goto unset_supplies; + if (class_compat_create_link(regulator_compat_class, &rdev->dev, + rdev->dev.parent)) + dev_warn(&rdev->dev, + "Failed to create compatibility class link\n"); + rdev_init_debugfs(rdev); /* try to resolve regulators coupling since a new one was registered */ @@ -5702,6 +5708,8 @@ void regulator_unregister(struct regulator_dev *rdev) unset_regulator_supplies(rdev); list_del(&rdev->list); regulator_ena_gpio_free(rdev); + class_compat_remove_link(regulator_compat_class, &rdev->dev, + rdev->dev.parent); device_unregister(&rdev->dev); mutex_unlock(®ulator_list_mutex); @@ -6107,7 +6115,13 @@ static int __init regulator_init(void) { int ret; + regulator_compat_class = class_compat_register("regulator"); + if (!regulator_compat_class) + return -ENOMEM; + ret = bus_register(®ulator_bus); + if (ret) + goto unreg_compat; debugfs_root = debugfs_create_dir("regulator", NULL); if (!debugfs_root) @@ -6120,11 +6134,16 @@ static int __init regulator_init(void) debugfs_create_file("regulator_summary", 0444, debugfs_root, NULL, ®ulator_summary_fops); #endif + regulator_dummy_init(); regulator_coupler_register(&generic_regulator_coupler); return ret; + +unreg_compat: + class_compat_unregister(regulator_compat_class); + return ret; } /* init early to allow our consumers to complete system booting */ From patchwork Sat Feb 18 08:32:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 58899 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp280249wrn; Sat, 18 Feb 2023 00:39:15 -0800 (PST) X-Google-Smtp-Source: AK7set8MzilPLP65/aS6PCQh3l44cvpQPTnOn4loO87rO4pjPtMfOL6lsP88tSipwWyvUZUMb/Gw X-Received: by 2002:a17:906:fd8d:b0:87b:d636:c26d with SMTP id xa13-20020a170906fd8d00b0087bd636c26dmr4237557ejb.58.1676709555777; Sat, 18 Feb 2023 00:39:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676709555; cv=none; d=google.com; s=arc-20160816; b=sL7h7Tvrtl9wX7LcXMspl3w8tVobqRZN4DQ8k2u3sSw2kehIfNHNmR0o7kjHi1RATf BItA6kI7WKsPhepI1TUG7nE1Uyzm2gvyLNvSGOZY0KtycMbK3bnvepRRMUHyV6WMP7PZ X/pFWeR7LUTVjcyNKl4oCDQRHz4eyqlqga2tROI88+JeZoeY2Y1hEjrcumdKC+ewBxfl FDa8LxzrhJMh13uOtrrXXDt8pMzyfYqoaGWSTa25tBlTfN4XdUqL7nhHWFnzf7uYmSfM dq4BnFwLN8+4lopW81qkNjxqTCzONpnIDZeyhyV6VBrOUCLAxrA9U4Icqq6t+P5qJvBc +Zxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=+eMvh/5RpB1yBDTApxHgHfIOTnGW3OoKdzhdswhPdc8=; b=xwi7O5+0ny0IgLUYtlMThNTqxZ05fKhijehFnZRu+m/vVcxzF6uT3bl+LFHf0a0QPN IZJB/r8kvcnuOI2CtZXCmr9R4kofwbkJV3kYljCnhax7kVf77ckEt3+QOK3V4T5phqhL Of7GBWYrJioak+N/fz3YaLpZM0k9Mk75d5lW4lRT7Q7wcC/VWkOkajxWBELG8O4vFfRT 5S++BOt8iA+6jZc4KearO1GyGeQ3Sk3Zy/kbrMmS0p5WtGHydgycV1WLavf/qceaPFZa A+9CcX/XomV8TSSDUE8xOXKVhmPVO8Hobjq/hkfl9rUc5T/hX1vB/W9KGVVz3t65P0YI uUzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=IBwqlFD+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 20-20020a170906025400b008b178bc310esi7444525ejl.742.2023.02.18.00.38.53; Sat, 18 Feb 2023 00:39:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=IBwqlFD+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229813AbjBRIdK (ORCPT + 99 others); Sat, 18 Feb 2023 03:33:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229799AbjBRIdF (ORCPT ); Sat, 18 Feb 2023 03:33:05 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E061547432 for ; Sat, 18 Feb 2023 00:33:04 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5367836c7e1so5418237b3.13 for ; Sat, 18 Feb 2023 00:33:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=+eMvh/5RpB1yBDTApxHgHfIOTnGW3OoKdzhdswhPdc8=; b=IBwqlFD+FCaDqWg/idHuaAxR0CYrFVJMbtxMjDSvmEkNhayk8QbmlvNJQNqxg+alsM ZvC/mNmTjTx1Rbw1rctbABzwis4tAMyEDJwLoZrHPxngikDinW09R+TTuLG/2vWGLYQg 9T67C6HKuhhJHJQ0szi2JKR1/BxRvaw5zELhdmSWxcTbM846z2AHMpjIBLEKBqiQF1ns tQzQ5EBuAClKshZu3NT4MOAPtPQiEKgCwXBlT0OGTqyX0FoIWqHVUGy9lUN0Mf40iWcO UVhio5dw3Jr3hrTFlgm26scaAUGjdEGwTps4agz0k6HbkE47VOdhQFyCO+srFRnt/E6v 45ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+eMvh/5RpB1yBDTApxHgHfIOTnGW3OoKdzhdswhPdc8=; b=A2uvypY4LhLBSQUFfd2j/p1WfL2xeLZpYJv4goWYtQI0madhyzgD0+Te2k4Z/WOpcO 4Su/BegTiC+z7FBsJVmtoRBi0la5i12AvB8MRomQy6PPnkP3OBvz9/S6KZzKevB0xw71 msUfGgdb5YgEgGFVqudXklXR172COMuujLi4pAaGwNKP6rJw8Fe+W8Lg6mx9n7g1Ca9d zZcipQgDRmVs8M/J5OR7Hv+xqIN+V3lYQiwMNUCIxhMN3nci9gjb5wYxAk8M3Xh1iDrI T/pt40OENXhQkiIbrJ4VU3hzeyaQeI8b62K+bHNqDhObapzFZ0CWKkygYyxFXgkh/l9n Cl6g== X-Gm-Message-State: AO0yUKXK5hAPyIh7WkekOC+AfaamkOocB8sNouQk89w9/mkTKaSkDt8j gCgZ9NuTDbEA1MceJl3BOlQoJWrOzU8sLaQ= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:382:7632:f7fc:4737]) (user=saravanak job=sendgmr) by 2002:a81:ca03:0:b0:52e:fb7a:94b7 with SMTP id p3-20020a81ca03000000b0052efb7a94b7mr349890ywi.7.1676709184201; Sat, 18 Feb 2023 00:33:04 -0800 (PST) Date: Sat, 18 Feb 2023 00:32:50 -0800 In-Reply-To: <20230218083252.2044423-1-saravanak@google.com> Message-Id: <20230218083252.2044423-4-saravanak@google.com> Mime-Version: 1.0 References: <20230218083252.2044423-1-saravanak@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Subject: [RFC v1 3/4] regulator: core: Probe regulator devices From: Saravana Kannan To: Liam Girdwood , Mark Brown Cc: Saravana Kannan , Greg Kroah-Hartman , Geert Uytterhoeven , Marek Szyprowski , Bjorn Andersson , Sudeep Holla , Tony Lindgren , Doug Anderson , Guenter Roeck , Luca Weiss , kernel-team@android.com, linux-kernel@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758157399226815973?= X-GMAIL-MSGID: =?utf-8?q?1758157399226815973?= Since devices added to a bus can be probed, add a stub probe function for regulator devices. Signed-off-by: Saravana Kannan --- drivers/regulator/core.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index b6700d50d230..d5f9fdd79c14 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -5780,6 +5780,17 @@ static const struct dev_pm_ops __maybe_unused regulator_pm_ops = { }; #endif +static int regulator_drv_probe(struct device *dev) +{ + return 0; +} + +static struct device_driver regulator_drv = { + .name = "regulator_drv", + .bus = ®ulator_bus, + .probe = regulator_drv_probe, +}; + struct bus_type regulator_bus = { .name = "regulator", .remove = regulator_dev_release, @@ -6123,6 +6134,10 @@ static int __init regulator_init(void) if (ret) goto unreg_compat; + ret = driver_register(®ulator_drv); + if (ret) + goto unreg_bus; + debugfs_root = debugfs_create_dir("regulator", NULL); if (!debugfs_root) pr_warn("regulator: Failed to create debugfs directory\n"); @@ -6141,6 +6156,8 @@ static int __init regulator_init(void) return ret; +unreg_bus: + bus_unregister(®ulator_bus); unreg_compat: class_compat_unregister(regulator_compat_class); return ret; From patchwork Sat Feb 18 08:32:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 58901 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp280753wrn; Sat, 18 Feb 2023 00:41:12 -0800 (PST) X-Google-Smtp-Source: AK7set+ARJtRnEN18UowjpTiDpiip5PGyavsfBr3lf/GpKFjt3CtXb+pR/MaS51l04tMiZB+GDYd X-Received: by 2002:a17:907:60c9:b0:8ae:80d5:7385 with SMTP id hv9-20020a17090760c900b008ae80d57385mr10053987ejc.10.1676709671818; Sat, 18 Feb 2023 00:41:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676709671; cv=none; d=google.com; s=arc-20160816; b=c8wNHQjwpZgABd+fN/DP12p/zDy7N3cBifaUq/L4MfkdtruIsGznV3RETwHmyeQbgW 0So3NTPftFWAjZntaxZtMLwEP2AJ9gk4shcfV+8CE84aeyD6YMwfqirfDgR9aYsZkdtT ixdrbMFH4baSFsAddaNIWqbtbx0qGFfn93N6pgG+8LYIWDnE1MkCqDt79AEwa8d5bwZ0 x6J6iY6XcjczmUOJvZi/xkA+6GUDg9NbvHAz7gwTMSub423pMaNRQDFvFyG87/rps/rF NCl5NYZm0eKW2M7P92KWasJwSoPzUniAPueaU7tdIvovkZVqSdoGBFhNs3kDHPYnUGWe U76w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=wf3aa1fibAc7MkDg7PORyU7RaVXEoouFWua6YI0T5Hw=; b=vjGxMyLc8veXJ3vCxQgveOoTCqTczrJax4MQD71zdc2miybG2noCVhw/H5EgvGsJrq pP+bkLfHCZNaFh37V5m//Q+3/+tbq/e1R+G5Nw+Hl02UzqgEhySvMv22bWQ7BXKgp0mW JyxImx2ox2vL438WGpsNkTRD9k53KTyrKg6DtyDQVKQljPhmR+QhW7oZLTWHrE9vEobJ 1F5qefcMr1xjDQ7qNFwWETaaXGVSStruS0AJ3IifFt69EDIs9kW3yXC3rmnYgruWYGNj Y00JnrPCspv4kPR91AWnL9TEFbcgz3QWGjEoi2Cf3WT00VWtQMRivJ0/jpMJWaJ06dGp Rafg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="r/CAEVeZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id wi6-20020a170906fd4600b0087877581bfcsi6616784ejb.982.2023.02.18.00.40.48; Sat, 18 Feb 2023 00:41:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="r/CAEVeZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229847AbjBRIdT (ORCPT + 99 others); Sat, 18 Feb 2023 03:33:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229536AbjBRIdJ (ORCPT ); Sat, 18 Feb 2023 03:33:09 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 832A1498A4 for ; Sat, 18 Feb 2023 00:33:07 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5365936facfso28247027b3.4 for ; Sat, 18 Feb 2023 00:33:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=wf3aa1fibAc7MkDg7PORyU7RaVXEoouFWua6YI0T5Hw=; b=r/CAEVeZKaF7JFTzJGZPssmJ2DIsZyZc9v5lclCdMbxrxNh2Q3QLMVp4pLNRuC/Q5o s27Bkv2TMKwmgM8oUoVvMvQEDvRGwftjSDp/ve6slRHgGsw5Ms0v43lU1FgwAhrBbFUe 35o2FkSyM0x9/CMG8wr9G7/tyB/xKWzUmAI6tpiI86269U3STCkvIy4CWA8W6S2SdtXS 95eDXAunOWuxhtEP+diSImXUFuEa0VFXp1IRPtl0LmzghMSuArwHNw5gdcwOcP5ghRmt Jtm9ur/C7VTni40wqDN76966yegfo02FQ3vpbSwRhwDhCS/71+WQUH1e/qqxm6JVCgxQ FjGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wf3aa1fibAc7MkDg7PORyU7RaVXEoouFWua6YI0T5Hw=; b=0ZaTWhUKZvAjtJ4OnYtDA3bE5SkbyYSfzl5xRXzXvlwtuyvPgY3FTvrdMPsOpybPTO lkyFSkBglA/b1nEeKt8H9z/R49H3IPYkplqG5IbxQY3++r2NGIjF9z/2Yb2f+Ki3W7Ls K5F4d7bnMuGqjNxSuRh2hLLJQx6DhHpTfFhdzRaNmM2/7Y0o3LwFgrdPelL3GCwEcVV7 /fgM5z4dti0CgckkLJlxvSq8uSGj3WnoOi0K5sxPY1mqzaBV0HogNQY/1PqhZzcM9f8T WuYu/uRACygDV4XAJdtoahml0hpjbkq0YH14CRvqg8luaMAu8gDz/DnmHs9UHPr5qkR1 Pkqw== X-Gm-Message-State: AO0yUKXyIaoRxJahLPDh4GRiZZ8RPD6PMh906B+8k00X4Ubr04xjcwSN ZbWOETL8BL9unDpzPzso9sU378wX0jcpzkc= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:382:7632:f7fc:4737]) (user=saravanak job=sendgmr) by 2002:a81:6a41:0:b0:534:3fd:8403 with SMTP id f62-20020a816a41000000b0053403fd8403mr652502ywc.89.1676709186748; Sat, 18 Feb 2023 00:33:06 -0800 (PST) Date: Sat, 18 Feb 2023 00:32:51 -0800 In-Reply-To: <20230218083252.2044423-1-saravanak@google.com> Message-Id: <20230218083252.2044423-5-saravanak@google.com> Mime-Version: 1.0 References: <20230218083252.2044423-1-saravanak@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Subject: [RFC v1 4/4] regulator: core: Move regulator supply resolving to the probe function From: Saravana Kannan To: Liam Girdwood , Mark Brown Cc: Saravana Kannan , Greg Kroah-Hartman , Geert Uytterhoeven , Marek Szyprowski , Bjorn Andersson , Sudeep Holla , Tony Lindgren , Doug Anderson , Guenter Roeck , Luca Weiss , kernel-team@android.com, linux-kernel@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758157520755062837?= X-GMAIL-MSGID: =?utf-8?q?1758157520755062837?= We can simplify the regulator's supply resolving code if we resolve the supply in the regulator's probe function. This allows us to: - Consolidate the supply resolution code to one place. - Avoid the need for recursion by allow driver core to take care of handling dependencies. - Avoid races and simplify locking by reusing the guarantees provided by driver core. - Avoid last minute/lazy resolving during regulator_get(). - Simplify error handling because we can assume the supply has been resolved once a regulator is probed. - Allow driver core to use device links/fw_devlink, where available, to resolve the regulator supplies in the optimal order. Signed-off-by: Saravana Kannan --- drivers/regulator/core.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index d5f9fdd79c14..f3bf74d1a81d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1952,7 +1952,7 @@ static struct regulator_dev *regulator_dev_lookup(struct device *dev, if (node) { r = of_find_regulator_by_node(node); of_node_put(node); - if (r) + if (r && r->dev.links.status == DL_DEV_DRIVER_BOUND) return r; /* @@ -1982,11 +1982,11 @@ static struct regulator_dev *regulator_dev_lookup(struct device *dev, } mutex_unlock(®ulator_list_mutex); - if (r) + if (r && r->dev.links.status == DL_DEV_DRIVER_BOUND) return r; r = regulator_lookup_by_name(supply); - if (r) + if (r && r->dev.links.status == DL_DEV_DRIVER_BOUND) return r; return ERR_PTR(-ENODEV); @@ -2050,13 +2050,6 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) } } - /* Recursively resolve the supply of the supply */ - ret = regulator_resolve_supply(r); - if (ret < 0) { - put_device(&r->dev); - goto out; - } - /* * Recheck rdev->supply with rdev->mutex lock held to avoid a race * between rdev->supply null check and setting rdev->supply in @@ -2178,13 +2171,6 @@ struct regulator *_regulator_get(struct device *dev, const char *id, return regulator; } - ret = regulator_resolve_supply(rdev); - if (ret < 0) { - regulator = ERR_PTR(ret); - put_device(&rdev->dev); - return regulator; - } - if (!try_module_get(rdev->owner)) { regulator = ERR_PTR(-EPROBE_DEFER); put_device(&rdev->dev); @@ -5649,9 +5635,6 @@ regulator_register(struct device *dev, regulator_resolve_coupling(rdev); mutex_unlock(®ulator_list_mutex); - /* try to resolve regulators supply since a new one was registered */ - bus_for_each_dev(®ulator_bus, NULL, NULL, - regulator_register_resolve_supply); kfree(config); return rdev; @@ -5782,7 +5765,9 @@ static const struct dev_pm_ops __maybe_unused regulator_pm_ops = { static int regulator_drv_probe(struct device *dev) { - return 0; + struct regulator_dev *rdev = dev_to_rdev(dev); + + return regulator_resolve_supply(rdev); } static struct device_driver regulator_drv = {