|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [XEN PATCH] device_tree: address violations of MISRA C:2012 Rules 8.2 and 8.3
On Fri, 21 Jul 2023, Federico Serafini wrote:
> Give a name to unnamed parameters thus addressing violations of
> MISRA C:2012 Rule 8.2 ("Function types shall be in prototype form with
> named parameters").
> Keep consistency between parameter names and types used in function
> declarations and the ones used in the corresponding function
> definitions, thus addressing violations of MISRA C:2012 Rule 8.3
> ("All declarations of an object or function shall use the same names
> and type qualifiers").
>
> No functional changes.
>
> Signed-off-by: Federico Serafini <federico.serafini@xxxxxxxxxxx>
> ---
> xen/common/device_tree.c | 24 ++++++++++++------------
> xen/include/xen/device_tree.h | 16 ++++++++--------
> 2 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
> index 0677193ab3..319f98f8c2 100644
> --- a/xen/common/device_tree.c
> +++ b/xen/common/device_tree.c
> @@ -85,11 +85,11 @@ struct dt_bus
> unsigned int (*get_flags)(const __be32 *addr);
> };
>
> -void dt_get_range(const __be32 **cell, const struct dt_device_node *np,
> +void dt_get_range(const __be32 **cellp, const struct dt_device_node *np,
> u64 *address, u64 *size)
> {
> - *address = dt_next_cell(dt_n_addr_cells(np), cell);
> - *size = dt_next_cell(dt_n_size_cells(np), cell);
> + *address = dt_next_cell(dt_n_addr_cells(np), cellp);
> + *size = dt_next_cell(dt_n_size_cells(np), cellp);
> }
>
> void dt_set_cell(__be32 **cellp, int size, u64 val)
> @@ -993,9 +993,9 @@ int dt_device_get_paddr(const struct dt_device_node *dev,
> unsigned int index,
> }
>
> int dt_for_each_range(const struct dt_device_node *dev,
> - int (*cb)(const struct dt_device_node *,
> + int (*cb)(const struct dt_device_node *dev,
> uint64_t addr, uint64_t length,
> - void *),
> + void *data),
> void *data)
> {
> const struct dt_device_node *parent = NULL;
> @@ -1164,7 +1164,7 @@ unsigned int dt_number_of_irq(const struct
> dt_device_node *device)
> return (intlen / intsize);
> }
>
> -unsigned int dt_number_of_address(const struct dt_device_node *dev)
> +unsigned int dt_number_of_address(const struct dt_device_node *device)
> {
> const __be32 *prop;
> u32 psize;
> @@ -1173,20 +1173,20 @@ unsigned int dt_number_of_address(const struct
> dt_device_node *dev)
> int onesize, na, ns;
>
> /* Get parent & match bus type */
> - parent = dt_get_parent(dev);
> + parent = dt_get_parent(device);
> if ( parent == NULL )
> return 0;
>
> bus = dt_match_bus(parent);
> if ( !bus )
> return 0;
> - bus->count_cells(dev, &na, &ns);
> + bus->count_cells(device, &na, &ns);
>
> if ( !DT_CHECK_COUNTS(na, ns) )
> return 0;
>
> /* Get "reg" or "assigned-addresses" property */
> - prop = dt_get_property(dev, bus->addresses, &psize);
> + prop = dt_get_property(device, bus->addresses, &psize);
> if ( prop == NULL )
> return 0;
>
> @@ -1197,9 +1197,9 @@ unsigned int dt_number_of_address(const struct
> dt_device_node *dev)
> }
>
> int dt_for_each_irq_map(const struct dt_device_node *dev,
> - int (*cb)(const struct dt_device_node *,
> - const struct dt_irq *,
> - void *),
> + int (*cb)(const struct dt_device_node *dev,
> + const struct dt_irq *dt_irq,
> + void *data_cb),
This should be void *data if it needs to match
xen/include/xen/device_tree.h
> void *data)
> {
> const struct dt_device_node *ipar, *tnode, *old = NULL;
> diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h
> index c2eada7489..e5d4fbc327 100644
> --- a/xen/include/xen/device_tree.h
> +++ b/xen/include/xen/device_tree.h
> @@ -538,7 +538,7 @@ bool_t dt_machine_is_compatible(const char *compat);
> * Returns a node pointer with refcount incremented, use
> * of_node_put() on it when done.
> */
> -struct dt_device_node *dt_find_node_by_name(struct dt_device_node *node,
> +struct dt_device_node *dt_find_node_by_name(struct dt_device_node *from,
> const char *name);
>
> /**
> @@ -639,7 +639,7 @@ unsigned int dt_number_of_address(const struct
> dt_device_node *device);
> * device-tree node. It's the high level pendant to dt_device_get_raw_irq().
> */
> int dt_device_get_irq(const struct dt_device_node *device, unsigned int
> index,
> - struct dt_irq *irq);
> + struct dt_irq *out_irq);
>
> /**
> * dt_device_get_raw_irq - Resolve an interrupt for a device without
> translation
> @@ -652,7 +652,7 @@ int dt_device_get_irq(const struct dt_device_node
> *device, unsigned int index,
> */
> int dt_device_get_raw_irq(const struct dt_device_node *device,
> unsigned int index,
> - struct dt_raw_irq *irq);
> + struct dt_raw_irq *out_irq);
>
> /**
> * dt_irq_translate - Translate an irq
> @@ -668,9 +668,9 @@ int dt_irq_translate(const struct dt_raw_irq *raw, struct
> dt_irq *out_irq);
> * @data: Caller data passed to callback
> */
> int dt_for_each_irq_map(const struct dt_device_node *dev,
> - int (*cb)(const struct dt_device_node *,
> - const struct dt_irq *,
> - void *),
> + int (*cb)(const struct dt_device_node *dev,
> + const struct dt_irq *irq,
This should be dt_irq for consistency
> + void *data),
> void *data);
>
> /**
> @@ -680,9 +680,9 @@ int dt_for_each_irq_map(const struct dt_device_node *dev,
> * @data: Caller data passed to callback
> */
> int dt_for_each_range(const struct dt_device_node *dev,
> - int (*cb)(const struct dt_device_node *,
> + int (*cb)(const struct dt_device_node *dev,
> uint64_t addr, uint64_t length,
> - void *),
> + void *data),
> void *data);
>
> /**
> --
> 2.34.1
>
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |