[media] media: tuner xc5000 - try to avoid firmware load in resume path

xc5000 doesn't load firmware at attach time instead loads it
when it needs to set and change configuration from its init,
frequency, digital and analog mode set interffaces. As a result,
when system is suspended before firmware is loaded, firmware
load can be avoided during resume. Loading formware in this
scenario results in slowpath warnings during resume as it won't
be in the suspend firmware cache.

Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/tuners/xc5000.c b/drivers/media/tuners/xc5000.c
index b72ec64b758c223832cd4fd02d6c7fbecb1225b4..e44c8aba6074c0667181d9e7a7daab2f7db4d1bc 100644 (file)
--- a/drivers/media/tuners/xc5000.c
+++ b/drivers/media/tuners/xc5000.c
@@ -1293,6 +1293,20 @@ static int xc5000_suspend(struct dvb_frontend *fe)
        return 0;
 }
 
+static int xc5000_resume(struct dvb_frontend *fe)
+{
+       struct xc5000_priv *priv = fe->tuner_priv;
+
+       dprintk(1, "%s()\n", __func__);
+
+       /* suspended before firmware is loaded.
+          Avoid firmware load in resume path. */
+       if (!priv->firmware)
+               return 0;
+
+       return xc5000_set_params(fe);
+}
+
 static int xc5000_init(struct dvb_frontend *fe)
 {
        struct xc5000_priv *priv = fe->tuner_priv;
@@ -1360,7 +1374,7 @@ static const struct dvb_tuner_ops xc5000_tuner_ops = {
        .init              = xc5000_init,
        .sleep             = xc5000_sleep,
        .suspend           = xc5000_suspend,
-       .resume            = xc5000_set_params,
+       .resume            = xc5000_resume,
 
        .set_config        = xc5000_set_config,
        .set_params        = xc5000_set_digital_params,