From: Hans de Goede <hdegoede@redhat.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-staging@lists.linux.dev
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: Re: [PATCH v1 1/1] media: atomisp: Remove unsused macros
Date: Wed, 10 Apr 2024 12:40:54 +0200 [thread overview]
Message-ID: <39268d69-7a40-4891-847a-af167faa8581@redhat.com> (raw)
In-Reply-To: <20240326190903.1422069-1-andriy.shevchenko@linux.intel.com>
Hi,
On 3/26/24 8:09 PM, Andy Shevchenko wrote:
> Entire defs.h can be killed, so do that.
> Also kill same macro definitions in hive_types.h
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Thank you for your patch.
I have merged this in my media-atomisp branch:
https://git.kernel.org/pub/scm/linux/kernel/git/hansg/linux.git/log/?h=media-atomisp
And this patch will be included in my next
pull-request to Mauro (to media subsystem maintainer)
Regards,
Hans
> ---
> drivers/staging/media/atomisp/pci/bits.h | 4 +-
> drivers/staging/media/atomisp/pci/defs.h | 37 -------------------
> .../pci/hive_isp_css_common/host/dma_local.h | 1 -
> .../staging/media/atomisp/pci/hive_types.h | 19 ----------
> .../pci/runtime/debug/src/ia_css_debug.c | 3 +-
> 5 files changed, 4 insertions(+), 60 deletions(-)
> delete mode 100644 drivers/staging/media/atomisp/pci/defs.h
>
> diff --git a/drivers/staging/media/atomisp/pci/bits.h b/drivers/staging/media/atomisp/pci/bits.h
> index 9fab02ebddc5..f7a66287d763 100644
> --- a/drivers/staging/media/atomisp/pci/bits.h
> +++ b/drivers/staging/media/atomisp/pci/bits.h
> @@ -16,9 +16,9 @@
> #ifndef _HRT_BITS_H
> #define _HRT_BITS_H
>
> -#include "defs.h"
> +#include <linux/args.h>
>
> -#define _hrt_ones(n) HRTCAT(_hrt_ones_, n)
> +#define _hrt_ones(n) CONCATENATE(_hrt_ones_, n)
> #define _hrt_ones_0x0 0x00000000U
> #define _hrt_ones_0x1 0x00000001U
> #define _hrt_ones_0x2 0x00000003U
> diff --git a/drivers/staging/media/atomisp/pci/defs.h b/drivers/staging/media/atomisp/pci/defs.h
> deleted file mode 100644
> index 785e7a670a00..000000000000
> --- a/drivers/staging/media/atomisp/pci/defs.h
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -/*
> - * Support for Intel Camera Imaging ISP subsystem.
> - * Copyright (c) 2015, Intel Corporation.
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms and conditions of the GNU General Public License,
> - * version 2, as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> - * more details.
> - */
> -
> -#ifndef _HRT_DEFS_H_
> -#define _HRT_DEFS_H_
> -
> -#ifndef HRTCAT
> -#define _HRTCAT(m, n) m##n
> -#define HRTCAT(m, n) _HRTCAT(m, n)
> -#endif
> -
> -#ifndef HRTSTR
> -#define _HRTSTR(x) #x
> -#define HRTSTR(x) _HRTSTR(x)
> -#endif
> -
> -#ifndef HRTMIN
> -#define HRTMIN(a, b) (((a) < (b)) ? (a) : (b))
> -#endif
> -
> -#ifndef HRTMAX
> -#define HRTMAX(a, b) (((a) > (b)) ? (a) : (b))
> -#endif
> -
> -#endif /* _HRT_DEFS_H_ */
> diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma_local.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma_local.h
> index 48a1ace79897..1a71dbebbbe2 100644
> --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma_local.h
> +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma_local.h
> @@ -19,7 +19,6 @@
> #include <type_support.h>
> #include "dma_global.h"
>
> -#include <defs.h> /* HRTCAT() */
> #include <bits.h> /* _hrt_get_bits() */
> #include <hive_isp_css_defs.h> /* HIVE_DMA_NUM_CHANNELS */
> #include <dma_v2_defs.h>
> diff --git a/drivers/staging/media/atomisp/pci/hive_types.h b/drivers/staging/media/atomisp/pci/hive_types.h
> index 55d36931f079..34f462c0c9f9 100644
> --- a/drivers/staging/media/atomisp/pci/hive_types.h
> +++ b/drivers/staging/media/atomisp/pci/hive_types.h
> @@ -17,25 +17,6 @@
> #define _HRT_HIVE_TYPES_H
>
> #include "version.h"
> -#include "defs.h"
> -
> -#ifndef HRTCAT3
> -#define _HRTCAT3(m, n, o) m##n##o
> -#define HRTCAT3(m, n, o) _HRTCAT3(m, n, o)
> -#endif
> -
> -#ifndef HRTCAT4
> -#define _HRTCAT4(m, n, o, p) m##n##o##p
> -#define HRTCAT4(m, n, o, p) _HRTCAT4(m, n, o, p)
> -#endif
> -
> -#ifndef HRTMIN
> -#define HRTMIN(a, b) (((a) < (b)) ? (a) : (b))
> -#endif
> -
> -#ifndef HRTMAX
> -#define HRTMAX(a, b) (((a) > (b)) ? (a) : (b))
> -#endif
>
> /* boolean data type */
> typedef unsigned int hive_bool;
> diff --git a/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c b/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
> index 3e92794555ec..3807b31bb98f 100644
> --- a/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
> +++ b/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
> @@ -31,6 +31,7 @@
> #define __INLINE_STREAM2MMIO__
> #endif
>
> +#include <linux/args.h>
> #include <linux/string.h> /* for strscpy() */
>
> #include "ia_css_debug.h"
> @@ -861,7 +862,7 @@ void ia_css_debug_wake_up_sp(void)
> }
>
> #define FIND_DMEM_PARAMS_TYPE(stream, kernel, type) \
> - (struct HRTCAT(HRTCAT(sh_css_isp_, type), _params) *) \
> + (struct CONCATENATE(CONCATENATE(sh_css_isp_, type), _params) *) \
> findf_dmem_params(stream, offsetof(struct ia_css_memory_offsets, dmem.kernel))
>
> #define FIND_DMEM_PARAMS(stream, kernel) FIND_DMEM_PARAMS_TYPE(stream, kernel, kernel)
prev parent reply other threads:[~2024-04-10 10:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-26 19:09 [PATCH v1 1/1] media: atomisp: Remove unsused macros Andy Shevchenko
2024-04-10 10:40 ` Hans de Goede [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=39268d69-7a40-4891-847a-af167faa8581@redhat.com \
--to=hdegoede@redhat.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).