V4L/DVB (11369): v4l2-subdev: add load_fw and use that instead of abusing core->init.

The init callback was used in several places to load firmware. Make a separate
load_fw callback for that. This makes the code a lot more understandable.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 32 insertions, 37 deletions

diff --git a/drivers/media/video/cx18/cx18-av-core.c b/drivers/media/video/cx18/cx18-av-core.c
index f4dd9d78eb3d..0c58e55fdbee 100644
--- a/drivers/media/video/cx18/cx18-av-core.c
+++ b/drivers/media/video/cx18/cx18-av-core.c
@@ -203,43 +203,42 @@ static int cx18_av_reset(struct v4l2_subdev *sd, u32 val)
 
 static int cx18_av_init(struct v4l2_subdev *sd, u32 val)
 {
-        struct cx18_av_state *state = to_cx18_av_state(sd);
         struct cx18 *cx = v4l2_get_subdevdata(sd);
 
-        switch (val) {
-        case CX18_AV_INIT_PLLS:
-                /*
-                 * The crystal freq used in calculations in this driver will be
-                 * 28.636360 MHz.
-                 * Aim to run the PLLs' VCOs near 400 MHz to minimze errors.
-                 */
+        /*
+         * The crystal freq used in calculations in this driver will be
+         * 28.636360 MHz.
+         * Aim to run the PLLs' VCOs near 400 MHz to minimze errors.
+         */
 
-                /*
-                 * VDCLK  Integer = 0x0f, Post Divider = 0x04
-                 * AIMCLK Integer = 0x0e, Post Divider = 0x16
-                 */
-                cx18_av_write4(cx, CXADEC_PLL_CTRL1, 0x160e040f);
+        /*
+         * VDCLK  Integer = 0x0f, Post Divider = 0x04
+         * AIMCLK Integer = 0x0e, Post Divider = 0x16
+         */
+        cx18_av_write4(cx, CXADEC_PLL_CTRL1, 0x160e040f);
 
-                /* VDCLK Fraction = 0x2be2fe */
-                /* xtal * 0xf.15f17f0/4 = 108 MHz: 432 MHz before post divide */
-                cx18_av_write4(cx, CXADEC_VID_PLL_FRAC, 0x002be2fe);
+        /* VDCLK Fraction = 0x2be2fe */
+        /* xtal * 0xf.15f17f0/4 = 108 MHz: 432 MHz before post divide */
+        cx18_av_write4(cx, CXADEC_VID_PLL_FRAC, 0x002be2fe);
 
-                /* AIMCLK Fraction = 0x05227ad */
-                /* xtal * 0xe.2913d68/0x16 = 48000 * 384: 406 MHz pre post-div*/
-                cx18_av_write4(cx, CXADEC_AUX_PLL_FRAC, 0x005227ad);
+        /* AIMCLK Fraction = 0x05227ad */
+        /* xtal * 0xe.2913d68/0x16 = 48000 * 384: 406 MHz pre post-div*/
+        cx18_av_write4(cx, CXADEC_AUX_PLL_FRAC, 0x005227ad);
 
-                /* SA_MCLK_SEL=1, SA_MCLK_DIV=0x16 */
-                cx18_av_write(cx, CXADEC_I2S_MCLK, 0x56);
-                break;
+        /* SA_MCLK_SEL=1, SA_MCLK_DIV=0x16 */
+        cx18_av_write(cx, CXADEC_I2S_MCLK, 0x56);
+        return 0;
+}
 
-        case CX18_AV_INIT_NORMAL:
-        default:
-                if (!state->is_initialized) {
-                        /* initialize on first use */
-                        state->is_initialized = 1;
-                        cx18_av_initialize(cx);
-                }
-                break;
+static int cx18_av_load_fw(struct v4l2_subdev *sd)
+{
+        struct cx18_av_state *state = to_cx18_av_state(sd);
+        struct cx18 *cx = v4l2_get_subdevdata(sd);
+
+        if (!state->is_initialized) {
+                /* initialize on first use */
+                state->is_initialized = 1;
+                cx18_av_initialize(cx);
         }
         return 0;
 }
@@ -1185,6 +1184,7 @@ static const struct v4l2_subdev_core_ops cx18_av_general_ops = {
         .g_chip_ident = cx18_av_g_chip_ident,
         .log_status = cx18_av_log_status,
         .init = cx18_av_init,
+        .load_fw = cx18_av_load_fw,
         .reset = cx18_av_reset,
         .queryctrl = cx18_av_queryctrl,
         .g_ctrl = cx18_av_g_ctrl,
diff --git a/drivers/media/video/cx18/cx18-av-core.h b/drivers/media/video/cx18/cx18-av-core.h
index c458120e8c90..9b84a0c58e0e 100644
--- a/drivers/media/video/cx18/cx18-av-core.h
+++ b/drivers/media/video/cx18/cx18-av-core.h
@@ -328,11 +328,6 @@ static inline struct cx18_av_state *to_cx18_av_state(struct v4l2_subdev *sd)
         return container_of(sd, struct cx18_av_state, sd);
 }
 
-enum cx18_av_subdev_init_arg {
-        CX18_AV_INIT_NORMAL = 0,
-        CX18_AV_INIT_PLLS = 1,
-};
-
 /* ----------------------------------------------------------------------- */
 /* cx18_av-core.c                                                          */
 int cx18_av_write(struct cx18 *cx, u16 addr, u8 value);
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 210c68aaae00..49b1c3d7b1a8 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -810,7 +810,7 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
                 CX18_ERR("Could not register A/V decoder subdevice\n");
                 goto free_map;
         }
-        cx18_call_hw(cx, CX18_HW_418_AV, core, init, (u32) CX18_AV_INIT_PLLS);
+        cx18_call_hw(cx, CX18_HW_418_AV, core, init, 0);
 
         /* Initialize GPIO Reset Controller to do chip resets during i2c init */
         if (cx->card->hw_all & CX18_HW_GPIO_RESET_CTRL) {
@@ -1028,7 +1028,7 @@ int cx18_init_on_first_open(struct cx18 *cx)
         cx18_vapi(cx, CX18_APU_STOP, 1, CX18_APU_ENCODING_METHOD_MPEG);
 
         /* Init the A/V decoder, if it hasn't been already */
-        v4l2_subdev_call(cx->sd_av, core, init, (u32) CX18_AV_INIT_NORMAL);
+        v4l2_subdev_call(cx->sd_av, core, load_fw);
 
         vf.tuner = 0;
         vf.type = V4L2_TUNER_ANALOG_TV;