[PATCH] fixmap: Remove unused set_fixmap_offset_io()

[PATCH] fixmap: Remove unused set_fixmap_offset_io()

[Steven Price]

The macro set_fixmap_offset_io() was added in commit f774b7d10e21
("arm64: fixmap: fix missing sub-page offset for earlyprintk") but then
commit 8ef0ed95ee04 ("arm64: remove arch specific earlyprintk") removed
the file causing the only user to be removed when the two commits were
merged. Since this has never been used again since the v3.15 release
remove it.

Signed-off-by: Steven Price <steven.price@arm.com>
---
This came up because for Arm CCA there is a need to override
set_fixmap_io() [1] and rather than also update set_fixmap_offset_io() I
thought it would be better to just drop the unused macro.

[1] https://lore.kernel.org/lkml/20240605093006.145492-6-steven.price@arm.com/
---
 include/asm-generic/fixmap.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/asm-generic/fixmap.h b/include/asm-generic/fixmap.h
index 8cc7b09c1bc7..29cab7947980 100644
--- a/include/asm-generic/fixmap.h
+++ b/include/asm-generic/fixmap.h
@@ -97,8 +97,5 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)
 #define set_fixmap_io(idx, phys) \
 	__set_fixmap(idx, phys, FIXMAP_PAGE_IO)
 
-#define set_fixmap_offset_io(idx, phys) \
-	__set_fixmap_offset(idx, phys, FIXMAP_PAGE_IO)
-
 #endif /* __ASSEMBLY__ */
 #endif /* __ASM_GENERIC_FIXMAP_H */
-- 
2.34.1

Re: [PATCH] fixmap: Remove unused set_fixmap_offset_io()

[Arnd Bergmann]

On Wed, Jun 12, 2024, at 18:00, Steven Price wrote:
> The macro set_fixmap_offset_io() was added in commit f774b7d10e21
> ("arm64: fixmap: fix missing sub-page offset for earlyprintk") but then
> commit 8ef0ed95ee04 ("arm64: remove arch specific earlyprintk") removed
> the file causing the only user to be removed when the two commits were
> merged. Since this has never been used again since the v3.15 release
> remove it.
>
> Signed-off-by: Steven Price <steven.price@arm.com>
> ---
> This came up because for Arm CCA there is a need to override
> set_fixmap_io() [1] and rather than also update set_fixmap_offset_io() I
> thought it would be better to just drop the unused macro.
>
> [1] https://lore.kernel.org/lkml/20240605093006.145492-6-steven.price@arm.com/

I assume you want to keep this with your other patch, so

Acked-by: Arnd Bergmann <arnd@arndb.de>

Re: [PATCH] fixmap: Remove unused set_fixmap_offset_io()

[Steven Price]

On 12/06/2024 21:02, Arnd Bergmann wrote:
> On Wed, Jun 12, 2024, at 18:00, Steven Price wrote:
>> The macro set_fixmap_offset_io() was added in commit f774b7d10e21
>> ("arm64: fixmap: fix missing sub-page offset for earlyprintk") but then
>> commit 8ef0ed95ee04 ("arm64: remove arch specific earlyprintk") removed
>> the file causing the only user to be removed when the two commits were
>> merged. Since this has never been used again since the v3.15 release
>> remove it.
>>
>> Signed-off-by: Steven Price <steven.price@arm.com>
>> ---
>> This came up because for Arm CCA there is a need to override
>> set_fixmap_io() [1] and rather than also update set_fixmap_offset_io() I
>> thought it would be better to just drop the unused macro.
>>
>> [1] https://lore.kernel.org/lkml/20240605093006.145492-6-steven.price@arm.com/
> 
> I assume you want to keep this with your other patch, so
> 
> Acked-by: Arnd Bergmann <arnd@arndb.de>

Actually for now it looks[1] like we're going to drop the overriding of 
set_fixmap_io() so if you want to apply this change separately please 
do!

Thanks,

Steve

[1] https://lore.kernel.org/r/b611bb5f-b6f8-44a4-9b33-a92862974363%40arm.com

Re: [PATCH] fixmap: Remove unused set_fixmap_offset_io()

[Arnd Bergmann]

On Thu, Jun 27, 2024, at 15:58, Steven Price wrote:
> On 12/06/2024 21:02, Arnd Bergmann wrote:
> Actually for now it looks[1] like we're going to drop the overriding of 
> set_fixmap_io() so if you want to apply this change separately please 
> do!

Applied now.

    Arnd