@@ -179,7 +179,6 @@ static void csid_subdev_init(struct csid_device *csid)
const struct csid_hw_ops csid_ops_4_1 = {
.configure_stream = csid_configure_stream,
.configure_testgen_pattern = csid_configure_testgen_pattern,
- .hw_version = csid_hw_version,
.isr = csid_isr,
.reset = csid_reset,
.src_pad_code = csid_src_pad_code,
@@ -204,7 +204,6 @@ static void csid_subdev_init(struct csid_device *csid)
const struct csid_hw_ops csid_ops_4_7 = {
.configure_stream = csid_configure_stream,
.configure_testgen_pattern = csid_configure_testgen_pattern,
- .hw_version = csid_hw_version,
.isr = csid_isr,
.reset = csid_reset,
.src_pad_code = csid_src_pad_code,
@@ -413,7 +413,6 @@ static void csid_subdev_init(struct csid_device *csid) {}
const struct csid_hw_ops csid_ops_680 = {
.configure_testgen_pattern = NULL,
.configure_stream = csid_configure_stream,
- .hw_version = csid_hw_version,
.isr = csid_isr,
.reset = csid_reset,
.src_pad_code = csid_src_pad_code,
@@ -328,7 +328,6 @@ static void csid_subdev_init(struct csid_device *csid)
const struct csid_hw_ops csid_ops_780 = {
.configure_stream = csid_configure_stream,
.configure_testgen_pattern = csid_configure_testgen_pattern,
- .hw_version = csid_hw_version,
.isr = csid_isr,
.reset = csid_reset,
.src_pad_code = csid_src_pad_code,
@@ -424,7 +424,6 @@ static void csid_subdev_init(struct csid_device *csid)
const struct csid_hw_ops csid_ops_gen2 = {
.configure_stream = csid_configure_stream,
.configure_testgen_pattern = csid_configure_testgen_pattern,
- .hw_version = csid_hw_version,
.isr = csid_isr,
.reset = csid_reset,
.src_pad_code = csid_src_pad_code,
@@ -596,29 +596,6 @@ static int csid_set_clock_rates(struct csid_device *csid)
return 0;
}
-/*
- * csid_hw_version - CSID hardware version query
- * @csid: CSID device
- *
- * Return HW version or error
- */
-u32 csid_hw_version(struct csid_device *csid)
-{
- u32 hw_version;
- u32 hw_gen;
- u32 hw_rev;
- u32 hw_step;
-
- hw_version = readl_relaxed(csid->base + CSID_HW_VERSION);
- hw_gen = (hw_version >> HW_VERSION_GENERATION) & 0xF;
- hw_rev = (hw_version >> HW_VERSION_REVISION) & 0xFFF;
- hw_step = (hw_version >> HW_VERSION_STEPPING) & 0xFFFF;
- dev_dbg(csid->camss->dev, "CSID:%d HW Version = %u.%u.%u\n",
- csid->id, hw_gen, hw_rev, hw_step);
-
- return hw_version;
-}
-
/*
* csid_src_pad_code - Pick an output/src format based on the input/sink format
* @csid: CSID device
@@ -732,8 +709,6 @@ static int csid_set_power(struct v4l2_subdev *sd, int on)
pm_runtime_put_sync(dev);
return ret;
}
-
- csid->res->hw_ops->hw_version(csid);
} else {
disable_irq(csid->irq);
camss_disable_clocks(csid->nclocks, csid->clock);
@@ -88,12 +88,6 @@ struct csid_hw_ops {
*/
int (*configure_testgen_pattern)(struct csid_device *csid, s32 val);
- /*
- * hw_version - Read hardware version register from hardware
- * @csid: CSID device
- */
- u32 (*hw_version)(struct csid_device *csid);
-
/*
* isr - CSID module interrupt service routine
* @irq: Interrupt line
@@ -225,14 +219,6 @@ extern const struct csid_hw_ops csid_ops_780;
*/
bool csid_is_lite(struct csid_device *csid);
-/*
- * csid_hw_version - CSID hardware version query
- * @csid: CSID device
- *
- * Return HW version or error
- */
-u32 csid_hw_version(struct csid_device *csid);
-
/*
* csid_src_pad_code - Pick an output/src format based on the input/sink format
* @csid: CSID device
Camss drivers spam kernel dmesg with 64 useless messages during boot: qcom-camss acb7000.isp: VFE:1 HW Version = 3.0.2 qcom-camss acb7000.isp: VFE:2 HW Version = 2.4.0 All of these messages are the same, so it makes no sense to print same information 32 times. The driver does not use read version at all, so if it was needed for any real debugging purpose it would be provided via debugfs interface. However even then printing this is pointless, because version of hardware block is deducible from the compatible. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- .../platform/qcom/camss/camss-csid-4-1.c | 1 - .../platform/qcom/camss/camss-csid-4-7.c | 1 - .../platform/qcom/camss/camss-csid-680.c | 1 - .../platform/qcom/camss/camss-csid-780.c | 1 - .../platform/qcom/camss/camss-csid-gen2.c | 1 - .../media/platform/qcom/camss/camss-csid.c | 25 ------------------- .../media/platform/qcom/camss/camss-csid.h | 14 ----------- 7 files changed, 44 deletions(-)