Skip to content

Commit d0ebf4c

Browse files
Dr. David Alan GilbertIngo Molnar
authored andcommitted
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: a5266db ("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 <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Cc: Jani Nikula <[email protected]> Cc: Joonas Lahtinen <[email protected]> Cc: Rodrigo Vivi <[email protected]> Cc: Tvrtko Ursulin <[email protected]> Cc: David Airlie <[email protected]> Cc: Simona Vetter <[email protected]> Cc: [email protected] Cc: [email protected] Link: https://lore.kernel.org/r/[email protected]
1 parent 7170130 commit d0ebf4c

File tree

3 files changed

+0
-26
lines changed

3 files changed

+0
-26
lines changed

arch/x86/include/asm/iosf_mbi.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,6 @@ void iosf_mbi_unblock_punit_i2c_access(void);
167167
*/
168168
int iosf_mbi_register_pmic_bus_access_notifier(struct notifier_block *nb);
169169

170-
/**
171-
* iosf_mbi_register_pmic_bus_access_notifier - Unregister PMIC bus notifier
172-
*
173-
* @nb: notifier_block to unregister
174-
*/
175-
int iosf_mbi_unregister_pmic_bus_access_notifier(struct notifier_block *nb);
176-
177170
/**
178171
* iosf_mbi_unregister_pmic_bus_access_notifier_unlocked - Unregister PMIC bus
179172
* notifier, unlocked

arch/x86/platform/intel/iosf_mbi.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -422,19 +422,6 @@ int iosf_mbi_unregister_pmic_bus_access_notifier_unlocked(
422422
}
423423
EXPORT_SYMBOL(iosf_mbi_unregister_pmic_bus_access_notifier_unlocked);
424424

425-
int iosf_mbi_unregister_pmic_bus_access_notifier(struct notifier_block *nb)
426-
{
427-
int ret;
428-
429-
/* Wait for the bus to go inactive before unregistering */
430-
iosf_mbi_punit_acquire();
431-
ret = iosf_mbi_unregister_pmic_bus_access_notifier_unlocked(nb);
432-
iosf_mbi_punit_release();
433-
434-
return ret;
435-
}
436-
EXPORT_SYMBOL(iosf_mbi_unregister_pmic_bus_access_notifier);
437-
438425
void iosf_mbi_assert_punit_acquired(void)
439426
{
440427
WARN_ON(iosf_mbi_pmic_punit_access_count == 0);

drivers/gpu/drm/i915/i915_iosf_mbi.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ iosf_mbi_unregister_pmic_bus_access_notifier_unlocked(struct notifier_block *nb)
3131
{
3232
return 0;
3333
}
34-
35-
static inline
36-
int iosf_mbi_unregister_pmic_bus_access_notifier(struct notifier_block *nb)
37-
{
38-
return 0;
39-
}
4034
#endif
4135

4236
#endif /* __I915_IOSF_MBI_H__ */

0 commit comments

Comments
 (0)