disp: msm: sde: remove sde_hw_blk

The sde_hw_blk was meant to be a generic base object for all
SDE HW blocks, however, it enforces using a common set of ops
which is not practical when blocks have different capabilities.
Since this object was never used as intended and is not doing
anything functional today, remove the dead weight.

Change-Id: If76006c1ae5c62e8d7d77b100837dbaf6c661bd3
Signed-off-by: Steve Cohen <quic_cohens@quicinc.com>

msm/sde/sde_hw_lm.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2019, 2021, The Linux Foundation. All rights reserved.
  */
 
 #ifndef _SDE_HW_LM_H
@@ -8,7 +8,6 @@
 
 #include "sde_hw_mdss.h"
 #include "sde_hw_util.h"
-#include "sde_hw_blk.h"
 
 struct sde_hw_mixer;
 
@@ -88,7 +87,6 @@ struct sde_hw_lm_ops {
 };
 
 struct sde_hw_mixer {
-	struct sde_hw_blk base;
 	struct sde_hw_blk_reg_map hw;
 
 	/* lm */
@@ -105,13 +103,13 @@ struct sde_hw_mixer {
 };
 
 /**
- * to_sde_hw_mixer - convert base object sde_hw_base to container
- * @hw: Pointer to base hardware block
+ * to_sde_hw_mixer - convert base hw object to sde_hw_mixer container
+ * @hw: Pointer to hardware block register map object
  * return: Pointer to hardware block container
  */
-static inline struct sde_hw_mixer *to_sde_hw_mixer(struct sde_hw_blk *hw)
+static inline struct sde_hw_mixer *to_sde_hw_mixer(struct sde_hw_blk_reg_map *hw)
 {
-	return container_of(hw, struct sde_hw_mixer, base);
+	return container_of(hw, struct sde_hw_mixer, hw);
 }
 
 /**
@@ -121,14 +119,14 @@ static inline struct sde_hw_mixer *to_sde_hw_mixer(struct sde_hw_blk *hw)
  * @addr: mapped register io address of MDP
  * @m :   pointer to mdss catalog data
  */
-struct sde_hw_mixer *sde_hw_lm_init(enum sde_lm idx,
+struct sde_hw_blk_reg_map *sde_hw_lm_init(enum sde_lm idx,
 		void __iomem *addr,
 		struct sde_mdss_cfg *m);
 
 /**
  * sde_hw_lm_destroy(): Destroys layer mixer driver context
- * @lm:   Pointer to LM driver context
+ * @hw: Pointer to hardware block register map object
  */
-void sde_hw_lm_destroy(struct sde_hw_mixer *lm);
+void sde_hw_lm_destroy(struct sde_hw_blk_reg_map *hw);
 
 #endif /*_SDE_HW_LM_H */