[PATCH] ARM64: remove unnecessary architecture-specific <asm/device.h>

[PATCH] ARM64: remove unnecessary architecture-specific <asm/device.h>

[Ethan Nelson-Moore]

arch/arm64/include/asm/device.h is identical to
include/asm-generic/device.h, and therefore the ARM64-specific version
is unnecessary. Remove it.

Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
---
 arch/arm64/include/asm/device.h | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 arch/arm64/include/asm/device.h

diff --git a/arch/arm64/include/asm/device.h b/arch/arm64/include/asm/device.h
deleted file mode 100644
index 996498751318..000000000000
--- a/arch/arm64/include/asm/device.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) 2012 ARM Ltd.
- */
-#ifndef __ASM_DEVICE_H
-#define __ASM_DEVICE_H
-
-struct dev_archdata {
-};
-
-struct pdev_archdata {
-};
-
-#endif
-- 
2.43.0

Re: [PATCH] ARM64: remove unnecessary architecture-specific <asm/device.h>

[Will Deacon]

On Sat, May 16, 2026 at 07:53:42PM -0700, Ethan Nelson-Moore wrote:
> arch/arm64/include/asm/device.h is identical to
> include/asm-generic/device.h, and therefore the ARM64-specific version
> is unnecessary. Remove it.
> 
> Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
> ---
>  arch/arm64/include/asm/device.h | 14 --------------
>  1 file changed, 14 deletions(-)
>  delete mode 100644 arch/arm64/include/asm/device.h
> 
> diff --git a/arch/arm64/include/asm/device.h b/arch/arm64/include/asm/device.h
> deleted file mode 100644
> index 996498751318..000000000000
> --- a/arch/arm64/include/asm/device.h
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> -/*
> - * Copyright (C) 2012 ARM Ltd.
> - */
> -#ifndef __ASM_DEVICE_H
> -#define __ASM_DEVICE_H
> -
> -struct dev_archdata {
> -};
> -
> -struct pdev_archdata {
> -};
> -
> -#endif

Do we need to add a generic-y entry to arch/arm64/include/asm/Kbuild
so that we pick up the asm-generic variant?

Will

Re: [PATCH] ARM64: remove unnecessary architecture-specific <asm/device.h>

[Ethan Nelson-Moore]

Hi, Will,

On Tue, May 19, 2026 at 5:12 AM Will Deacon <will@kernel.org> wrote:
> Do we need to add a generic-y entry to arch/arm64/include/asm/Kbuild
> so that we pick up the asm-generic variant?

No, we don't, because device.h is in the list of mandatory headers in
include/asm-generic/Kbuild, which means a header including the generic
version will automatically be generated if an architecture-specific
version does not exist.

Ethan

Re: [PATCH] ARM64: remove unnecessary architecture-specific <asm/device.h>

[Will Deacon]

On Tue, May 19, 2026 at 09:03:06PM -0700, Ethan Nelson-Moore wrote:
> On Tue, May 19, 2026 at 5:12 AM Will Deacon <will@kernel.org> wrote:
> > Do we need to add a generic-y entry to arch/arm64/include/asm/Kbuild
> > so that we pick up the asm-generic variant?
> 
> No, we don't, because device.h is in the list of mandatory headers in
> include/asm-generic/Kbuild, which means a header including the generic
> version will automatically be generated if an architecture-specific
> version does not exist.

Great, thanks for the explanation. I'll pick this up.

Will

Re: [PATCH] ARM64: remove unnecessary architecture-specific <asm/device.h>

[Will Deacon]

On Sat, 16 May 2026 19:53:42 -0700, Ethan Nelson-Moore wrote:
> arch/arm64/include/asm/device.h is identical to
> include/asm-generic/device.h, and therefore the ARM64-specific version
> is unnecessary. Remove it.
> 
> 

Applied to arm64 (for-next/misc), thanks!

[1/1] ARM64: remove unnecessary architecture-specific <asm/device.h>
      https://git.kernel.org/arm64/c/32e4c96d6a71

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev