media: i2c: adv748x: Simplify regmap configuration
authorKieran Bingham <kieran.bingham@ideasonboard.com>
Tue, 27 Feb 2018 15:05:48 +0000 (10:05 -0500)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Wed, 21 Mar 2018 16:06:29 +0000 (12:06 -0400)
The ADV748x has identical map configurations for each register map. The
duplication of each map can be simplified using a helper macro such that
each map is represented on a single line.

Define ADV748X_REGMAP_CONF for this purpose use it to create the tables.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/i2c/adv748x/adv748x-core.c

index accaa70..b01e407 100644 (file)
  * Register manipulation
  */
 
-static const struct regmap_config adv748x_regmap_cnf[] = {
-       {
-               .name                   = "io",
-               .reg_bits               = 8,
-               .val_bits               = 8,
-
-               .max_register           = 0xff,
-               .cache_type             = REGCACHE_NONE,
-       },
-       {
-               .name                   = "dpll",
-               .reg_bits               = 8,
-               .val_bits               = 8,
-
-               .max_register           = 0xff,
-               .cache_type             = REGCACHE_NONE,
-       },
-       {
-               .name                   = "cp",
-               .reg_bits               = 8,
-               .val_bits               = 8,
-
-               .max_register           = 0xff,
-               .cache_type             = REGCACHE_NONE,
-       },
-       {
-               .name                   = "hdmi",
-               .reg_bits               = 8,
-               .val_bits               = 8,
-
-               .max_register           = 0xff,
-               .cache_type             = REGCACHE_NONE,
-       },
-       {
-               .name                   = "edid",
-               .reg_bits               = 8,
-               .val_bits               = 8,
-
-               .max_register           = 0xff,
-               .cache_type             = REGCACHE_NONE,
-       },
-       {
-               .name                   = "repeater",
-               .reg_bits               = 8,
-               .val_bits               = 8,
-
-               .max_register           = 0xff,
-               .cache_type             = REGCACHE_NONE,
-       },
-       {
-               .name                   = "infoframe",
-               .reg_bits               = 8,
-               .val_bits               = 8,
-
-               .max_register           = 0xff,
-               .cache_type             = REGCACHE_NONE,
-       },
-       {
-               .name                   = "cec",
-               .reg_bits               = 8,
-               .val_bits               = 8,
-
-               .max_register           = 0xff,
-               .cache_type             = REGCACHE_NONE,
-       },
-       {
-               .name                   = "sdp",
-               .reg_bits               = 8,
-               .val_bits               = 8,
-
-               .max_register           = 0xff,
-               .cache_type             = REGCACHE_NONE,
-       },
-
-       {
-               .name                   = "txb",
-               .reg_bits               = 8,
-               .val_bits               = 8,
-
-               .max_register           = 0xff,
-               .cache_type             = REGCACHE_NONE,
-       },
-       {
-               .name                   = "txa",
-               .reg_bits               = 8,
-               .val_bits               = 8,
+#define ADV748X_REGMAP_CONF(n) \
+{ \
+       .name = n, \
+       .reg_bits = 8, \
+       .val_bits = 8, \
+       .max_register = 0xff, \
+       .cache_type = REGCACHE_NONE, \
+}
 
-               .max_register           = 0xff,
-               .cache_type             = REGCACHE_NONE,
-       },
+static const struct regmap_config adv748x_regmap_cnf[] = {
+       ADV748X_REGMAP_CONF("io"),
+       ADV748X_REGMAP_CONF("dpll"),
+       ADV748X_REGMAP_CONF("cp"),
+       ADV748X_REGMAP_CONF("hdmi"),
+       ADV748X_REGMAP_CONF("edid"),
+       ADV748X_REGMAP_CONF("repeater"),
+       ADV748X_REGMAP_CONF("infoframe"),
+       ADV748X_REGMAP_CONF("cec"),
+       ADV748X_REGMAP_CONF("sdp"),
+       ADV748X_REGMAP_CONF("txa"),
+       ADV748X_REGMAP_CONF("txb"),
 };
 
 static int adv748x_configure_regmap(struct adv748x_state *state, int region)