@@ -577,7 +577,6 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
const struct vfe_hw_ops vfe_ops_170 = {
.global_reset = vfe_global_reset,
- .hw_version = vfe_hw_version,
.isr_read = vfe_isr_read,
.isr = vfe_isr,
.pm_domain_off = vfe_pm_domain_off,
@@ -993,7 +993,6 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
const struct vfe_hw_ops vfe_ops_4_1 = {
.global_reset = vfe_global_reset,
- .hw_version = vfe_hw_version,
.isr_read = vfe_isr_read,
.isr = vfe_isr,
.pm_domain_off = vfe_4_1_pm_domain_off,
@@ -1145,7 +1145,6 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
const struct vfe_hw_ops vfe_ops_4_7 = {
.global_reset = vfe_global_reset,
- .hw_version = vfe_hw_version,
.isr_read = vfe_isr_read,
.isr = vfe_isr,
.pm_domain_off = vfe_pm_domain_off,
@@ -1135,7 +1135,6 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
const struct vfe_hw_ops vfe_ops_4_8 = {
.global_reset = vfe_global_reset,
- .hw_version = vfe_hw_version,
.isr_read = vfe_isr_read,
.isr = vfe_isr,
.pm_domain_off = vfe_pm_domain_off,
@@ -278,7 +278,6 @@ static void vfe_buf_done_480(struct vfe_device *vfe, int port_id)
const struct vfe_hw_ops vfe_ops_480 = {
.enable_irq = vfe_enable_irq,
.global_reset = vfe_global_reset,
- .hw_version = vfe_hw_version,
.isr = vfe_isr,
.isr_read = vfe_isr_read,
.reg_update = vfe_reg_update,
@@ -227,7 +227,6 @@ static inline void vfe_reg_update_clear(struct vfe_device *vfe,
const struct vfe_hw_ops vfe_ops_680 = {
.global_reset = vfe_global_reset,
- .hw_version = vfe_hw_version,
.isr = vfe_isr,
.pm_domain_off = vfe_pm_domain_off,
.pm_domain_on = vfe_pm_domain_on,
@@ -142,7 +142,6 @@ static int vfe_halt(struct vfe_device *vfe)
const struct vfe_hw_ops vfe_ops_780 = {
.global_reset = vfe_global_reset,
- .hw_version = vfe_hw_version,
.isr = vfe_isr,
.pm_domain_off = vfe_pm_domain_off,
.pm_domain_on = vfe_pm_domain_on,
@@ -415,26 +415,6 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
return 0;
}
-/*
- * vfe_hw_version - Process write master done interrupt
- * @vfe: VFE Device
- *
- * Return vfe hw version
- */
-u32 vfe_hw_version(struct vfe_device *vfe)
-{
- u32 hw_version = readl_relaxed(vfe->base + VFE_HW_VERSION);
-
- u32 gen = (hw_version >> HW_VERSION_GENERATION) & 0xF;
- u32 rev = (hw_version >> HW_VERSION_REVISION) & 0xFFF;
- u32 step = (hw_version >> HW_VERSION_STEPPING) & 0xFFFF;
-
- dev_dbg(vfe->camss->dev, "VFE:%d HW Version = %u.%u.%u\n",
- vfe->id, gen, rev, step);
-
- return hw_version;
-}
-
/*
* vfe_buf_done - Process write master done interrupt
* @vfe: VFE Device
@@ -1088,8 +1068,6 @@ int vfe_get(struct vfe_device *vfe)
vfe_reset_output_maps(vfe);
vfe_init_outputs(vfe);
-
- vfe->res->hw_ops->hw_version(vfe);
} else {
ret = vfe_check_clock_rates(vfe);
if (ret < 0)
@@ -101,7 +101,6 @@ struct vfe_device;
struct vfe_hw_ops {
void (*enable_irq)(struct vfe_device *vfe);
void (*global_reset)(struct vfe_device *vfe);
- u32 (*hw_version)(struct vfe_device *vfe);
irqreturn_t (*isr)(int irq, void *dev);
void (*isr_read)(struct vfe_device *vfe, u32 *value0, u32 *value1);
void (*pm_domain_off)(struct vfe_device *vfe);
@@ -259,13 +258,6 @@ void vfe_put(struct vfe_device *vfe);
*/
bool vfe_is_lite(struct vfe_device *vfe);
-/*
- * vfe_hw_version - Process write master done interrupt
- * @vfe: VFE Device
- *
- * Return vfe hw version
- */
-u32 vfe_hw_version(struct vfe_device *vfe);
/*
* vfe_enable - Enable streaming on VFE line
* @line: VFE line
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> --- .../media/platform/qcom/camss/camss-vfe-17x.c | 1 - .../media/platform/qcom/camss/camss-vfe-4-1.c | 1 - .../media/platform/qcom/camss/camss-vfe-4-7.c | 1 - .../media/platform/qcom/camss/camss-vfe-4-8.c | 1 - .../media/platform/qcom/camss/camss-vfe-480.c | 1 - .../media/platform/qcom/camss/camss-vfe-680.c | 1 - .../media/platform/qcom/camss/camss-vfe-780.c | 1 - drivers/media/platform/qcom/camss/camss-vfe.c | 22 ------------------- drivers/media/platform/qcom/camss/camss-vfe.h | 8 ------- 9 files changed, 37 deletions(-)