Commit 5b43a667 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: Remove unsused macros 

Entire defs.h can be killed, so do that.
Also kill same macro definitions in hive_types.h

Link: https://lore.kernel.org/r/20240326190903.1422069-1-andriy.shevchenko@linux.intel.com



Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 11213170

drivers/staging/media/atomisp/pci/bits.h

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/staging/media/atomisp/pci/defs.h

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/* 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_ */

drivers/staging/media/atomisp/pci/hive_isp_css_common/host/dma_local.h

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/staging/media/atomisp/pci/hive_types.h

+0 −19
Original line number Diff line number Diff line
@@ -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;

drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c

+2 −1
Original line number Diff line number Diff line
@@ -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)