From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.198 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795116348; b=Y6w8y6+AexD0jccT0qFey5G1EHWomsjJZiTsSqqOQdV4a7lprAykQIKkbUFl55Gi75su P/3X4Dr+soYOwcNTBOc9XPMTcg7o+kuKGXyoVsFPXF4hwWCUeDV6XvjtpYrk6BVVreitt jUGLqNLjNr+EORS5gUByuKPMj8LCQSF6coa8pKkEWT7HGLNa9qIhPFm0KC+m+d7Vnybeu MLIG0YnMV3AWl7InnrJ/gS1KtdO+iO6FO/q7zjGSu+MPkJpkObO/yb5i0ldIrtj108Xs7 Q0YF6rPNQDCpt//B+/1Im4oq5s9IBR+uZKwDjczIivu6mRZhWqT1b7wNaWnRk5+L51w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795116348; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=kkWfFph3Jhdo1iVdBmUApUet/72n0u945LBk/dYhnBA=; b=1fdgoIg0zvXBrl0n40dHW22zt1Mq8x2R3Df9RcMoDKwOR7zt5XCtNzaaePMn+aqyxu0W V8QfXXHjXgbqMbyeARjLI0XaSEdEWjOzXf185K9l4ErdO30QuoR9vfG7wJnGUXF2/12th JGPWDzuzTn8Xz+LCe3gvPbOXGGubIqlcT6Psq3eVJfzG5dTCdVMZJleO+oTbHrWYcRnkd 310Q+r1Czzl3nDErYcxStfYi5dVy3xBRagZepsmVKq8ayAm0B+Ld1kzbA3hUaHTXca5Nd K99y+nVh9Evq/VjDD+Bs29BLDf66EV76KfnZQgU9smIvxAFmRKnfoK65Kd7y2rMwlLQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=jSftEyG0; arc=none smtp.remote-ip=74.125.82.198 Received: from mail-dy1-f198.google.com (mail-dy1-f198.google.com [74.125.82.198]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC799606A33E for ; Thu, 19 Nov 2026 19:25:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org CC799606A33E Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=jSftEyG0 Received: by mail-dy1-f198.google.com with SMTP id 5a478bee46e88-3854627c1c8so72486eec.1 for ; Thu, 19 Nov 2026 11:25:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795116347; x=1795721147; darn=lists.linux.dev; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=kkWfFph3Jhdo1iVdBmUApUet/72n0u945LBk/dYhnBA=; b=jSftEyG0m5nPeJykd27y20yPbtL1hCaH4gUwPPOSr3iJmsU3ipgpMzQ8sTT1E7Xvrp 0xklGZIeIkYtps1Y/5AFhnSmkdpseruT7Npp2YkRo0AFRM8J31WZylZzJCy4CqTv8CXq X4cyqeRbDK8gUS8v3NmYf5dtosTEFsCYk9x0lFp7anFntS9QqK9KOLtsEpC8acJctUkd 4XSwNERO2JVLzqg2cFwm3VzOCdlRfmw7miRIs7eKhePXmNBS5vbYigf/XgQlBXJZRyyY nG/VG07tSv7tA7cW30NmgsRzSAi9wB8p/8ll0HxUCxkVs+pMYOMl6lwxLbJHjTyW6fc/ ikbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795116347; x=1795721147; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kkWfFph3Jhdo1iVdBmUApUet/72n0u945LBk/dYhnBA=; b=Uywk9MadSHMdgiCC7d/9As6ji/bN6krTqZ5TTz48zm/gJk6uTj7DJsc5sYAELgX0+X cOOKlRTQ3q1UqQXZUElLjjxOmI7mmq4FwFDHmsc/vaZMD9gtnTBIeHi6DtLRwIa5K6i3 e+CykOAiExDMGgcIELxK0AUWVuwcoIG62dx4GlSP0P4MQG2Sq5HSPmDO907YY3pnTHLp TbaSSAKjb49LwE3GYdvu4Q4CxmIbTEH+d8OkRTGJkC8aRWSLIhqTm94BQR5tRb3S/RV8 i679AO/nAf5CNLEjWjOCIIHU8sxPzTyAIMxLAf1QjZOe88b6BzyhTsTZ+bUVvgilbAsD FLkQ== X-Forwarded-Encrypted: i=1; AL+hErF6QkmOt/nUI9yoEIqh4jDl28LHW/wvoFfpKPNMk+Zw1VQ1yoUWl1JSrYlFpMTjhdj9E330@lists.linux.dev X-Gm-Message-State: APuU4Z9imdr5tx9Azk4O6RZP6aRjRPD+P/0Bl0s/bMCZOcfHqYGG9jEZ y48KZaIcP06KX6KdWLT1jrJuElckZkfniXsymBo9pqPlfu4x68QEY/nOs7IclVsigTdn+cw4an8 8uT4hUoJesw== X-Received: from dyvo18-n1.prod.google.com ([2002:a05:693c:41d2:10b0:370:f640:2508]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:693c:820d:b0:36d:394d:e690 with SMTP id 5a478bee46e88-38570b34f2fmr260461eec.40.1795116346621; Thu, 19 Nov 2026 11:25:46 -0800 (PST) Date: Thu, 19 Nov 2026 11:25:15 -0800 In-Reply-To: <20261119192520.1983406-1-irogers@google.com> X-Mailing-List: gfs2@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261119192520.1983406-1-irogers@google.com> X-Mailer: git-send-email 2.56.1.750.gf70dc682cf-goog Message-ID: <20261119192520.1983406-5-irogers@google.com> Subject: [PATCH v4 4/9] cpufreq: governor: Initialize kobj_type release callback statically From: Ian Rogers To: Danilo Krummrich , Greg Kroah-Hartman , Kees Cook , Miguel Ojeda , "Rafael J . Wysocki" Cc: Madhavan Srinivasan , Srish Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Nayna Jain , Mimi Zohar , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Nathan Chancellor , Nick Desaulniers , Viresh Kumar , Zhongqiu Han , Alexander Aring , Felix Kuehling , "=?UTF-8?q?Christian=20K=C3=B6nig?=" , Zhihao Cheng , Sumanth Korikkar , Bill Wendling , Justin Stitt , driver-core@lists.linux.dev, llvm@lists.linux.dev, linux-hardening@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org, linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-s390@vger.kernel.org, gfs2@lists.linux.dev, xen-devel@lists.xenproject.org, linux-mtd@lists.infradead.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Ian Rogers Content-Type: text/plain; charset="UTF-8" Export cpufreq_dbs_data_release() and initialize .kobj_type.release statically in the ondemand and conservative governors instead of assigning it at runtime in cpufreq_dbs_governor_init(). This prepares for annotating struct kobj_type::release with __must_init. Reviewed-by: Zhongqiu Han Acked-by: Rafael J. Wysocki (Intel) # cpufreq Acked-by: Viresh Kumar Signed-off-by: Ian Rogers --- drivers/cpufreq/cpufreq_conservative.c | 5 ++++- drivers/cpufreq/cpufreq_governor.c | 4 ++-- drivers/cpufreq/cpufreq_governor.h | 1 + drivers/cpufreq/cpufreq_ondemand.c | 5 ++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 02bfd46543e9..146a2353b1a2 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -318,7 +318,10 @@ static void cs_limits(struct cpufreq_policy *policy) static struct dbs_governor cs_governor = { .gov = CPUFREQ_DBS_GOVERNOR_INITIALIZER("conservative"), - .kobj_type = { .default_groups = cs_groups }, + .kobj_type = { + .release = cpufreq_dbs_data_release, + .default_groups = cs_groups, + }, .gov_dbs_update = cs_dbs_update, .alloc = cs_alloc, .free = cs_free, diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c index f3bd3dbe7c41..f8b5aca09b6b 100644 --- a/drivers/cpufreq/cpufreq_governor.c +++ b/drivers/cpufreq/cpufreq_governor.c @@ -419,7 +419,7 @@ static void free_policy_dbs_info(struct policy_dbs_info *policy_dbs, gov->free(policy_dbs); } -static void cpufreq_dbs_data_release(struct kobject *kobj) +void cpufreq_dbs_data_release(struct kobject *kobj) { struct dbs_data *dbs_data = to_dbs_data(to_gov_attr_set(kobj)); struct dbs_governor *gov = dbs_data->gov; @@ -427,6 +427,7 @@ static void cpufreq_dbs_data_release(struct kobject *kobj) gov->exit(dbs_data); kfree(dbs_data); } +EXPORT_SYMBOL_GPL(cpufreq_dbs_data_release); int cpufreq_dbs_governor_init(struct cpufreq_policy *policy) { @@ -488,7 +489,6 @@ int cpufreq_dbs_governor_init(struct cpufreq_policy *policy) policy->governor_data = policy_dbs; gov->kobj_type.sysfs_ops = &governor_sysfs_ops; - gov->kobj_type.release = cpufreq_dbs_data_release; ret = kobject_init_and_add(&dbs_data->attr_set.kobj, &gov->kobj_type, get_governor_parent_kobj(policy), "%s", gov->gov.name); diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h index 806d8fb4dff1..1026712bb79b 100644 --- a/drivers/cpufreq/cpufreq_governor.h +++ b/drivers/cpufreq/cpufreq_governor.h @@ -150,6 +150,7 @@ static inline struct dbs_governor *dbs_governor_of(struct cpufreq_policy *policy } /* Governor callback routines */ +void cpufreq_dbs_data_release(struct kobject *kobj); int cpufreq_dbs_governor_init(struct cpufreq_policy *policy); void cpufreq_dbs_governor_exit(struct cpufreq_policy *policy); int cpufreq_dbs_governor_start(struct cpufreq_policy *policy); diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 9942dbb38dae..7386d043c665 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -374,7 +374,10 @@ static struct od_ops od_ops = { static struct dbs_governor od_dbs_gov = { .gov = CPUFREQ_DBS_GOVERNOR_INITIALIZER("ondemand"), - .kobj_type = { .default_groups = od_groups }, + .kobj_type = { + .release = cpufreq_dbs_data_release, + .default_groups = od_groups, + }, .gov_dbs_update = od_dbs_update, .alloc = od_alloc, .free = od_free, -- 2.56.1.708.g77570a6a1d-goog From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6244760A2601 for ; Thu, 19 Nov 2026 19:25:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=XFDO06SP; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=cip5USvj DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Unsubscribe-Post:List-Owner; bh=jwtDqaGJXar2myT1lhaKpwEfavcSIURxJJP1BlAJ5Vw=; b=XFDO06SP0azhWVEvvsNHh0xuoA tt+MsJ/lTXrQCTlkIoVozfCqB7Eo6PlKlYsCeVO2396mnNRBjY2sn5ly229vFy+3yTJoVyRFBl32l vLCLq1cPzLdU5Lts7W9mf9T5N0dTHFWWdWxd6txhYmi/W6f52bUebJXtXzkeR47DhnO0Ib9hf4N9/ PytxVC+M/C7MDZn23ROjhM9TjbEfbueA+oJkQAjndgk7pmaGFIJ3R3A9l3941DO9rarYsafv7fc3a 1DNC+jQmw44UuS9DRWW6OWX+ieCpu+/OeNfI7w95dc35jpx9NyIC+i1TCoWFNus0bDH75zqcK/v+p vhMnS2Ag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xU7lY-0000000DC59-0Qho; Thu, 19 Nov 2026 19:25:52 +0000 Received: from mail-dy1-x1348.google.com ([2607:f8b0:4864:20::1348]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xU7lU-0000000DC1u-1xtO for linux-mtd@lists.infradead.org; Thu, 19 Nov 2026 19:25:51 +0000 Received: by mail-dy1-x1348.google.com with SMTP id 5a478bee46e88-3854627c1c8so72507eec.1 for ; Thu, 19 Nov 2026 11:25:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795116347; x=1795721147; darn=lists.infradead.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=kkWfFph3Jhdo1iVdBmUApUet/72n0u945LBk/dYhnBA=; b=cip5USvj2ugyBvdJ3RyyjQiR3RYxO8v0ADKbfpZwzK7NXwRd6blHnSDtyAwXleXJmj bTQviaJcsBOh5R0AU3nJIhfQeG01wpygB687PL+z2KB0c/fkDY69Y5O9Hom/jbsKZN3a m3aoq4g/RZmmME8Y5Z5wEf/6JTDGOBO9ehIodAOI27AF6jydEXImqjXE9YeFb3gV5q7W rVIFGwMWMnem2cO+ZtuchJCCjPhRp6e4tKGrAz4JPZVubp5MlWs/8pOpPPD46lJtLbRq JYrArGvO91+n2Ba+0bHVv4hkLyajpyjFetWRnJxrI9gwEEayKSvV4b2lrOYASUB0nx21 MNJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795116347; x=1795721147; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=kkWfFph3Jhdo1iVdBmUApUet/72n0u945LBk/dYhnBA=; b=wDQ3nQO0kZWv7lsTaa40P76K6a+v32JuKHLo++Kva65tZ2pcTLmXx6s4N0TyX+THWP TqC+aw+5SYR8hn1VEZUJokxr2sgvKjIiYJuVV+b/tRQk6ZYp1h6+Rj+9RZ/UBvns0obW BV6l7uLs5Cu+EOqvaJJ2jgMxMCkC9lysNIEHqoz1AVxD8zMukv9xSzbZwWMbhmZXNMx6 2A/trZgvq8VOvaKGVfTtE0of4M6ISpiPcNzxFCi8IrqkYxTBhETi0UlWnQqNcxKElgZ1 S21Gz6S66UgoiE6wSXydrv1znkFuS4RCukktvZZZkXzdoTWCLNNzRgzQuFS8gHNo9lfV Q1Ow== X-Forwarded-Encrypted: i=1; AL+hErHT5Rc/Ye/99HbfqDHJ8CgHiqDEcLcX33kxPNn7YHJGi4hKPuQkjJPhoZrGJZDSy5BPSTTqwoKHpnU=@lists.infradead.org X-Gm-Message-State: APuU4Z/uTERtARskspa7ai/e1zespIyNC7iVLh/r/cS9UdmHH5U23uSy g8Hz8MCQM7/k2fmaoq3hWZTqmvgruOmeGrC8iDi4XYw/ph+g+CqLHU5hwbSMga6Ziz7eiNOYNtx ba/qPD9xiPw== X-Received: from dyvo18-n1.prod.google.com ([2002:a05:693c:41d2:10b0:370:f640:2508]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:693c:820d:b0:36d:394d:e690 with SMTP id 5a478bee46e88-38570b34f2fmr260461eec.40.1795116346621; Thu, 19 Nov 2026 11:25:46 -0800 (PST) Date: Thu, 19 Nov 2026 11:25:15 -0800 In-Reply-To: <20261119192520.1983406-1-irogers@google.com> X-Archived-By: Mime-Version: 1.0 References: <20261119192520.1983406-1-irogers@google.com> X-Mailer: git-send-email 2.56.1.750.gf70dc682cf-goog Message-ID: <20261119192520.1983406-5-irogers@google.com> Subject: [PATCH v4 4/9] cpufreq: governor: Initialize kobj_type release callback statically From: Ian Rogers To: Danilo Krummrich , Greg Kroah-Hartman , Kees Cook , Miguel Ojeda , "Rafael J . Wysocki" Cc: Madhavan Srinivasan , Srish Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Nayna Jain , Mimi Zohar , Yoshinori Sato , Rich Felker , John Paul Adrian Glaubitz , Juergen Gross , Stefano Stabellini , Oleksandr Tyshchenko , Nathan Chancellor , Nick Desaulniers , Viresh Kumar , Zhongqiu Han , Alexander Aring , Felix Kuehling , "=?UTF-8?q?Christian=20K=C3=B6nig?=" , Zhihao Cheng , Sumanth Korikkar , Bill Wendling , Justin Stitt , driver-core@lists.linux.dev, llvm@lists.linux.dev, linux-hardening@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org, linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, linux-s390@vger.kernel.org, gfs2@lists.linux.dev, xen-devel@lists.xenproject.org, linux-mtd@lists.infradead.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Ian Rogers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261119_112548_514055_19ED8DBC X-CRM114-Status: GOOD ( 13.47 ) X-Spam-Score: -9.5 (---------) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux MTD discussion mailing list List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" X-Spam-Status: No, score=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF, 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=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 Export cpufreq_dbs_data_release() and initialize .kobj_type.release statically in the ondemand and conservative governors instead of assigning it at runtime in cpufreq_dbs_governor_init(). This prepares for annotating struct kobj_type::release with __must_init. Reviewed-by: Zhongqiu Han Acked-by: Rafael J. Wysocki (Intel) # cpufreq Acked-by: Viresh Kumar Signed-off-by: Ian Rogers --- drivers/cpufreq/cpufreq_conservative.c | 5 ++++- drivers/cpufreq/cpufreq_governor.c | 4 ++-- drivers/cpufreq/cpufreq_governor.h | 1 + drivers/cpufreq/cpufreq_ondemand.c | 5 ++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 02bfd46543e9..146a2353b1a2 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -318,7 +318,10 @@ static void cs_limits(struct cpufreq_policy *policy) static struct dbs_governor cs_governor = { .gov = CPUFREQ_DBS_GOVERNOR_INITIALIZER("conservative"), - .kobj_type = { .default_groups = cs_groups }, + .kobj_type = { + .release = cpufreq_dbs_data_release, + .default_groups = cs_groups, + }, .gov_dbs_update = cs_dbs_update, .alloc = cs_alloc, .free = cs_free, diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c index f3bd3dbe7c41..f8b5aca09b6b 100644 --- a/drivers/cpufreq/cpufreq_governor.c +++ b/drivers/cpufreq/cpufreq_governor.c @@ -419,7 +419,7 @@ static void free_policy_dbs_info(struct policy_dbs_info *policy_dbs, gov->free(policy_dbs); } -static void cpufreq_dbs_data_release(struct kobject *kobj) +void cpufreq_dbs_data_release(struct kobject *kobj) { struct dbs_data *dbs_data = to_dbs_data(to_gov_attr_set(kobj)); struct dbs_governor *gov = dbs_data->gov; @@ -427,6 +427,7 @@ static void cpufreq_dbs_data_release(struct kobject *kobj) gov->exit(dbs_data); kfree(dbs_data); } +EXPORT_SYMBOL_GPL(cpufreq_dbs_data_release); int cpufreq_dbs_governor_init(struct cpufreq_policy *policy) { @@ -488,7 +489,6 @@ int cpufreq_dbs_governor_init(struct cpufreq_policy *policy) policy->governor_data = policy_dbs; gov->kobj_type.sysfs_ops = &governor_sysfs_ops; - gov->kobj_type.release = cpufreq_dbs_data_release; ret = kobject_init_and_add(&dbs_data->attr_set.kobj, &gov->kobj_type, get_governor_parent_kobj(policy), "%s", gov->gov.name); diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h index 806d8fb4dff1..1026712bb79b 100644 --- a/drivers/cpufreq/cpufreq_governor.h +++ b/drivers/cpufreq/cpufreq_governor.h @@ -150,6 +150,7 @@ static inline struct dbs_governor *dbs_governor_of(struct cpufreq_policy *policy } /* Governor callback routines */ +void cpufreq_dbs_data_release(struct kobject *kobj); int cpufreq_dbs_governor_init(struct cpufreq_policy *policy); void cpufreq_dbs_governor_exit(struct cpufreq_policy *policy); int cpufreq_dbs_governor_start(struct cpufreq_policy *policy); diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 9942dbb38dae..7386d043c665 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -374,7 +374,10 @@ static struct od_ops od_ops = { static struct dbs_governor od_dbs_gov = { .gov = CPUFREQ_DBS_GOVERNOR_INITIALIZER("ondemand"), - .kobj_type = { .default_groups = od_groups }, + .kobj_type = { + .release = cpufreq_dbs_data_release, + .default_groups = od_groups, + }, .gov_dbs_update = od_dbs_update, .alloc = od_alloc, .free = od_free, -- 2.56.1.708.g77570a6a1d-goog ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/