From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org,
Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: [PATCH 12/20] media: atomisp: get rid of a warning message
Date: Thu, 28 May 2020 08:14:12 +0200 [thread overview]
Message-ID: <559ae093b059c6953f77b23346324c4fdd5ca6c5.1590646166.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1590646166.git.mchehab+huawei@kernel.org>
There's a warning message about an unused code. The code that
were using it were commented out, due to a problem causing the
firmware load to fail on the machines we're using for testing.
Change the place where we're commenting the code out, in order
to avoid the warning.
Fixes: 95d1f398c4dc ("media: atomisp: keep the ISP powered on when setting it")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
.../staging/media/atomisp/pci/atomisp_v4l2.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index b30a2e54067c..c89d477a3948 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -734,6 +734,10 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
* WA for DDR DVFS enable/disable
* By default, ISP will force DDR DVFS 1600MHz before disable DVFS
*/
+
+#if 0
+// Used only by atomisp_mrfld_power
+
static void punit_ddr_dvfs_enable(bool enable)
{
int door_bell = 1 << 8;
@@ -758,9 +762,12 @@ static void punit_ddr_dvfs_enable(bool enable)
if (max_wait == -1)
pr_info("DDR DVFS, door bell is not cleared within 3ms\n");
}
+#endif
static int atomisp_mrfld_power(struct atomisp_device *isp, bool enable)
{
+// FIXME: at least with ISP2401, the code below causes the driver to break
+#if 0
unsigned long timeout;
u32 val = enable ? MRFLD_ISPSSPM0_IUNIT_POWER_ON :
MRFLD_ISPSSPM0_IUNIT_POWER_OFF;
@@ -817,22 +824,21 @@ static int atomisp_mrfld_power(struct atomisp_device *isp, bool enable)
dev_err(isp->dev, "IUNIT power-%s timeout.\n", enable ? "on" : "off");
return -EBUSY;
+#else
+ return 0;
+#endif
}
/* Workaround for pmu_nc_set_power_state not ready in MRFLD */
int atomisp_mrfld_power_down(struct atomisp_device *isp)
{
- return 0;
-// FIXME: at least with ISP2401, the code below causes the driver to break
-// return atomisp_mrfld_power(isp, false);
+ return atomisp_mrfld_power(isp, false);
}
/* Workaround for pmu_nc_set_power_state not ready in MRFLD */
int atomisp_mrfld_power_up(struct atomisp_device *isp)
{
- return 0;
-// FIXME: at least with ISP2401, the code below causes the driver to break
-// return atomisp_mrfld_power(isp, true);
+ return atomisp_mrfld_power(isp, true);
}
int atomisp_runtime_suspend(struct device *dev)
--
2.26.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
next prev parent reply other threads:[~2020-05-28 6:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 6:14 [PATCH 00/20] More atomisp fixes and cleanups Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 01/20] media: atomisp: simplify hive_isp_css_mm_hrt wrapper Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 02/20] media: atomisp: get rid of the hrt/hive_isp_css_mm_hrt abstraction layer Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 03/20] media: atomisp: reduce abstraction at ia_css_memory_access Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 04/20] media: atomisp: go one step further to drop ia_css_memory_access.c Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 05/20] media: atomisp: get rid of mmgr_load and mmgr_store Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 06/20] media: atomisp: get rid of unused memory_realloc code Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 07/20] media: atomisp: change the type returned by mmgr alloc Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 08/20] media: atomisp: get rid of memory_access.c Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 09/20] media: atomisp: hmm_bo: untag user pointers Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 10/20] media: atomisp: add debug message to help debugging hmm code Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 11/20] media: atomisp: use Yocto Aero default hmm pool sizes Mauro Carvalho Chehab
2020-05-28 6:14 ` Mauro Carvalho Chehab [this message]
2020-05-28 6:14 ` [PATCH 13/20] media: atomisp: fix driver caps Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 14/20] media: atomisp: use pin_user_pages() for memory allocation Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 15/20] media: atomisp: add debug for hmm alloc Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 16/20] media: atomisp: improve warning for IRQ enable function Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 17/20] media: atomisp: add debug functions for received events Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 18/20] media: atomisp: add more comments about frame allocation Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 19/20] media: atomisp: remove kvmalloc/kvcalloc abstractions Mauro Carvalho Chehab
2020-05-28 6:57 ` [PATCH v2 " Mauro Carvalho Chehab
2020-05-28 6:14 ` [PATCH 20/20] media: atomisp: avoid OOPS due to non-existing ref_frames Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=559ae093b059c6953f77b23346324c4fdd5ca6c5.1590646166.git.mchehab+huawei@kernel.org \
--to=mchehab+huawei@kernel.org \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).