* [PATCH v2 2/5] media: staging: atomisp: Remove unused declarations
2021-07-13 15:25 [PATCH v2 1/5] media: staging: atomisp: use list_splice_init in atomisp_compat_css20.c Andy Shevchenko
@ 2021-07-13 15:25 ` Andy Shevchenko
2021-07-13 15:25 ` [PATCH v2 3/5] media: staging: atomisp: Annotate a couple of definitions with __maybe_unused Andy Shevchenko
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2021-07-13 15:25 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Andy Shevchenko, linux-media,
linux-staging, linux-kernel
Cc: Mauro Carvalho Chehab, Sakari Ailus, Greg Kroah-Hartman
There is a few static declarations that are not used anywhere, remove them.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: added "media:" prefix
.../atomisp/pci/isp2400_input_system_local.h | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
index 072a92199e05..27f3c8a45730 100644
--- a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
+++ b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
@@ -362,23 +362,6 @@ static const hrt_address MIPI_PORT_OFFSET[N_MIPI_PORT_ID] = {
0x00000200UL
};
-static const mipi_lane_cfg_t MIPI_PORT_MAXLANES[N_MIPI_PORT_ID] = {
- MIPI_4LANE_CFG,
- MIPI_1LANE_CFG,
- MIPI_2LANE_CFG
-};
-
-static const bool MIPI_PORT_ACTIVE[N_RX_MODE][N_MIPI_PORT_ID] = {
- {true, true, false},
- {true, true, false},
- {true, true, false},
- {true, true, false},
- {true, true, true},
- {true, true, true},
- {true, true, true},
- {true, true, true}
-};
-
static const mipi_lane_cfg_t MIPI_PORT_LANES[N_RX_MODE][N_MIPI_PORT_ID] = {
{MIPI_4LANE_CFG, MIPI_1LANE_CFG, MIPI_0LANE_CFG},
{MIPI_3LANE_CFG, MIPI_1LANE_CFG, MIPI_0LANE_CFG},
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 3/5] media: staging: atomisp: Annotate a couple of definitions with __maybe_unused
2021-07-13 15:25 [PATCH v2 1/5] media: staging: atomisp: use list_splice_init in atomisp_compat_css20.c Andy Shevchenko
2021-07-13 15:25 ` [PATCH v2 2/5] media: staging: atomisp: Remove unused declarations Andy Shevchenko
@ 2021-07-13 15:25 ` Andy Shevchenko
2021-07-13 15:25 ` [PATCH v2 4/5] media: staging: atomisp: Move MIPI_PORT_LANES to the only user Andy Shevchenko
2021-07-13 15:25 ` [PATCH v2 5/5] media: staging: atomisp: Remove unused port_enabled variable Andy Shevchenko
3 siblings, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2021-07-13 15:25 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Andy Shevchenko, linux-media,
linux-staging, linux-kernel
Cc: Mauro Carvalho Chehab, Sakari Ailus, Greg Kroah-Hartman
There are definitions in the header that are not used by all modules inside
the driver. Annotate them with __maybe_unused to avoid compiler warnings.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: added "media:" prefix
.../staging/media/atomisp/pci/isp2400_input_system_local.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
index 27f3c8a45730..21f11bdfc85f 100644
--- a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
+++ b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
@@ -356,7 +356,7 @@ struct rx_cfg_s {
};
/* NOTE: The base has already an offset of 0x0100 */
-static const hrt_address MIPI_PORT_OFFSET[N_MIPI_PORT_ID] = {
+static const hrt_address __maybe_unused MIPI_PORT_OFFSET[N_MIPI_PORT_ID] = {
0x00000000UL,
0x00000100UL,
0x00000200UL
@@ -373,7 +373,7 @@ static const mipi_lane_cfg_t MIPI_PORT_LANES[N_RX_MODE][N_MIPI_PORT_ID] = {
{MIPI_1LANE_CFG, MIPI_1LANE_CFG, MIPI_1LANE_CFG}
};
-static const hrt_address SUB_SYSTEM_OFFSET[N_SUB_SYSTEM_ID] = {
+static const hrt_address __maybe_unused SUB_SYSTEM_OFFSET[N_SUB_SYSTEM_ID] = {
0x00001000UL,
0x00002000UL,
0x00003000UL,
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 4/5] media: staging: atomisp: Move MIPI_PORT_LANES to the only user
2021-07-13 15:25 [PATCH v2 1/5] media: staging: atomisp: use list_splice_init in atomisp_compat_css20.c Andy Shevchenko
2021-07-13 15:25 ` [PATCH v2 2/5] media: staging: atomisp: Remove unused declarations Andy Shevchenko
2021-07-13 15:25 ` [PATCH v2 3/5] media: staging: atomisp: Annotate a couple of definitions with __maybe_unused Andy Shevchenko
@ 2021-07-13 15:25 ` Andy Shevchenko
2021-07-13 15:25 ` [PATCH v2 5/5] media: staging: atomisp: Remove unused port_enabled variable Andy Shevchenko
3 siblings, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2021-07-13 15:25 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Andy Shevchenko, linux-media,
linux-staging, linux-kernel
Cc: Mauro Carvalho Chehab, Sakari Ailus, Greg Kroah-Hartman
Move MIPI_PORT_LANES to the only user of it, i.e. pci/runtime/isys/src/rx.c.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: added "media:" prefix, fixed compilation error in some configurations (LKP)
.../media/atomisp/pci/isp2400_input_system_local.h | 11 -----------
.../staging/media/atomisp/pci/runtime/isys/src/rx.c | 11 +++++++++++
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
index 21f11bdfc85f..2614b89b8e34 100644
--- a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
+++ b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
@@ -362,17 +362,6 @@ static const hrt_address __maybe_unused MIPI_PORT_OFFSET[N_MIPI_PORT_ID] = {
0x00000200UL
};
-static const mipi_lane_cfg_t MIPI_PORT_LANES[N_RX_MODE][N_MIPI_PORT_ID] = {
- {MIPI_4LANE_CFG, MIPI_1LANE_CFG, MIPI_0LANE_CFG},
- {MIPI_3LANE_CFG, MIPI_1LANE_CFG, MIPI_0LANE_CFG},
- {MIPI_2LANE_CFG, MIPI_1LANE_CFG, MIPI_0LANE_CFG},
- {MIPI_1LANE_CFG, MIPI_1LANE_CFG, MIPI_0LANE_CFG},
- {MIPI_2LANE_CFG, MIPI_1LANE_CFG, MIPI_2LANE_CFG},
- {MIPI_3LANE_CFG, MIPI_1LANE_CFG, MIPI_1LANE_CFG},
- {MIPI_2LANE_CFG, MIPI_1LANE_CFG, MIPI_1LANE_CFG},
- {MIPI_1LANE_CFG, MIPI_1LANE_CFG, MIPI_1LANE_CFG}
-};
-
static const hrt_address __maybe_unused SUB_SYSTEM_OFFSET[N_SUB_SYSTEM_ID] = {
0x00001000UL,
0x00002000UL,
diff --git a/drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c b/drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c
index 4a18da6bf0c1..79475dc19eb6 100644
--- a/drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c
+++ b/drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c
@@ -476,6 +476,17 @@ unsigned int ia_css_csi2_calculate_input_system_alignment(
#endif
#if !defined(ISP2401)
+static const mipi_lane_cfg_t MIPI_PORT_LANES[N_RX_MODE][N_MIPI_PORT_ID] = {
+ {MIPI_4LANE_CFG, MIPI_1LANE_CFG, MIPI_0LANE_CFG},
+ {MIPI_3LANE_CFG, MIPI_1LANE_CFG, MIPI_0LANE_CFG},
+ {MIPI_2LANE_CFG, MIPI_1LANE_CFG, MIPI_0LANE_CFG},
+ {MIPI_1LANE_CFG, MIPI_1LANE_CFG, MIPI_0LANE_CFG},
+ {MIPI_2LANE_CFG, MIPI_1LANE_CFG, MIPI_2LANE_CFG},
+ {MIPI_3LANE_CFG, MIPI_1LANE_CFG, MIPI_1LANE_CFG},
+ {MIPI_2LANE_CFG, MIPI_1LANE_CFG, MIPI_1LANE_CFG},
+ {MIPI_1LANE_CFG, MIPI_1LANE_CFG, MIPI_1LANE_CFG}
+};
+
void ia_css_isys_rx_configure(const rx_cfg_t *config,
const enum ia_css_input_mode input_mode)
{
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 5/5] media: staging: atomisp: Remove unused port_enabled variable
2021-07-13 15:25 [PATCH v2 1/5] media: staging: atomisp: use list_splice_init in atomisp_compat_css20.c Andy Shevchenko
` (2 preceding siblings ...)
2021-07-13 15:25 ` [PATCH v2 4/5] media: staging: atomisp: Move MIPI_PORT_LANES to the only user Andy Shevchenko
@ 2021-07-13 15:25 ` Andy Shevchenko
3 siblings, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2021-07-13 15:25 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Andy Shevchenko, linux-media,
linux-staging, linux-kernel
Cc: Mauro Carvalho Chehab, Sakari Ailus, Greg Kroah-Hartman
Remove unused port_enabled variable in ia_css_isys_rx_configure().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: added "media:" prefix
drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c b/drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c
index 79475dc19eb6..af153c3fb86d 100644
--- a/drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c
+++ b/drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c
@@ -490,7 +490,6 @@ static const mipi_lane_cfg_t MIPI_PORT_LANES[N_RX_MODE][N_MIPI_PORT_ID] = {
void ia_css_isys_rx_configure(const rx_cfg_t *config,
const enum ia_css_input_mode input_mode)
{
- bool port_enabled[N_MIPI_PORT_ID];
bool any_port_enabled = false;
enum mipi_port_id port;
@@ -527,8 +526,6 @@ void ia_css_isys_rx_configure(const rx_cfg_t *config,
_HRT_CSS_RECEIVER_2400_RX_COUNT_REG_IDX,
config->rxcount);
- port_enabled[port] = true;
-
if (input_mode != IA_CSS_INPUT_MODE_BUFFERED_SENSOR) {
/* MW: A bit of a hack, straight wiring of the capture
* units,assuming they are linearly enumerated. */
--
2.30.2
^ permalink raw reply related [flat|nested] 5+ messages in thread