net: ipa: header hygiene
cover net: ipa: header hygiene
The end result of this series is that the list of files included in every IPA source file will be maintained in sorted order. This imposes some consistency that was previously not possible.
If an IPA header file requires a symbol or type declared in another header, that other header must be included. E.g., if bool or u32 type is used in a function declaration in an IPA header file, the IPA header must include <linux/types.h>.
If a type used is just a struct or union *pointer* or enum type (and no members within these types are needed), then these types only need to be *declared* within the header that uses it.
This is sufficient, but in addition, this series removes includes of files that aren't necessary, as well as unneeded type declarations.
-Alex
Alex Elder (7):
net: ipa: include some standard header files
net: ipa: remove unneeded standard includes
net: ipa: include "ipa_interrupt.h" where needed
net: ipa: add some needed struct declarations
net: ipa: eliminate unneeded struct declarations
net: ipa: more include file cleanup
net: ipa: sort all includes
drivers/net/ipa/data/ipa_data-v3.1.c | 5 +++-- drivers/net/ipa/data/ipa_data-v3.5.1.c | 5 +++-- drivers/net/ipa/data/ipa_data-v4.11.c | 5 +++-- drivers/net/ipa/data/ipa_data-v4.2.c | 5 +++-- drivers/net/ipa/data/ipa_data-v4.5.c | 5 +++-- drivers/net/ipa/data/ipa_data-v4.7.c | 5 +++-- drivers/net/ipa/data/ipa_data-v4.9.c | 5 +++-- drivers/net/ipa/data/ipa_data-v5.0.c | 5 +++-- drivers/net/ipa/data/ipa_data-v5.5.c | 5 +++-- drivers/net/ipa/gsi.c | 18 ++++++++--------- drivers/net/ipa/gsi.h | 10 +++------- drivers/net/ipa/gsi_private.h | 7 ++++--- drivers/net/ipa/gsi_reg.c | 6 +++--- drivers/net/ipa/gsi_trans.c | 12 ++++++------ drivers/net/ipa/gsi_trans.h | 9 ++++----- drivers/net/ipa/ipa.h | 15 +++++--------- drivers/net/ipa/ipa_cmd.c | 13 +++++++------ drivers/net/ipa/ipa_cmd.h | 10 +++------- drivers/net/ipa/ipa_data.h | 4 ++-- drivers/net/ipa/ipa_endpoint.c | 19 ++++++++++-------- drivers/net/ipa/ipa_endpoint.h | 4 ++-- drivers/net/ipa/ipa_gsi.c | 7 ++++--- drivers/net/ipa/ipa_interrupt.c | 10 +++++----- drivers/net/ipa/ipa_interrupt.h | 6 ++++-- drivers/net/ipa/ipa_main.c | 27 +++++++++++++------------- drivers/net/ipa/ipa_mem.c | 15 +++++++------- drivers/net/ipa/ipa_mem.h | 4 +++- drivers/net/ipa/ipa_modem.c | 14 ++++++------- drivers/net/ipa/ipa_modem.h | 5 +++-- drivers/net/ipa/ipa_power.c | 8 ++++---- drivers/net/ipa/ipa_power.h | 5 +++-- drivers/net/ipa/ipa_qmi.c | 10 +++------- drivers/net/ipa/ipa_qmi.h | 4 +++- drivers/net/ipa/ipa_qmi_msg.c | 3 ++- drivers/net/ipa/ipa_qmi_msg.h | 3 ++- drivers/net/ipa/ipa_reg.c | 4 ++-- drivers/net/ipa/ipa_reg.h | 6 +----- drivers/net/ipa/ipa_resource.c | 3 +-- drivers/net/ipa/ipa_smp2p.c | 10 +++++----- drivers/net/ipa/ipa_sysfs.c | 7 +++---- drivers/net/ipa/ipa_sysfs.h | 4 +--- drivers/net/ipa/ipa_table.c | 19 ++++++++---------- drivers/net/ipa/ipa_uc.c | 10 ++++++---- drivers/net/ipa/ipa_uc.h | 3 +-- drivers/net/ipa/ipa_version.h | 4 +++- drivers/net/ipa/reg.h | 8 +++++--- drivers/net/ipa/reg/gsi_reg-v3.1.c | 8 +++++--- drivers/net/ipa/reg/gsi_reg-v3.5.1.c | 8 +++++--- drivers/net/ipa/reg/gsi_reg-v4.0.c | 8 +++++--- drivers/net/ipa/reg/gsi_reg-v4.11.c | 8 +++++--- drivers/net/ipa/reg/gsi_reg-v4.5.c | 8 +++++--- drivers/net/ipa/reg/gsi_reg-v4.9.c | 8 +++++--- drivers/net/ipa/reg/gsi_reg-v5.0.c | 8 +++++--- drivers/net/ipa/reg/ipa_reg-v3.1.c | 6 ++++-- drivers/net/ipa/reg/ipa_reg-v3.5.1.c | 6 ++++-- drivers/net/ipa/reg/ipa_reg-v4.11.c | 6 ++++-- drivers/net/ipa/reg/ipa_reg-v4.2.c | 6 ++++-- drivers/net/ipa/reg/ipa_reg-v4.5.c | 6 ++++-- drivers/net/ipa/reg/ipa_reg-v4.7.c | 6 ++++-- drivers/net/ipa/reg/ipa_reg-v4.9.c | 6 ++++-- drivers/net/ipa/reg/ipa_reg-v5.0.c | 6 ++++-- drivers/net/ipa/reg/ipa_reg-v5.5.c | 6 +++--- 62 files changed, 253 insertions(+), 228 deletions(-)
Signature · 1 line
2.40.1
PATCH 1/7 net: ipa: include some standard header files
Some IPA header files use types defined in <linux/types.h>, but do not include that file:
- In "ipa_mem.h", the ipa_mem structure has u16 and u32 fields
- In "ipa_power.h", ipa_power_retention() takes a bool argument, and ipa_core_clock_rate() returns u32
- In "ipa_version.h", ipa_version_supported() returns bool
Include it in these files to satisfy their dependencies.
The ipa_qmi structure (defined in "ipa_qmi.h") contains a work structure, so include <linux/workqueue.h> in there.
All of the data and register definition files, as well as "reg.h", use the ARRAY_SIZE() macro. Include <linux/array_size.h> everywhere it's used.
Similarly, all register definition files (and a few others) use the GENMASK() macro, so include <linux/bits.h> to ensure it's defined where used. BIT() becomes available by including this file also.
--- drivers/net/ipa/data/ipa_data-v3.1.c | 3 ++- drivers/net/ipa/data/ipa_data-v3.5.1.c | 3 ++- drivers/net/ipa/data/ipa_data-v4.11.c | 3 ++- drivers/net/ipa/data/ipa_data-v4.2.c | 3 ++- drivers/net/ipa/data/ipa_data-v4.5.c | 3 ++- drivers/net/ipa/data/ipa_data-v4.7.c | 3 ++- drivers/net/ipa/data/ipa_data-v4.9.c | 3 ++- drivers/net/ipa/data/ipa_data-v5.0.c | 3 ++- drivers/net/ipa/data/ipa_data-v5.5.c | 3 ++- drivers/net/ipa/ipa_cmd.c | 3 ++- drivers/net/ipa/ipa_endpoint.c | 3 ++- drivers/net/ipa/ipa_mem.h | 4 +++- drivers/net/ipa/ipa_power.h | 4 +++- drivers/net/ipa/ipa_qmi.h | 3 ++- drivers/net/ipa/ipa_version.h | 4 +++- drivers/net/ipa/reg.h | 4 +++- drivers/net/ipa/reg/gsi_reg-v3.1.c | 4 +++- drivers/net/ipa/reg/gsi_reg-v3.5.1.c | 4 +++- drivers/net/ipa/reg/gsi_reg-v4.0.c | 4 +++- drivers/net/ipa/reg/gsi_reg-v4.11.c | 4 +++- drivers/net/ipa/reg/gsi_reg-v4.5.c | 4 +++- drivers/net/ipa/reg/gsi_reg-v4.9.c | 4 +++- drivers/net/ipa/reg/gsi_reg-v5.0.c | 4 +++- drivers/net/ipa/reg/ipa_reg-v3.1.c | 4 +++- drivers/net/ipa/reg/ipa_reg-v3.5.1.c | 4 +++- drivers/net/ipa/reg/ipa_reg-v4.11.c | 4 +++- drivers/net/ipa/reg/ipa_reg-v4.2.c | 4 +++- drivers/net/ipa/reg/ipa_reg-v4.5.c | 4 +++- drivers/net/ipa/reg/ipa_reg-v4.7.c | 4 +++- drivers/net/ipa/reg/ipa_reg-v4.9.c | 4 +++- drivers/net/ipa/reg/ipa_reg-v5.0.c | 4 +++- drivers/net/ipa/reg/ipa_reg-v5.5.c | 4 +++- 32 files changed, 84 insertions(+), 32 deletions(-)
drivers/net/ipa/data/ipa_data-v3.1.c +2 -1
@@ -1,9 +1,10 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2021 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ +#include <linux/array_size.h> #include <linux/log2.h> #include "../gsi.h"
drivers/net/ipa/data/ipa_data-v3.5.1.c +2 -1
@@ -1,9 +1,10 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2021 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ +#include <linux/array_size.h> #include <linux/log2.h> #include "../gsi.h"
drivers/net/ipa/data/ipa_data-v4.11.c +2 -1
@@ -1,7 +1,8 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2021 Linaro Ltd. */ +/* Copyright (C) 2021-2024 Linaro Ltd. */ +#include <linux/array_size.h> #include <linux/log2.h> #include "../gsi.h"
drivers/net/ipa/data/ipa_data-v4.2.c +2 -1
@@ -1,7 +1,8 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2019-2021 Linaro Ltd. */ +/* Copyright (C) 2019-2024 Linaro Ltd. */ +#include <linux/array_size.h> #include <linux/log2.h> #include "../gsi.h"
drivers/net/ipa/data/ipa_data-v4.5.c +2 -1
@@ -1,7 +1,8 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2021 Linaro Ltd. */ +/* Copyright (C) 2021-2024 Linaro Ltd. */ +#include <linux/array_size.h> #include <linux/log2.h> #include "../gsi.h"
drivers/net/ipa/data/ipa_data-v4.7.c +2 -1
@@ -1,7 +1,8 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2022 Linaro Ltd. */ +/* Copyright (C) 2022-2024 Linaro Ltd. */ +#include <linux/array_size.h> #include <linux/log2.h> #include "../gsi.h"
drivers/net/ipa/data/ipa_data-v4.9.c +2 -1
@@ -1,7 +1,8 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2021 Linaro Ltd. */ +/* Copyright (C) 2021-2024 Linaro Ltd. */ +#include <linux/array_size.h> #include <linux/log2.h> #include "../gsi.h"
drivers/net/ipa/data/ipa_data-v5.0.c +2 -1
@@ -1,7 +1,8 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2023 Linaro Ltd. */ +/* Copyright (C) 2023-2024 Linaro Ltd. */ +#include <linux/array_size.h> #include <linux/log2.h> #include "../gsi.h"
drivers/net/ipa/data/ipa_data-v5.5.c +2 -1
@@ -1,7 +1,8 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2023 Linaro Ltd. */ +/* Copyright (C) 2023-2024 Linaro Ltd. */ +#include <linux/array_size.h> #include <linux/kernel.h> #include <linux/log2.h>
drivers/net/ipa/ipa_cmd.c +2 -1
@@ -1,9 +1,10 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2023 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ +#include <linux/bits.h> #include <linux/types.h> #include <linux/device.h> #include <linux/slab.h>
drivers/net/ipa/ipa_endpoint.c +2 -1
@@ -1,9 +1,10 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2023 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ +#include <linux/bits.h> #include <linux/types.h> #include <linux/device.h> #include <linux/slab.h>
drivers/net/ipa/ipa_mem.h +3 -1
@@ -1,11 +1,13 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2023 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ #ifndef _IPA_MEM_H_#define _IPA_MEM_H_ +#include <linux/types.h> +struct platform_device ;struct ipa ;
drivers/net/ipa/ipa_power.h +3 -1
@@ -1,11 +1,13 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #ifndef _IPA_POWER_H_#define _IPA_POWER_H_ +#include <linux/types.h> +struct device ;struct ipa ;
drivers/net/ipa/ipa_qmi.h +2 -1
@@ -1,12 +1,13 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #ifndef _IPA_QMI_H_#define _IPA_QMI_H_#include <linux/types.h> +#include <linux/workqueue.h> #include <linux/soc/qcom/qmi.h> struct ipa ;
drivers/net/ipa/ipa_version.h +3 -1
@@ -1,11 +1,13 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2022 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ #ifndef _IPA_VERSION_H_#define _IPA_VERSION_H_ +#include <linux/types.h> +/** * enum ipa_version * @IPA_VERSION_3_0: IPA version 3.0/GSI version 1.0
drivers/net/ipa/reg.h +3 -1
@@ -1,10 +1,12 @@/* SPDX-License-Identifier: GPL-2.0 */ -/* *Copyright (C) 2022-2023 Linaro Ltd. */ +/* Copyright (C) 2022-2024 Linaro Ltd. */ #ifndef _REG_H_#define _REG_H_ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include <linux/log2.h> #include <linux/bug.h>
drivers/net/ipa/reg/gsi_reg-v3.1.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2023 Linaro Ltd. */ +/* Copyright (C) 2023-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../gsi.h"
drivers/net/ipa/reg/gsi_reg-v3.5.1.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2023 Linaro Ltd. */ +/* Copyright (C) 2023-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../gsi.h"
drivers/net/ipa/reg/gsi_reg-v4.0.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2023 Linaro Ltd. */ +/* Copyright (C) 2023-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../gsi.h"
drivers/net/ipa/reg/gsi_reg-v4.11.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2023 Linaro Ltd. */ +/* Copyright (C) 2023-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../gsi.h"
drivers/net/ipa/reg/gsi_reg-v4.5.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2023 Linaro Ltd. */ +/* Copyright (C) 2023-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../gsi.h"
drivers/net/ipa/reg/gsi_reg-v4.9.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2023 Linaro Ltd. */ +/* Copyright (C) 2023-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../gsi.h"
drivers/net/ipa/reg/gsi_reg-v5.0.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2023 Linaro Ltd. */ +/* Copyright (C) 2023-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../gsi.h"
drivers/net/ipa/reg/ipa_reg-v3.1.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2022 Linaro Ltd. */ +/* Copyright (C) 2022-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../ipa.h"
drivers/net/ipa/reg/ipa_reg-v3.5.1.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2022 Linaro Ltd. */ +/* Copyright (C) 2022-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../ipa.h"
drivers/net/ipa/reg/ipa_reg-v4.11.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2022 Linaro Ltd. */ +/* Copyright (C) 2022-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../ipa.h"
drivers/net/ipa/reg/ipa_reg-v4.2.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2022 Linaro Ltd. */ +/* Copyright (C) 2022-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../ipa.h"
drivers/net/ipa/reg/ipa_reg-v4.5.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2022 Linaro Ltd. */ +/* Copyright (C) 2022-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../ipa.h"
drivers/net/ipa/reg/ipa_reg-v4.7.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2022 Linaro Ltd. */ +/* Copyright (C) 2022-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../ipa.h"
drivers/net/ipa/reg/ipa_reg-v4.9.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2022 Linaro Ltd. */ +/* Copyright (C) 2022-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../ipa.h"
drivers/net/ipa/reg/ipa_reg-v5.0.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2023 Linaro Ltd. */ +/* Copyright (C) 2023-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/types.h> #include "../ipa.h"
drivers/net/ipa/reg/ipa_reg-v5.5.c +3 -1
@@ -1,7 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2023 Linaro Ltd. */ +/* Copyright (C) 2023-2024 Linaro Ltd. */ +#include <linux/array_size.h> +#include <linux/bits.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/bits.h>
Signature · 1 line
2.40.1
PATCH 2/7 net: ipa: remove unneeded standard includes
In reply to Alex ElderSome IPA header files include one or more other standard header files despite not directly needing anything defined in the included files. Remove these unnecessary includes.
--- drivers/net/ipa/gsi.c | 4 +--- drivers/net/ipa/gsi.h | 4 +--- drivers/net/ipa/ipa.h | 4 +--- drivers/net/ipa/ipa_cmd.c | 1 - drivers/net/ipa/ipa_cmd.h | 3 +-- drivers/net/ipa/ipa_endpoint.c | 1 - drivers/net/ipa/ipa_endpoint.h | 1 - drivers/net/ipa/ipa_interrupt.h | 3 +-- drivers/net/ipa/ipa_main.c | 4 +--- drivers/net/ipa/ipa_mem.c | 4 +--- drivers/net/ipa/ipa_qmi.c | 4 +--- drivers/net/ipa/ipa_reg.h | 5 +---- drivers/net/ipa/ipa_resource.c | 3 +-- drivers/net/ipa/ipa_smp2p.c | 3 +-- drivers/net/ipa/ipa_sysfs.c | 3 +-- drivers/net/ipa/ipa_table.c | 3 --- drivers/net/ipa/reg/ipa_reg-v5.5.c | 1 - 17 files changed, 12 insertions(+), 39 deletions(-)
drivers/net/ipa/gsi.c +1 -3
@@ -1,15 +1,13 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2023 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #include <linux/types.h> #include <linux/bits.h> -#include <linux/bitfield.h> #include <linux/mutex.h> #include <linux/completion.h> -#include <linux/io.h> #include <linux/bug.h> #include <linux/interrupt.h> #include <linux/platform_device.h>
drivers/net/ipa/gsi.h +1 -3
@@ -1,16 +1,14 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2023 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #ifndef _GSI_H_#define _GSI_H_#include <linux/types.h> -#include <linux/spinlock.h> #include <linux/mutex.h> #include <linux/completion.h> -#include <linux/platform_device.h> #include <linux/netdevice.h> #include "ipa_version.h"
drivers/net/ipa/ipa.h +1 -3
@@ -1,15 +1,13 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #ifndef _IPA_H_#define _IPA_H_#include <linux/types.h> -#include <linux/device.h> #include <linux/notifier.h> -#include <linux/pm_wakeup.h> #include "ipa_version.h" #include "gsi.h"
drivers/net/ipa/ipa_cmd.c +0 -1
@@ -7,7 +7,6 @@#include <linux/bits.h> #include <linux/types.h> #include <linux/device.h> -#include <linux/slab.h> #include <linux/bitfield.h> #include <linux/dma-direction.h>
drivers/net/ipa/ipa_cmd.h +1 -2
@@ -1,13 +1,12 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2022 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ #ifndef _IPA_CMD_H_#define _IPA_CMD_H_#include <linux/types.h> -#include <linux/dma-direction.h> struct sk_buff ;struct scatterlist ;
drivers/net/ipa/ipa_endpoint.c +0 -1
@@ -7,7 +7,6 @@#include <linux/bits.h> #include <linux/types.h> #include <linux/device.h> -#include <linux/slab.h> #include <linux/bitfield.h> #include <linux/if_rmnet.h> #include <linux/dma-direction.h>
drivers/net/ipa/ipa_endpoint.h +0 -1
@@ -8,7 +8,6 @@#include <linux/types.h> #include <linux/workqueue.h> -#include <linux/if_ether.h> #include "gsi.h" #include "ipa_reg.h"
drivers/net/ipa/ipa_interrupt.h +1 -2
@@ -1,13 +1,12 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #ifndef _IPA_INTERRUPT_H_#define _IPA_INTERRUPT_H_#include <linux/types.h> -#include <linux/bits.h> struct ipa ;struct ipa_interrupt ;
drivers/net/ipa/ipa_main.c +1 -3
@@ -1,12 +1,10 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2023 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #include <linux/types.h> -#include <linux/atomic.h> -#include <linux/bitfield.h> #include <linux/bug.h> #include <linux/io.h> #include <linux/firmware.h>
drivers/net/ipa/ipa_mem.c +1 -3
@@ -1,12 +1,10 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2023 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ #include <linux/types.h> -#include <linux/bitfield.h> -#include <linux/bug.h> #include <linux/dma-mapping.h> #include <linux/iommu.h> #include <linux/platform_device.h>
drivers/net/ipa/ipa_qmi.c +1 -3
@@ -1,14 +1,12 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #include <linux/types.h> #include <linux/string.h> -#include <linux/slab.h> #include <linux/qrtr.h> -#include <linux/soc/qcom/qmi.h> #include "ipa.h" #include "ipa_endpoint.h"
drivers/net/ipa/ipa_reg.h +1 -4
@@ -1,14 +1,11 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2023 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #ifndef _IPA_REG_H_#define _IPA_REG_H_ -#include <linux/bitfield.h> -#include <linux/bug.h> -#include "ipa_version.h" #include "reg.h"
drivers/net/ipa/ipa_resource.c +1 -2
@@ -1,11 +1,10 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #include <linux/types.h> -#include <linux/kernel.h> #include "ipa.h" #include "ipa_data.h"
drivers/net/ipa/ipa_smp2p.c +1 -2
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2022 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ #include <linux/types.h>
@@ -10,7 +10,6 @@#include <linux/notifier.h> #include <linux/panic_notifier.h> #include <linux/pm_runtime.h> -#include <linux/soc/qcom/smem.h> #include <linux/soc/qcom/smem_state.h> #include "ipa_smp2p.h"
drivers/net/ipa/ipa_sysfs.c +1 -2
@@ -1,8 +1,7 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2021-2022 Linaro Ltd. */ +/* Copyright (C) 2021-2024 Linaro Ltd. */ -#include <linux/kernel.h> #include <linux/types.h> #include <linux/device.h> #include <linux/sysfs.h>
drivers/net/ipa/ipa_table.c +0 -3
@@ -5,10 +5,7 @@*/ #include <linux/types.h> -#include <linux/kernel.h> -#include <linux/bits.h> #include <linux/bitops.h> -#include <linux/bitfield.h> #include <linux/io.h> #include <linux/build_bug.h> #include <linux/device.h>
drivers/net/ipa/reg/ipa_reg-v5.5.c +0 -1
@@ -6,7 +6,6 @@#include <linux/bits.h> #include <linux/kernel.h> #include <linux/types.h> -#include <linux/bits.h> #include "../ipa_reg.h" #include "../ipa_version.h"
Signature · 1 line
2.40.1
PATCH 3/7 net: ipa: include "ipa_interrupt.h" where needed
In reply to Alex ElderThe IPA structure contains an ipa_interrupt structure pointer, and that structure is declared in "ipa.h". There is no need to include "ipa_interrupt.h" in that header file.
Instead, include "ipa_interrupt.h" in the three source files (in addition to "ipa_main.c") that actually use the functions that are declared there.
Similarly, three files use symbols defined in "ipa_reg.h" but do not include that file; include it.
--- drivers/net/ipa/ipa.h | 1 - drivers/net/ipa/ipa_cmd.c | 1 + drivers/net/ipa/ipa_endpoint.c | 2 ++ drivers/net/ipa/ipa_power.c | 3 ++- drivers/net/ipa/ipa_uc.c | 4 +++- 5 files changed, 8 insertions(+), 3 deletions(-)
drivers/net/ipa/ipa.h +0 -1
@@ -14,7 +14,6 @@#include "ipa_mem.h" #include "ipa_qmi.h" #include "ipa_endpoint.h" -#include "ipa_interrupt.h" struct clk ;struct icc_path ;
drivers/net/ipa/ipa_cmd.c +1 -0
@@ -14,6 +14,7 @@#include "gsi_trans.h" #include "ipa.h" #include "ipa_endpoint.h" +#include "ipa_reg.h" #include "ipa_table.h" #include "ipa_cmd.h" #include "ipa_mem.h"
drivers/net/ipa/ipa_endpoint.c +2 -0
@@ -19,9 +19,11 @@#include "ipa_cmd.h" #include "ipa_mem.h" #include "ipa_modem.h" +#include "ipa_reg.h" #include "ipa_table.h" #include "ipa_gsi.h" #include "ipa_power.h" +#include "ipa_interrupt.h" /* Hardware is told about receive buffers once a "batch" has been queued */ #define IPA_REPLENISH_BATCH 16/* Must be non-zero */
drivers/net/ipa/ipa_power.c +2 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #include <linux/clk.h>
@@ -15,6 +15,7 @@#include "ipa.h" #include "ipa_power.h" +#include "ipa_interrupt.h" #include "ipa_endpoint.h" #include "ipa_modem.h" #include "ipa_data.h"
drivers/net/ipa/ipa_uc.c +3 -1
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #include <linux/types.h>
@@ -10,8 +10,10 @@#include <linux/pm_runtime.h> #include "ipa.h" +#include "ipa_reg.h" #include "ipa_uc.h" #include "ipa_power.h" +#include "ipa_interrupt.h" /** * DOC: The IPA embedded microcontroller
Signature · 1 line
2.40.1
PATCH 4/7 net: ipa: add some needed struct declarations
In reply to Alex ElderDeclare some structure types in a few header files where functions declared therein use them:
- Functions are declared in "gsi_private.h" that use gsi, gsi_ring, and gsi_trans structure pointers.
- A gsi_trans struct pointer is passed to two functions declared in "ipa_endpoint.h"
- In "ipa_interrupt.h", a platform_device pointer is passed in the declaration for ipa_interrupt_init().
--- drivers/net/ipa/gsi_private.h | 7 ++++--- drivers/net/ipa/ipa_endpoint.h | 1 + drivers/net/ipa/ipa_interrupt.h | 2 ++ drivers/net/ipa/ipa_power.c | 1 - 4 files changed, 7 insertions(+), 4 deletions(-)
drivers/net/ipa/gsi_private.h +4 -3
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #ifndef _GSI_PRIVATE_H_#define _GSI_PRIVATE_H_
@@ -10,9 +10,10 @@#include <linux/types.h> -struct gsi_trans ; -struct gsi_ring ; +struct gsi ;struct gsi_channel ; +struct gsi_ring ; +struct gsi_trans ;#define GSI_RING_ELEMENT_SIZE 16/* bytes; must be a power of 2 */
drivers/net/ipa/ipa_endpoint.h +1 -0
@@ -15,6 +15,7 @@struct net_device ;struct sk_buff ; +struct gsi_trans ;struct ipa ;struct ipa_gsi_endpoint_data ;
drivers/net/ipa/ipa_interrupt.h +2 -0
@@ -8,6 +8,8 @@#include <linux/types.h> +struct platform_device ; +struct ipa ;struct ipa_interrupt ;enum ipa_irq_id ;
drivers/net/ipa/ipa_power.c +0 -1
@@ -9,7 +9,6 @@#include <linux/interconnect.h> #include <linux/pm.h> #include <linux/pm_runtime.h> -#include <linux/bitops.h> #include "linux/soc/qcom/qcom_aoss.h"
Signature · 1 line
2.40.1
PATCH 5/7 net: ipa: eliminate unneeded struct declarations
In reply to Alex ElderAs definitions in headers have been moved around, some of the struct and enum declarations found in header files have become no longer necessary and can be removed. Remove these unneeded declarations.
--- drivers/net/ipa/gsi.h | 2 -- drivers/net/ipa/gsi_trans.h | 3 +-- drivers/net/ipa/ipa.h | 2 -- drivers/net/ipa/ipa_cmd.h | 3 --- drivers/net/ipa/ipa_power.h | 1 - drivers/net/ipa/ipa_sysfs.h | 4 +--- drivers/net/ipa/ipa_uc.h | 3 +-- 7 files changed, 3 insertions(+), 15 deletions(-)
drivers/net/ipa/gsi.h +0 -2
@@ -21,12 +21,10 @@#define GSI_TLV_MAX 64struct device ; -struct scatterlist ;struct platform_device ;struct gsi ;struct gsi_trans ; -struct gsi_channel_data ;struct ipa_gsi_endpoint_data ;struct gsi_ring {
drivers/net/ipa/gsi_trans.h +1 -2
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2022 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ #ifndef _GSI_TRANS_H_#define _GSI_TRANS_H_
@@ -19,7 +19,6 @@ struct device;struct sk_buff ;struct gsi ; -struct gsi_trans ;struct gsi_trans_pool ;/* Maximum number of TREs in an IPA immediate command transaction */
drivers/net/ipa/ipa.h +0 -2
@@ -15,8 +15,6 @@#include "ipa_qmi.h" #include "ipa_endpoint.h" -struct clk ; -struct icc_path ;struct net_device ;struct ipa_power ;
drivers/net/ipa/ipa_cmd.h +0 -3
@@ -8,9 +8,6 @@#include <linux/types.h> -struct sk_buff ; -struct scatterlist ; -struct ipa ;struct ipa_mem ;struct gsi_trans ;
drivers/net/ipa/ipa_power.h +0 -1
@@ -12,7 +12,6 @@ struct device;struct ipa ;struct ipa_power_data ; -enum ipa_irq_id ;/* IPA device power management function block */ extern const struct dev_pm_ops ipa_pm_ops;
drivers/net/ipa/ipa_sysfs.h +1 -3
@@ -1,13 +1,11 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2022 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ #ifndef _IPA_SYSFS_H_#define _IPA_SYSFS_H_ -struct attribute_group ; -extern const struct attribute_group ipa_attribute_group;extern const struct attribute_group ipa_feature_attribute_group;extern const struct attribute_group ipa_endpoint_id_attribute_group;
drivers/net/ipa/ipa_uc.h +1 -2
@@ -1,13 +1,12 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2022 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ #ifndef _IPA_UC_H_#define _IPA_UC_H_struct ipa ; -enum ipa_irq_id ;/** * ipa_uc_interrupt_handler() - Handler for microcontroller IPA interrupts
Signature · 1 line
2.40.1
PATCH 6/7 net: ipa: more include file cleanup
In reply to Alex ElderAll of the config data files and all of the register definition files (plus a few others) use GSI_EE_AP, which is defined in "ipa_version.h". Include that header where it's needed.
All of the IPA register definition files include "../ipa.h", though none of them need anything defined there. Similarly, all of the GSI register definition files include "../gsi.h", but don't need anything defined there. Remove these unnneded includes.
All of the configuration data files include "../gsi.h", though none of them need anything defined there, so remove these includes.
Remove other includes of local header files that are not required.
--- drivers/net/ipa/data/ipa_data-v3.1.c | 2 +- drivers/net/ipa/data/ipa_data-v3.5.1.c | 2 +- drivers/net/ipa/data/ipa_data-v4.11.c | 2 +- drivers/net/ipa/data/ipa_data-v4.2.c | 2 +- drivers/net/ipa/data/ipa_data-v4.5.c | 2 +- drivers/net/ipa/data/ipa_data-v4.7.c | 2 +- drivers/net/ipa/data/ipa_data-v4.9.c | 2 +- drivers/net/ipa/data/ipa_data-v5.0.c | 2 +- drivers/net/ipa/data/ipa_data-v5.5.c | 2 +- drivers/net/ipa/ipa_endpoint.c | 1 + drivers/net/ipa/ipa_endpoint.h | 2 +- drivers/net/ipa/ipa_gsi.c | 1 + drivers/net/ipa/ipa_main.c | 2 +- drivers/net/ipa/ipa_modem.c | 3 --- drivers/net/ipa/ipa_qmi.c | 2 -- drivers/net/ipa/ipa_reg.h | 1 - drivers/net/ipa/reg/gsi_reg-v3.1.c | 4 ++-- drivers/net/ipa/reg/gsi_reg-v3.5.1.c | 4 ++-- drivers/net/ipa/reg/gsi_reg-v4.0.c | 4 ++-- drivers/net/ipa/reg/gsi_reg-v4.11.c | 4 ++-- drivers/net/ipa/reg/gsi_reg-v4.5.c | 4 ++-- drivers/net/ipa/reg/gsi_reg-v4.9.c | 4 ++-- drivers/net/ipa/reg/gsi_reg-v5.0.c | 4 ++-- drivers/net/ipa/reg/ipa_reg-v3.1.c | 2 +- drivers/net/ipa/reg/ipa_reg-v3.5.1.c | 2 +- drivers/net/ipa/reg/ipa_reg-v4.11.c | 2 +- drivers/net/ipa/reg/ipa_reg-v4.2.c | 2 +- drivers/net/ipa/reg/ipa_reg-v4.5.c | 2 +- drivers/net/ipa/reg/ipa_reg-v4.7.c | 2 +- drivers/net/ipa/reg/ipa_reg-v4.9.c | 2 +- drivers/net/ipa/reg/ipa_reg-v5.0.c | 2 +- drivers/net/ipa/reg/ipa_reg-v5.5.c | 1 - 32 files changed, 35 insertions(+), 40 deletions(-)
drivers/net/ipa/data/ipa_data-v3.1.c +1 -1
@@ -7,10 +7,10 @@#include <linux/array_size.h> #include <linux/log2.h> -#include "../gsi.h" #include "../ipa_data.h" #include "../ipa_endpoint.h" #include "../ipa_mem.h" +#include "../ipa_version.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v3.1 */ enum ipa_resource_type {
drivers/net/ipa/data/ipa_data-v3.5.1.c +1 -1
@@ -7,10 +7,10 @@#include <linux/array_size.h> #include <linux/log2.h> -#include "../gsi.h" #include "../ipa_data.h" #include "../ipa_endpoint.h" #include "../ipa_mem.h" +#include "../ipa_version.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v3.5.1 */ enum ipa_resource_type {
drivers/net/ipa/data/ipa_data-v4.11.c +1 -1
@@ -5,10 +5,10 @@#include <linux/array_size.h> #include <linux/log2.h> -#include "../gsi.h" #include "../ipa_data.h" #include "../ipa_endpoint.h" #include "../ipa_mem.h" +#include "../ipa_version.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.11 */ enum ipa_resource_type {
drivers/net/ipa/data/ipa_data-v4.2.c +1 -1
@@ -5,10 +5,10 @@#include <linux/array_size.h> #include <linux/log2.h> -#include "../gsi.h" #include "../ipa_data.h" #include "../ipa_endpoint.h" #include "../ipa_mem.h" +#include "../ipa_version.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.2 */ enum ipa_resource_type {
drivers/net/ipa/data/ipa_data-v4.5.c +1 -1
@@ -5,10 +5,10 @@#include <linux/array_size.h> #include <linux/log2.h> -#include "../gsi.h" #include "../ipa_data.h" #include "../ipa_endpoint.h" #include "../ipa_mem.h" +#include "../ipa_version.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.5 */ enum ipa_resource_type {
drivers/net/ipa/data/ipa_data-v4.7.c +1 -1
@@ -5,10 +5,10 @@#include <linux/array_size.h> #include <linux/log2.h> -#include "../gsi.h" #include "../ipa_data.h" #include "../ipa_endpoint.h" #include "../ipa_mem.h" +#include "../ipa_version.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.7 */ enum ipa_resource_type {
drivers/net/ipa/data/ipa_data-v4.9.c +1 -1
@@ -5,10 +5,10 @@#include <linux/array_size.h> #include <linux/log2.h> -#include "../gsi.h" #include "../ipa_data.h" #include "../ipa_endpoint.h" #include "../ipa_mem.h" +#include "../ipa_version.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v4.9 */ enum ipa_resource_type {
drivers/net/ipa/data/ipa_data-v5.0.c +1 -1
@@ -5,10 +5,10 @@#include <linux/array_size.h> #include <linux/log2.h> -#include "../gsi.h" #include "../ipa_data.h" #include "../ipa_endpoint.h" #include "../ipa_mem.h" +#include "../ipa_version.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v5.0 */ enum ipa_resource_type {
drivers/net/ipa/data/ipa_data-v5.5.c +1 -1
@@ -3,12 +3,12 @@/* Copyright (C) 2023-2024 Linaro Ltd. */ #include <linux/array_size.h> -#include <linux/kernel.h> #include <linux/log2.h> #include "../ipa_data.h" #include "../ipa_endpoint.h" #include "../ipa_mem.h" +#include "../ipa_version.h" /** enum ipa_resource_type - IPA resource types for an SoC having IPA v5.5 */ enum ipa_resource_type {
drivers/net/ipa/ipa_endpoint.c +1 -0
@@ -24,6 +24,7 @@#include "ipa_gsi.h" #include "ipa_power.h" #include "ipa_interrupt.h" +#include "ipa_version.h" /* Hardware is told about receive buffers once a "batch" has been queued */ #define IPA_REPLENISH_BATCH 16/* Must be non-zero */
drivers/net/ipa/ipa_endpoint.h +1 -1
@@ -9,8 +9,8 @@#include <linux/types.h> #include <linux/workqueue.h> -#include "gsi.h" #include "ipa_reg.h" +#include "ipa_version.h" struct net_device ;struct sk_buff ;
drivers/net/ipa/ipa_gsi.c +1 -0
@@ -11,6 +11,7 @@#include "ipa.h" #include "ipa_endpoint.h" #include "ipa_data.h" +#include "ipa_version.h" void ipa_gsi_trans_complete (struct gsi_trans *trans) {
drivers/net/ipa/ipa_main.c +1 -1
@@ -29,8 +29,8 @@#include "ipa_modem.h" #include "ipa_uc.h" #include "ipa_interrupt.h" -#include "gsi_trans.h" #include "ipa_sysfs.h" +#include "ipa_version.h" /** * DOC: The IP Accelerator
drivers/net/ipa/ipa_modem.c +0 -3
@@ -15,15 +15,12 @@#include <linux/remoteproc/qcom_rproc.h> #include "ipa.h" -#include "ipa_data.h" #include "ipa_endpoint.h" #include "ipa_table.h" #include "ipa_mem.h" #include "ipa_modem.h" #include "ipa_smp2p.h" -#include "ipa_qmi.h" #include "ipa_uc.h" -#include "ipa_power.h" #define IPA_NETDEV_NAME "rmnet_ipa%d"#define IPA_NETDEV_TAILROOM 0/* for padding by mux layer */
drivers/net/ipa/ipa_qmi.c +0 -2
@@ -9,9 +9,7 @@#include <linux/qrtr.h> #include "ipa.h" -#include "ipa_endpoint.h" #include "ipa_mem.h" -#include "ipa_table.h" #include "ipa_modem.h" #include "ipa_qmi_msg.h"
drivers/net/ipa/ipa_reg.h +0 -1
@@ -6,7 +6,6 @@#ifndef _IPA_REG_H_#define _IPA_REG_H_ -#include "ipa_version.h" #include "reg.h" struct platform_device ;
drivers/net/ipa/reg/gsi_reg-v3.1.c +2 -2
@@ -6,9 +6,9 @@#include <linux/bits.h> #include <linux/types.h> -#include "../gsi.h" -#include "../reg.h" #include "../gsi_reg.h" +#include "../ipa_version.h" +#include "../reg.h" REG (INTER_EE_SRC_CH_IRQ_MSK , inter_ee_src_ch_irq_msk,0x0000c020 +0x1000 *GSI_EE_AP );
drivers/net/ipa/reg/gsi_reg-v3.5.1.c +2 -2
@@ -6,9 +6,9 @@#include <linux/bits.h> #include <linux/types.h> -#include "../gsi.h" -#include "../reg.h" #include "../gsi_reg.h" +#include "../ipa_version.h" +#include "../reg.h" REG (INTER_EE_SRC_CH_IRQ_MSK , inter_ee_src_ch_irq_msk,0x0000c020 +0x1000 *GSI_EE_AP );
drivers/net/ipa/reg/gsi_reg-v4.0.c +2 -2
@@ -6,9 +6,9 @@#include <linux/bits.h> #include <linux/types.h> -#include "../gsi.h" -#include "../reg.h" #include "../gsi_reg.h" +#include "../ipa_version.h" +#include "../reg.h" REG (INTER_EE_SRC_CH_IRQ_MSK , inter_ee_src_ch_irq_msk,0x0000c020 +0x1000 *GSI_EE_AP );
drivers/net/ipa/reg/gsi_reg-v4.11.c +2 -2
@@ -6,9 +6,9 @@#include <linux/bits.h> #include <linux/types.h> -#include "../gsi.h" -#include "../reg.h" #include "../gsi_reg.h" +#include "../ipa_version.h" +#include "../reg.h" REG (INTER_EE_SRC_CH_IRQ_MSK , inter_ee_src_ch_irq_msk,0x0000c020 +0x1000 *GSI_EE_AP );
drivers/net/ipa/reg/gsi_reg-v4.5.c +2 -2
@@ -6,9 +6,9 @@#include <linux/bits.h> #include <linux/types.h> -#include "../gsi.h" -#include "../reg.h" #include "../gsi_reg.h" +#include "../ipa_version.h" +#include "../reg.h" REG (INTER_EE_SRC_CH_IRQ_MSK , inter_ee_src_ch_irq_msk,0x0000c020 +0x1000 *GSI_EE_AP );
drivers/net/ipa/reg/gsi_reg-v4.9.c +2 -2
@@ -6,9 +6,9 @@#include <linux/bits.h> #include <linux/types.h> -#include "../gsi.h" -#include "../reg.h" #include "../gsi_reg.h" +#include "../ipa_version.h" +#include "../reg.h" REG (INTER_EE_SRC_CH_IRQ_MSK , inter_ee_src_ch_irq_msk,0x0000c020 +0x1000 *GSI_EE_AP );
drivers/net/ipa/reg/gsi_reg-v5.0.c +2 -2
@@ -6,9 +6,9 @@#include <linux/bits.h> #include <linux/types.h> -#include "../gsi.h" -#include "../reg.h" #include "../gsi_reg.h" +#include "../ipa_version.h" +#include "../reg.h" REG (INTER_EE_SRC_CH_IRQ_MSK , inter_ee_src_ch_irq_msk,0x0000c01c +0x1000 *GSI_EE_AP );
drivers/net/ipa/reg/ipa_reg-v3.1.c +1 -1
@@ -6,8 +6,8 @@#include <linux/bits.h> #include <linux/types.h> -#include "../ipa.h" #include "../ipa_reg.h" +#include "../ipa_version.h" static const u32 reg_comp_cfg_fmask[] = { [COMP_CFG_ENABLE ] =BIT (0 ),
drivers/net/ipa/reg/ipa_reg-v3.5.1.c +1 -1
@@ -6,8 +6,8 @@#include <linux/bits.h> #include <linux/types.h> -#include "../ipa.h" #include "../ipa_reg.h" +#include "../ipa_version.h" static const u32 reg_comp_cfg_fmask[] = { [COMP_CFG_ENABLE ] =BIT (0 ),
drivers/net/ipa/reg/ipa_reg-v4.11.c +1 -1
@@ -6,8 +6,8 @@#include <linux/bits.h> #include <linux/types.h> -#include "../ipa.h" #include "../ipa_reg.h" +#include "../ipa_version.h" static const u32 reg_comp_cfg_fmask[] = { [RAM_ARB_PRI_CLIENT_SAMP_FIX_DIS ] =BIT (0 ),
drivers/net/ipa/reg/ipa_reg-v4.2.c +1 -1
@@ -6,8 +6,8 @@#include <linux/bits.h> #include <linux/types.h> -#include "../ipa.h" #include "../ipa_reg.h" +#include "../ipa_version.h" static const u32 reg_comp_cfg_fmask[] = {/* Bit 0 reserved */
drivers/net/ipa/reg/ipa_reg-v4.5.c +1 -1
@@ -6,8 +6,8 @@#include <linux/bits.h> #include <linux/types.h> -#include "../ipa.h" #include "../ipa_reg.h" +#include "../ipa_version.h" static const u32 reg_comp_cfg_fmask[] = {/* Bit 0 reserved */
drivers/net/ipa/reg/ipa_reg-v4.7.c +1 -1
@@ -6,8 +6,8 @@#include <linux/bits.h> #include <linux/types.h> -#include "../ipa.h" #include "../ipa_reg.h" +#include "../ipa_version.h" static const u32 reg_comp_cfg_fmask[] = { [RAM_ARB_PRI_CLIENT_SAMP_FIX_DIS ] =BIT (0 ),
drivers/net/ipa/reg/ipa_reg-v4.9.c +1 -1
@@ -6,8 +6,8 @@#include <linux/bits.h> #include <linux/types.h> -#include "../ipa.h" #include "../ipa_reg.h" +#include "../ipa_version.h" static const u32 reg_comp_cfg_fmask[] = { [RAM_ARB_PRI_CLIENT_SAMP_FIX_DIS ] =BIT (0 ),
drivers/net/ipa/reg/ipa_reg-v5.0.c +1 -1
@@ -6,8 +6,8 @@#include <linux/bits.h> #include <linux/types.h> -#include "../ipa.h" #include "../ipa_reg.h" +#include "../ipa_version.h" static const u32 reg_flavor_0_fmask[] = { [MAX_PIPES ] =GENMASK (7 ,0 ),
drivers/net/ipa/reg/ipa_reg-v5.5.c +0 -1
@@ -4,7 +4,6 @@#include <linux/array_size.h> #include <linux/bits.h> -#include <linux/kernel.h> #include <linux/types.h> #include "../ipa_reg.h"
Signature · 1 line
2.40.1
PATCH 7/7 net: ipa: sort all includes
In reply to Alex ElderEstablish the rule that header files are always included in sorted (POSIX local) order. Standard and private headers are separated by a blank line.
Similarly, sort all forward-declarations for structures.
--- drivers/net/ipa/gsi.c | 14 +++++++------- drivers/net/ipa/gsi.h | 4 ++-- drivers/net/ipa/gsi_reg.c | 6 +++--- drivers/net/ipa/gsi_trans.c | 12 ++++++------ drivers/net/ipa/gsi_trans.h | 6 +++--- drivers/net/ipa/ipa.h | 8 ++++---- drivers/net/ipa/ipa_cmd.c | 8 ++++---- drivers/net/ipa/ipa_cmd.h | 4 ++-- drivers/net/ipa/ipa_data.h | 4 ++-- drivers/net/ipa/ipa_endpoint.c | 14 +++++++------- drivers/net/ipa/ipa_gsi.c | 6 +++--- drivers/net/ipa/ipa_interrupt.c | 10 +++++----- drivers/net/ipa/ipa_interrupt.h | 1 + drivers/net/ipa/ipa_main.c | 21 +++++++++++---------- drivers/net/ipa/ipa_mem.c | 11 ++++++----- drivers/net/ipa/ipa_modem.c | 11 ++++++----- drivers/net/ipa/ipa_modem.h | 5 +++-- drivers/net/ipa/ipa_power.c | 6 +++--- drivers/net/ipa/ipa_qmi.c | 4 ++-- drivers/net/ipa/ipa_qmi.h | 1 + drivers/net/ipa/ipa_qmi_msg.c | 3 ++- drivers/net/ipa/ipa_qmi_msg.h | 3 ++- drivers/net/ipa/ipa_reg.c | 4 ++-- drivers/net/ipa/ipa_smp2p.c | 7 ++++--- drivers/net/ipa/ipa_sysfs.c | 4 ++-- drivers/net/ipa/ipa_table.c | 16 ++++++++-------- drivers/net/ipa/ipa_uc.c | 8 ++++---- drivers/net/ipa/reg.h | 4 ++-- 28 files changed, 107 insertions(+), 98 deletions(-)
drivers/net/ipa/gsi.c +7 -7
@@ -4,23 +4,23 @@* Copyright (C) 2018-2024 Linaro Ltd. */ -#include <linux/types.h> #include <linux/bits.h> -#include <linux/mutex.h> -#include <linux/completion.h> #include <linux/bug.h> +#include <linux/completion.h> #include <linux/interrupt.h> -#include <linux/platform_device.h> +#include <linux/mutex.h> #include <linux/netdevice.h> +#include <linux/platform_device.h> +#include <linux/types.h> #include "gsi.h" -#include "reg.h" -#include "gsi_reg.h" #include "gsi_private.h" +#include "gsi_reg.h" #include "gsi_trans.h" -#include "ipa_gsi.h" #include "ipa_data.h" +#include "ipa_gsi.h" #include "ipa_version.h" +#include "reg.h" /** * DOC: The IPA Generic Software Interface
drivers/net/ipa/gsi.h +2 -2
@@ -6,10 +6,10 @@#ifndef _GSI_H_#define _GSI_H_ -#include <linux/types.h> -#include <linux/mutex.h> #include <linux/completion.h> +#include <linux/mutex.h> #include <linux/netdevice.h> +#include <linux/types.h> #include "ipa_version.h"
drivers/net/ipa/gsi_reg.c +3 -3
@@ -1,13 +1,13 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright (C) 2023 Linaro Ltd. */ +/* Copyright (C) 2023-2024 Linaro Ltd. */ -#include <linux/platform_device.h> #include <linux/io.h> +#include <linux/platform_device.h> #include "gsi.h" -#include "reg.h" #include "gsi_reg.h" +#include "reg.h" /* Is this register ID valid for the current GSI version? */ static bool gsi_reg_id_valid (struct gsi *gsi,enum gsi_reg_id reg_id)
drivers/net/ipa/gsi_trans.c +6 -6
@@ -1,22 +1,22 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2022 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ -#include <linux/types.h> -#include <linux/bits.h> #include <linux/bitfield.h> +#include <linux/bits.h> +#include <linux/dma-direction.h> #include <linux/refcount.h> #include <linux/scatterlist.h> -#include <linux/dma-direction.h> +#include <linux/types.h> #include "gsi.h" #include "gsi_private.h" #include "gsi_trans.h" -#include "ipa_gsi.h" -#include "ipa_data.h" #include "ipa_cmd.h" +#include "ipa_data.h" +#include "ipa_gsi.h" /** * DOC: GSI Transactions
drivers/net/ipa/gsi_trans.h +3 -3
@@ -6,16 +6,16 @@#ifndef _GSI_TRANS_H_#define _GSI_TRANS_H_ -#include <linux/types.h> -#include <linux/refcount.h> #include <linux/completion.h> #include <linux/dma-direction.h> +#include <linux/refcount.h> +#include <linux/types.h> #include "ipa_cmd.h" +struct device ;struct page ;struct scatterlist ; -struct device ;struct sk_buff ;struct gsi ;
drivers/net/ipa/ipa.h +4 -4
@@ -6,20 +6,20 @@#ifndef _IPA_H_#define _IPA_H_ -#include <linux/types.h> #include <linux/notifier.h> +#include <linux/types.h> -#include "ipa_version.h" #include "gsi.h" +#include "ipa_endpoint.h" #include "ipa_mem.h" #include "ipa_qmi.h" -#include "ipa_endpoint.h" +#include "ipa_version.h" struct net_device ; +struct ipa_interrupt ;struct ipa_power ;struct ipa_smp2p ; -struct ipa_interrupt ;/** * struct ipa - IPA information
drivers/net/ipa/ipa_cmd.c +4 -4
@@ -4,20 +4,20 @@* Copyright (C) 2019-2024 Linaro Ltd. */ +#include <linux/bitfield.h> #include <linux/bits.h> -#include <linux/types.h> #include <linux/device.h> -#include <linux/bitfield.h> #include <linux/dma-direction.h> +#include <linux/types.h> #include "gsi.h" #include "gsi_trans.h" #include "ipa.h" +#include "ipa_cmd.h" #include "ipa_endpoint.h" +#include "ipa_mem.h" #include "ipa_reg.h" #include "ipa_table.h" -#include "ipa_cmd.h" -#include "ipa_mem.h" /** * DOC: IPA Immediate Commands
drivers/net/ipa/ipa_cmd.h +2 -2
@@ -8,10 +8,10 @@#include <linux/types.h> +struct gsi_channel ; +struct gsi_trans ;struct ipa ;struct ipa_mem ; -struct gsi_trans ; -struct gsi_channel ;/** * enum ipa_cmd_opcode: IPA immediate commands
drivers/net/ipa/ipa_data.h +2 -2
@@ -1,16 +1,16 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2023 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ #ifndef _IPA_DATA_H_#define _IPA_DATA_H_#include <linux/types.h> -#include "ipa_version.h" #include "ipa_endpoint.h" #include "ipa_mem.h" +#include "ipa_version.h" /** * DOC: IPA/GSI Configuration Data
drivers/net/ipa/ipa_endpoint.c +7 -7
@@ -4,26 +4,26 @@* Copyright (C) 2019-2024 Linaro Ltd. */ +#include <linux/bitfield.h> #include <linux/bits.h> -#include <linux/types.h> #include <linux/device.h> -#include <linux/bitfield.h> -#include <linux/if_rmnet.h> #include <linux/dma-direction.h> +#include <linux/if_rmnet.h> +#include <linux/types.h> #include "gsi.h" #include "gsi_trans.h" #include "ipa.h" +#include "ipa_cmd.h" #include "ipa_data.h" #include "ipa_endpoint.h" -#include "ipa_cmd.h" +#include "ipa_gsi.h" +#include "ipa_interrupt.h" #include "ipa_mem.h" #include "ipa_modem.h" +#include "ipa_power.h" #include "ipa_reg.h" #include "ipa_table.h" -#include "ipa_gsi.h" -#include "ipa_power.h" -#include "ipa_interrupt.h" #include "ipa_version.h" /* Hardware is told about receive buffers once a "batch" has been queued */
drivers/net/ipa/ipa_gsi.c +3 -3
@@ -1,16 +1,16 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2020 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ #include <linux/types.h> -#include "ipa_gsi.h" #include "gsi_trans.h" #include "ipa.h" -#include "ipa_endpoint.h" #include "ipa_data.h" +#include "ipa_endpoint.h" +#include "ipa_gsi.h" #include "ipa_version.h" void ipa_gsi_trans_complete (struct gsi_trans *trans)
drivers/net/ipa/ipa_interrupt.c +5 -5
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ /* DOC: IPA Interrupts
@@ -19,18 +19,18 @@* time only these three are supported. */ -#include <linux/platform_device.h> -#include <linux/types.h> #include <linux/interrupt.h> +#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/pm_wakeirq.h> +#include <linux/types.h> #include "ipa.h" -#include "ipa_reg.h" #include "ipa_endpoint.h" +#include "ipa_interrupt.h" #include "ipa_power.h" +#include "ipa_reg.h" #include "ipa_uc.h" -#include "ipa_interrupt.h" /** * struct ipa_interrupt - IPA interrupt information
drivers/net/ipa/ipa_interrupt.h +1 -0
@@ -12,6 +12,7 @@ struct platform_device;struct ipa ;struct ipa_interrupt ; +enum ipa_irq_id ;/**
drivers/net/ipa/ipa_main.c +11 -10
@@ -4,32 +4,33 @@* Copyright (C) 2018-2024 Linaro Ltd. */ -#include <linux/types.h> #include <linux/bug.h> -#include <linux/io.h> #include <linux/firmware.h> +#include <linux/io.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <linux/types.h> +#include <linux/firmware/qcom/qcom_scm.h> #include <linux/soc/qcom/mdt_loader.h> #include "ipa.h" -#include "ipa_power.h" +#include "ipa_cmd.h" #include "ipa_data.h" #include "ipa_endpoint.h" -#include "ipa_resource.h" -#include "ipa_cmd.h" -#include "ipa_reg.h" +#include "ipa_interrupt.h" #include "ipa_mem.h" -#include "ipa_table.h" -#include "ipa_smp2p.h" #include "ipa_modem.h" -#include "ipa_uc.h" -#include "ipa_interrupt.h" +#include "ipa_power.h" +#include "ipa_reg.h" +#include "ipa_resource.h" +#include "ipa_smp2p.h" #include "ipa_sysfs.h" +#include "ipa_table.h" +#include "ipa_uc.h" #include "ipa_version.h" /**
drivers/net/ipa/ipa_mem.c +6 -5
@@ -4,20 +4,21 @@* Copyright (C) 2019-2024 Linaro Ltd. */ -#include <linux/types.h> #include <linux/dma-mapping.h> +#include <linux/io.h> #include <linux/iommu.h> #include <linux/platform_device.h> -#include <linux/io.h> +#include <linux/types.h> +#include <linux/soc/qcom/smem.h> +#include "gsi_trans.h" #include "ipa.h" -#include "ipa_reg.h" -#include "ipa_data.h" #include "ipa_cmd.h" +#include "ipa_data.h" #include "ipa_mem.h" +#include "ipa_reg.h" #include "ipa_table.h" -#include "gsi_trans.h" /* "Canary" value placed between memory regions to detect overflow */ #define IPA_MEM_CANARY_VAL cpu_to_le32(0xdeadbeef)
drivers/net/ipa/ipa_modem.c +6 -5
@@ -1,25 +1,26 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #include <linux/errno.h> +#include <linux/etherdevice.h> #include <linux/if_arp.h> +#include <linux/if_rmnet.h> #include <linux/netdevice.h> +#include <linux/pm_runtime.h> #include <linux/skbuff.h> -#include <linux/if_rmnet.h> -#include <linux/etherdevice.h> #include <net/pkt_sched.h> -#include <linux/pm_runtime.h> +#include <linux/remoteproc/qcom_rproc.h> #include "ipa.h" #include "ipa_endpoint.h" -#include "ipa_table.h" #include "ipa_mem.h" #include "ipa_modem.h" #include "ipa_smp2p.h" +#include "ipa_table.h" #include "ipa_uc.h" #define IPA_NETDEV_NAME "rmnet_ipa%d"
drivers/net/ipa/ipa_modem.h +3 -2
@@ -1,15 +1,16 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #ifndef _IPA_MODEM_H_#define _IPA_MODEM_H_ -struct ipa ;struct net_device ;struct sk_buff ; +struct ipa ; +int ipa_modem_start (struct ipa *ipa);int ipa_modem_stop (struct ipa *ipa);
drivers/net/ipa/ipa_power.c +3 -3
@@ -13,11 +13,11 @@#include "linux/soc/qcom/qcom_aoss.h" #include "ipa.h" -#include "ipa_power.h" -#include "ipa_interrupt.h" +#include "ipa_data.h" #include "ipa_endpoint.h" +#include "ipa_interrupt.h" #include "ipa_modem.h" -#include "ipa_data.h" +#include "ipa_power.h" /** * DOC: IPA Power Management
drivers/net/ipa/ipa_qmi.c +2 -2
@@ -4,9 +4,9 @@* Copyright (C) 2018-2024 Linaro Ltd. */ -#include <linux/types.h> -#include <linux/string.h> #include <linux/qrtr.h> +#include <linux/string.h> +#include <linux/types.h> #include "ipa.h" #include "ipa_mem.h"
drivers/net/ipa/ipa_qmi.h +1 -0
@@ -8,6 +8,7 @@#include <linux/types.h> #include <linux/workqueue.h> +#include <linux/soc/qcom/qmi.h> struct ipa ;
drivers/net/ipa/ipa_qmi_msg.c +2 -1
@@ -1,9 +1,10 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #include <linux/stddef.h> +#include <linux/soc/qcom/qmi.h> #include "ipa_qmi_msg.h"
drivers/net/ipa/ipa_qmi_msg.h +2 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright (c) 2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2018-2022 Linaro Ltd. +* Copyright (C) 2018-2024 Linaro Ltd. */ #ifndef _IPA_QMI_MSG_H_#define _IPA_QMI_MSG_H_
@@ -9,6 +9,7 @@/* === Only "ipa_qmi" and "ipa_qmi_msg.c" should include this file === */ #include <linux/types.h> +#include <linux/soc/qcom/qmi.h> /* Request/response/indication QMI message ids used for IPA. Receiving
drivers/net/ipa/ipa_reg.c +2 -2
@@ -1,11 +1,11 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. -* Copyright (C) 2019-2023 Linaro Ltd. +* Copyright (C) 2019-2024 Linaro Ltd. */ -#include <linux/platform_device.h> #include <linux/io.h> +#include <linux/platform_device.h> #include "ipa.h" #include "ipa_reg.h"
drivers/net/ipa/ipa_smp2p.c +4 -3
@@ -4,16 +4,17 @@* Copyright (C) 2019-2024 Linaro Ltd. */ -#include <linux/types.h> -#include <linux/platform_device.h> #include <linux/interrupt.h> #include <linux/notifier.h> #include <linux/panic_notifier.h> +#include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <linux/types.h> +#include <linux/soc/qcom/smem_state.h> -#include "ipa_smp2p.h" #include "ipa.h" +#include "ipa_smp2p.h" #include "ipa_uc.h" /**
drivers/net/ipa/ipa_sysfs.c +2 -2
@@ -2,13 +2,13 @@/* Copyright (C) 2021-2024 Linaro Ltd. */ -#include <linux/types.h> #include <linux/device.h> #include <linux/sysfs.h> +#include <linux/types.h> #include "ipa.h" -#include "ipa_version.h" #include "ipa_sysfs.h" +#include "ipa_version.h" static const char *ipa_version_string (struct ipa *ipa) {
drivers/net/ipa/ipa_table.c +8 -8
@@ -4,22 +4,22 @@* Copyright (C) 2018-2023 Linaro Ltd. */ -#include <linux/types.h> #include <linux/bitops.h> -#include <linux/io.h> #include <linux/build_bug.h> #include <linux/device.h> #include <linux/dma-mapping.h> +#include <linux/io.h> +#include <linux/types.h> +#include "gsi.h" +#include "gsi_trans.h" #include "ipa.h" -#include "ipa_version.h" +#include "ipa_cmd.h" #include "ipa_endpoint.h" -#include "ipa_table.h" -#include "ipa_reg.h" #include "ipa_mem.h" -#include "ipa_cmd.h" -#include "gsi.h" -#include "gsi_trans.h" +#include "ipa_reg.h" +#include "ipa_table.h" +#include "ipa_version.h" /** * DOC: IPA Filter and Route Tables
drivers/net/ipa/ipa_uc.c +4 -4
@@ -4,16 +4,16 @@* Copyright (C) 2018-2024 Linaro Ltd. */ -#include <linux/types.h> -#include <linux/io.h> #include <linux/delay.h> +#include <linux/io.h> #include <linux/pm_runtime.h> +#include <linux/types.h> #include "ipa.h" +#include "ipa_interrupt.h" +#include "ipa_power.h" #include "ipa_reg.h" #include "ipa_uc.h" -#include "ipa_power.h" -#include "ipa_interrupt.h" /** * DOC: The IPA embedded microcontroller
drivers/net/ipa/reg.h +2 -2
@@ -7,9 +7,9 @@#include <linux/array_size.h> #include <linux/bits.h> -#include <linux/types.h> -#include <linux/log2.h> #include <linux/bug.h> +#include <linux/log2.h> +#include <linux/types.h> /** * struct reg - A register descriptor
Signature · 1 line
2.40.1
This series was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Quoted 10 lines · On Tue, 16 Apr 2024 18:10:11 -0500 you wrote:
The end result of this series is that the list of files included in every IPA source file will be maintained in sorted order. This imposes some consistency that was previously not possible.
If an IPA header file requires a symbol or type declared in another header, that other header must be included. E.g., if bool or u32 type is used in a function declaration in an IPA header file, the IPA header must include <
linux/types.h>.[...]
Here is the summary with links:
- [net-next,1/7] net: ipa: include some standard header files
https://git.kernel.org/netdev/net-next/c/ff39eefde76a - [net-next,2/7] net: ipa: remove unneeded standard includes https://git.kernel.org/netdev/net-next/c/8c044024e608 - [net-next,3/7] net: ipa: include "ipa_interrupt.h" where needed https://git.kernel.org/netdev/net-next/c/a53c85f35258 - [net-next,4/7] net: ipa: add some needed struct declarations https://git.kernel.org/netdev/net-next/c/81186959917a - [net-next,5/7] net: ipa: eliminate unneeded struct declarations https://git.kernel.org/netdev/net-next/c/116061962d88 - [net-next,6/7] net: ipa: more include file cleanup https://git.kernel.org/netdev/net-next/c/f60e5fb6dfaf - [net-next,7/7] net: ipa: sort all includes https://git.kernel.org/netdev/net-next/c/884122775e67
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html