arch/x86/include/asm/iosf_mbi.h | 7 ------- arch/x86/platform/intel/iosf_mbi.c | 13 ------------- drivers/gpu/drm/i915/i915_iosf_mbi.h | 6 ------ 3 files changed, 26 deletions(-)
From: "Dr. David Alan Gilbert" <linux@treblig.org>
The last use of iosf_mbi_unregister_pmic_bus_access_notifier() was
removed in 2017 by
commit a5266db4d314 ("drm/i915: Acquire PUNIT->PMIC bus for
intel_uncore_forcewake_reset()")
Remove it.
Note the '_unlocked' version is still used.
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
arch/x86/include/asm/iosf_mbi.h | 7 -------
arch/x86/platform/intel/iosf_mbi.c | 13 -------------
drivers/gpu/drm/i915/i915_iosf_mbi.h | 6 ------
3 files changed, 26 deletions(-)
diff --git a/arch/x86/include/asm/iosf_mbi.h b/arch/x86/include/asm/iosf_mbi.h
index af7541c11821..8ace6559d399 100644
--- a/arch/x86/include/asm/iosf_mbi.h
+++ b/arch/x86/include/asm/iosf_mbi.h
@@ -167,13 +167,6 @@ void iosf_mbi_unblock_punit_i2c_access(void);
*/
int iosf_mbi_register_pmic_bus_access_notifier(struct notifier_block *nb);
-/**
- * iosf_mbi_register_pmic_bus_access_notifier - Unregister PMIC bus notifier
- *
- * @nb: notifier_block to unregister
- */
-int iosf_mbi_unregister_pmic_bus_access_notifier(struct notifier_block *nb);
-
/**
* iosf_mbi_unregister_pmic_bus_access_notifier_unlocked - Unregister PMIC bus
* notifier, unlocked
diff --git a/arch/x86/platform/intel/iosf_mbi.c b/arch/x86/platform/intel/iosf_mbi.c
index c81cea208c2c..40ae94db20d8 100644
--- a/arch/x86/platform/intel/iosf_mbi.c
+++ b/arch/x86/platform/intel/iosf_mbi.c
@@ -422,19 +422,6 @@ int iosf_mbi_unregister_pmic_bus_access_notifier_unlocked(
}
EXPORT_SYMBOL(iosf_mbi_unregister_pmic_bus_access_notifier_unlocked);
-int iosf_mbi_unregister_pmic_bus_access_notifier(struct notifier_block *nb)
-{
- int ret;
-
- /* Wait for the bus to go inactive before unregistering */
- iosf_mbi_punit_acquire();
- ret = iosf_mbi_unregister_pmic_bus_access_notifier_unlocked(nb);
- iosf_mbi_punit_release();
-
- return ret;
-}
-EXPORT_SYMBOL(iosf_mbi_unregister_pmic_bus_access_notifier);
-
void iosf_mbi_assert_punit_acquired(void)
{
WARN_ON(iosf_mbi_pmic_punit_access_count == 0);
diff --git a/drivers/gpu/drm/i915/i915_iosf_mbi.h b/drivers/gpu/drm/i915/i915_iosf_mbi.h
index 8f81b7603d37..317075d0da4e 100644
--- a/drivers/gpu/drm/i915/i915_iosf_mbi.h
+++ b/drivers/gpu/drm/i915/i915_iosf_mbi.h
@@ -31,12 +31,6 @@ iosf_mbi_unregister_pmic_bus_access_notifier_unlocked(struct notifier_block *nb)
{
return 0;
}
-
-static inline
-int iosf_mbi_unregister_pmic_bus_access_notifier(struct notifier_block *nb)
-{
- return 0;
-}
#endif
#endif /* __I915_IOSF_MBI_H__ */
--
2.47.1
* linux@treblig.org <linux@treblig.org> wrote:
> From: "Dr. David Alan Gilbert" <linux@treblig.org>
>
> The last use of iosf_mbi_unregister_pmic_bus_access_notifier() was
> removed in 2017 by
> commit a5266db4d314 ("drm/i915: Acquire PUNIT->PMIC bus for
> intel_uncore_forcewake_reset()")
>
> Remove it.
>
> Note the '_unlocked' version is still used.
>
> Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
> ---
> arch/x86/include/asm/iosf_mbi.h | 7 -------
> arch/x86/platform/intel/iosf_mbi.c | 13 -------------
> drivers/gpu/drm/i915/i915_iosf_mbi.h | 6 ------
> 3 files changed, 26 deletions(-)
Acked-by: Ingo Molnar <mingo@kernel.org>
Thanks,
Ingo
* Ingo Molnar (mingo@kernel.org) wrote:
>
> * linux@treblig.org <linux@treblig.org> wrote:
>
> > From: "Dr. David Alan Gilbert" <linux@treblig.org>
> >
> > The last use of iosf_mbi_unregister_pmic_bus_access_notifier() was
> > removed in 2017 by
> > commit a5266db4d314 ("drm/i915: Acquire PUNIT->PMIC bus for
> > intel_uncore_forcewake_reset()")
> >
> > Remove it.
> >
> > Note the '_unlocked' version is still used.
> >
> > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
> > ---
> > arch/x86/include/asm/iosf_mbi.h | 7 -------
> > arch/x86/platform/intel/iosf_mbi.c | 13 -------------
> > drivers/gpu/drm/i915/i915_iosf_mbi.h | 6 ------
> > 3 files changed, 26 deletions(-)
>
> Acked-by: Ingo Molnar <mingo@kernel.org>
Thanks!
Any idea who might pick this one up?
Dave
> Thanks,
>
> Ingo
>
--
-----Open up your eyes, open up your mind, open up your code -------
/ Dr. David Alan Gilbert | Running GNU/Linux | Happy \
\ dave @ treblig.org | | In Hex /
\ _________________________|_____ http://www.treblig.org |_______/
* Dr. David Alan Gilbert <linux@treblig.org> wrote:
> * Ingo Molnar (mingo@kernel.org) wrote:
> >
> > * linux@treblig.org <linux@treblig.org> wrote:
> >
> > > From: "Dr. David Alan Gilbert" <linux@treblig.org>
> > >
> > > The last use of iosf_mbi_unregister_pmic_bus_access_notifier() was
> > > removed in 2017 by
> > > commit a5266db4d314 ("drm/i915: Acquire PUNIT->PMIC bus for
> > > intel_uncore_forcewake_reset()")
> > >
> > > Remove it.
> > >
> > > Note the '_unlocked' version is still used.
> > >
> > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
> > > ---
> > > arch/x86/include/asm/iosf_mbi.h | 7 -------
> > > arch/x86/platform/intel/iosf_mbi.c | 13 -------------
> > > drivers/gpu/drm/i915/i915_iosf_mbi.h | 6 ------
> > > 3 files changed, 26 deletions(-)
> >
> > Acked-by: Ingo Molnar <mingo@kernel.org>
>
> Thanks!
> Any idea who might pick this one up?
>
> Dave
We can certainly do it via the x86 tree - I've added GPU/DRM
maintainers to the commit's Cc: list.
Thanks,
Ingo
* Ingo Molnar (mingo@kernel.org) wrote:
>
> * Dr. David Alan Gilbert <linux@treblig.org> wrote:
>
> > * Ingo Molnar (mingo@kernel.org) wrote:
> > >
> > > * linux@treblig.org <linux@treblig.org> wrote:
> > >
> > > > From: "Dr. David Alan Gilbert" <linux@treblig.org>
> > > >
> > > > The last use of iosf_mbi_unregister_pmic_bus_access_notifier() was
> > > > removed in 2017 by
> > > > commit a5266db4d314 ("drm/i915: Acquire PUNIT->PMIC bus for
> > > > intel_uncore_forcewake_reset()")
> > > >
> > > > Remove it.
> > > >
> > > > Note the '_unlocked' version is still used.
> > > >
> > > > Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
> > > > ---
> > > > arch/x86/include/asm/iosf_mbi.h | 7 -------
> > > > arch/x86/platform/intel/iosf_mbi.c | 13 -------------
> > > > drivers/gpu/drm/i915/i915_iosf_mbi.h | 6 ------
> > > > 3 files changed, 26 deletions(-)
> > >
> > > Acked-by: Ingo Molnar <mingo@kernel.org>
> >
> > Thanks!
> > Any idea who might pick this one up?
> >
> > Dave
>
> We can certainly do it via the x86 tree - I've added GPU/DRM
> maintainers to the commit's Cc: list.
Thanks again! (hardly urgent, but just trying to clean up
my backlog).
Dave
> Thanks,
>
> Ingo
--
-----Open up your eyes, open up your mind, open up your code -------
/ Dr. David Alan Gilbert | Running GNU/Linux | Happy \
\ dave @ treblig.org | | In Hex /
\ _________________________|_____ http://www.treblig.org |_______/
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: d0ebf4c7eb91fe73981d5250b50e9d22db8fb946
Gitweb: https://git.kernel.org/tip/d0ebf4c7eb91fe73981d5250b50e9d22db8fb946
Author: Dr. David Alan Gilbert <linux@treblig.org>
AuthorDate: Wed, 25 Dec 2024 17:50:10
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 01 Apr 2025 20:31:39 +02:00
x86/platform/iosf_mbi: Remove unused iosf_mbi_unregister_pmic_bus_access_notifier()
The last use of iosf_mbi_unregister_pmic_bus_access_notifier() was
removed in 2017 by:
a5266db4d314 ("drm/i915: Acquire PUNIT->PMIC bus for intel_uncore_forcewake_reset()")
Remove it.
(Note that the '_unlocked' version is still used.)
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Tvrtko Ursulin <tursulin@ursulin.net>
Cc: David Airlie <airlied@gmail.com>
Cc: Simona Vetter <simona@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Link: https://lore.kernel.org/r/20241225175010.91783-1-linux@treblig.org
---
arch/x86/include/asm/iosf_mbi.h | 7 -------
arch/x86/platform/intel/iosf_mbi.c | 13 -------------
drivers/gpu/drm/i915/i915_iosf_mbi.h | 6 ------
3 files changed, 26 deletions(-)
diff --git a/arch/x86/include/asm/iosf_mbi.h b/arch/x86/include/asm/iosf_mbi.h
index af7541c..8ace655 100644
--- a/arch/x86/include/asm/iosf_mbi.h
+++ b/arch/x86/include/asm/iosf_mbi.h
@@ -168,13 +168,6 @@ void iosf_mbi_unblock_punit_i2c_access(void);
int iosf_mbi_register_pmic_bus_access_notifier(struct notifier_block *nb);
/**
- * iosf_mbi_register_pmic_bus_access_notifier - Unregister PMIC bus notifier
- *
- * @nb: notifier_block to unregister
- */
-int iosf_mbi_unregister_pmic_bus_access_notifier(struct notifier_block *nb);
-
-/**
* iosf_mbi_unregister_pmic_bus_access_notifier_unlocked - Unregister PMIC bus
* notifier, unlocked
*
diff --git a/arch/x86/platform/intel/iosf_mbi.c b/arch/x86/platform/intel/iosf_mbi.c
index c81cea2..40ae94d 100644
--- a/arch/x86/platform/intel/iosf_mbi.c
+++ b/arch/x86/platform/intel/iosf_mbi.c
@@ -422,19 +422,6 @@ int iosf_mbi_unregister_pmic_bus_access_notifier_unlocked(
}
EXPORT_SYMBOL(iosf_mbi_unregister_pmic_bus_access_notifier_unlocked);
-int iosf_mbi_unregister_pmic_bus_access_notifier(struct notifier_block *nb)
-{
- int ret;
-
- /* Wait for the bus to go inactive before unregistering */
- iosf_mbi_punit_acquire();
- ret = iosf_mbi_unregister_pmic_bus_access_notifier_unlocked(nb);
- iosf_mbi_punit_release();
-
- return ret;
-}
-EXPORT_SYMBOL(iosf_mbi_unregister_pmic_bus_access_notifier);
-
void iosf_mbi_assert_punit_acquired(void)
{
WARN_ON(iosf_mbi_pmic_punit_access_count == 0);
diff --git a/drivers/gpu/drm/i915/i915_iosf_mbi.h b/drivers/gpu/drm/i915/i915_iosf_mbi.h
index 8f81b76..317075d 100644
--- a/drivers/gpu/drm/i915/i915_iosf_mbi.h
+++ b/drivers/gpu/drm/i915/i915_iosf_mbi.h
@@ -31,12 +31,6 @@ iosf_mbi_unregister_pmic_bus_access_notifier_unlocked(struct notifier_block *nb)
{
return 0;
}
-
-static inline
-int iosf_mbi_unregister_pmic_bus_access_notifier(struct notifier_block *nb)
-{
- return 0;
-}
#endif
#endif /* __I915_IOSF_MBI_H__ */
© 2016 - 2026 Red Hat, Inc.