Re: [PATCH v2 06/17] smiapp: Remove unnecessary BUG_ON()'s

[Sebastian Reichel]

Hi,

On Thu, Sep 15, 2016 at 02:22:20PM +0300, Sakari Ailus wrote:
> Instead, calculate how much is needed and then allocate the memory
> dynamically.

Reviewed-By: Sebastian Reichel 

-- Sebastian


signature.asc
Description: PGP signature

[PATCH v2 06/17] smiapp: Remove unnecessary BUG_ON()'s

[Sakari Ailus]

Instead, calculate how much is needed and then allocate the memory
dynamically.

Signed-off-by: Sakari Ailus 
---
 drivers/media/i2c/smiapp/smiapp-core.c | 24 ++--
 drivers/media/i2c/smiapp/smiapp.h  |  8 ++--
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/drivers/media/i2c/smiapp/smiapp-core.c 
b/drivers/media/i2c/smiapp/smiapp-core.c
index 31d74c1..5d251b4 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -621,7 +621,7 @@ static int smiapp_init_controls(struct smiapp_sensor 
*sensor)
 static int smiapp_init_late_controls(struct smiapp_sensor *sensor)
 {
unsigned long *valid_link_freqs = >valid_link_freqs[
-   sensor->csi_format->compressed - SMIAPP_COMPRESSED_BASE];
+   sensor->csi_format->compressed - sensor->compressed_min_bpp];
unsigned int max, i;
 
for (i = 0; i < ARRAY_SIZE(sensor->test_data); i++) {
@@ -754,6 +754,7 @@ static int smiapp_get_mbus_formats(struct smiapp_sensor 
*sensor)
 {
struct i2c_client *client = v4l2_get_subdevdata(>src->sd);
struct smiapp_pll *pll = >pll;
+   u8 compressed_max_bpp = 0;
unsigned int type, n;
unsigned int i, pixel_order;
int rval;
@@ -826,16 +827,27 @@ static int smiapp_get_mbus_formats(struct smiapp_sensor 
*sensor)
pll->scale_m = sensor->scale_m;
 
for (i = 0; i < ARRAY_SIZE(smiapp_csi_data_formats); i++) {
+   sensor->compressed_min_bpp =
+   min(smiapp_csi_data_formats[i].compressed,
+   sensor->compressed_min_bpp);
+   compressed_max_bpp =
+   max(smiapp_csi_data_formats[i].compressed,
+   compressed_max_bpp);
+   }
+
+   sensor->valid_link_freqs = devm_kcalloc(
+   >dev,
+   compressed_max_bpp - sensor->compressed_min_bpp + 1,
+   sizeof(*sensor->valid_link_freqs), GFP_KERNEL);
+
+   for (i = 0; i < ARRAY_SIZE(smiapp_csi_data_formats); i++) {
const struct smiapp_csi_data_format *f =
_csi_data_formats[i];
unsigned long *valid_link_freqs =
>valid_link_freqs[
-   f->compressed - SMIAPP_COMPRESSED_BASE];
+   f->compressed - sensor->compressed_min_bpp];
unsigned int j;
 
-   BUG_ON(f->compressed < SMIAPP_COMPRESSED_BASE);
-   BUG_ON(f->compressed > SMIAPP_COMPRESSED_MAX);
-
if (!(sensor->default_mbus_frame_fmts & 1 << i))
continue;
 
@@ -1769,7 +1781,7 @@ static int smiapp_set_format_source(struct v4l2_subdev 
*subdev,
 
valid_link_freqs = 
>valid_link_freqs[sensor->csi_format->compressed
- - SMIAPP_COMPRESSED_BASE];
+ - sensor->compressed_min_bpp];
 
__v4l2_ctrl_modify_range(
sensor->link_freq, 0,
diff --git a/drivers/media/i2c/smiapp/smiapp.h 
b/drivers/media/i2c/smiapp/smiapp.h
index aae72bc..e71271e 100644
--- a/drivers/media/i2c/smiapp/smiapp.h
+++ b/drivers/media/i2c/smiapp/smiapp.h
@@ -150,11 +150,6 @@ struct smiapp_csi_data_format {
 #define SMIAPP_PAD_SRC 1
 #define SMIAPP_PADS2
 
-#define SMIAPP_COMPRESSED_BASE 8
-#define SMIAPP_COMPRESSED_MAX  16
-#define SMIAPP_NR_OF_COMPRESSED(SMIAPP_COMPRESSED_MAX - \
-SMIAPP_COMPRESSED_BASE + 1)
-
 struct smiapp_binning_subtype {
u8 horizontal:4;
u8 vertical:4;
@@ -224,6 +219,7 @@ struct smiapp_sensor {
 
bool streaming;
bool dev_init_done;
+   u8 compressed_min_bpp;
 
u8 *nvm;/* nvm memory buffer */
unsigned int nvm_size;  /* bytes */
@@ -233,7 +229,7 @@ struct smiapp_sensor {
struct smiapp_pll pll;
 
/* Is a default format supported for a given BPP? */
-   unsigned long valid_link_freqs[SMIAPP_NR_OF_COMPRESSED];
+   unsigned long *valid_link_freqs;
 
/* Pixel array controls */
struct v4l2_ctrl *analog_gain;
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html