[2/6] soc: qcom: smem: return proper type for cached entry functions

Message ID 20180410222542.29474-3-elder@linaro.org
State Accepted
Commit e221a1da97d97a9b452f8be78bd14333bb5605aa
Headers show
Series
  • Untitled series #10575
Related show

Commit Message

Alex Elder April 10, 2018, 10:25 p.m.
What phdr_to_last_uncached_entry() returns is the address of the
start of the free space following all allocated uncached entries.
It really doesn't refer to an actual (initialized) private entry
structure.   Similarly phdr_to_last_cached_entry() returns the
address of the end of free space, preceding the last allocated cache
entry.  Change both functions' return type to be pointer to void
to reflect this.

Meanwhile, phdr_to_first_cached_entry() really *does* point to a
private entry structure, so change its return type to reflect
this fact.

Signed-off-by: Alex Elder <elder@linaro.org>

---
 drivers/soc/qcom/smem.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

-- 
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Bjorn Andersson April 25, 2018, 4:39 a.m. | #1
On Tue 10 Apr 15:25 PDT 2018, Alex Elder wrote:

> What phdr_to_last_uncached_entry() returns is the address of the

> start of the free space following all allocated uncached entries.

> It really doesn't refer to an actual (initialized) private entry

> structure.   Similarly phdr_to_last_cached_entry() returns the

> address of the end of free space, preceding the last allocated cache

> entry.  Change both functions' return type to be pointer to void

> to reflect this.

> 

> Meanwhile, phdr_to_first_cached_entry() really *does* point to a

> private entry structure, so change its return type to reflect

> this fact.

> 

> Signed-off-by: Alex Elder <elder@linaro.org>


Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>


Regards,
Bjorn

> ---

>  drivers/soc/qcom/smem.c | 8 +++++---

>  1 file changed, 5 insertions(+), 3 deletions(-)

> 

> diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c

> index 7f38c5e11440..3102aa94aec2 100644

> --- a/drivers/soc/qcom/smem.c

> +++ b/drivers/soc/qcom/smem.c

> @@ -280,7 +280,7 @@ struct qcom_smem {

>  	struct smem_region regions[0];

>  };

>  

> -static struct smem_private_entry *

> +static void *

>  phdr_to_last_uncached_entry(struct smem_partition_header *phdr)

>  {

>  	void *p = phdr;

> @@ -288,7 +288,8 @@ phdr_to_last_uncached_entry(struct smem_partition_header *phdr)

>  	return p + le32_to_cpu(phdr->offset_free_uncached);

>  }

>  

> -static void *phdr_to_first_cached_entry(struct smem_partition_header *phdr,

> +static struct smem_private_entry *

> +phdr_to_first_cached_entry(struct smem_partition_header *phdr,

>  					size_t cacheline)

>  {

>  	void *p = phdr;

> @@ -297,7 +298,8 @@ static void *phdr_to_first_cached_entry(struct smem_partition_header *phdr,

>  	return p + le32_to_cpu(phdr->size) - ALIGN(sizeof(*e), cacheline);

>  }

>  

> -static void *phdr_to_last_cached_entry(struct smem_partition_header *phdr)

> +static void *

> +phdr_to_last_cached_entry(struct smem_partition_header *phdr)

>  {

>  	void *p = phdr;

>  

> -- 

> 2.14.1

> 

> --

> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in

> the body of a message to majordomo@vger.kernel.org

> More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index 7f38c5e11440..3102aa94aec2 100644
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -280,7 +280,7 @@  struct qcom_smem {
 	struct smem_region regions[0];
 };
 
-static struct smem_private_entry *
+static void *
 phdr_to_last_uncached_entry(struct smem_partition_header *phdr)
 {
 	void *p = phdr;
@@ -288,7 +288,8 @@  phdr_to_last_uncached_entry(struct smem_partition_header *phdr)
 	return p + le32_to_cpu(phdr->offset_free_uncached);
 }
 
-static void *phdr_to_first_cached_entry(struct smem_partition_header *phdr,
+static struct smem_private_entry *
+phdr_to_first_cached_entry(struct smem_partition_header *phdr,
 					size_t cacheline)
 {
 	void *p = phdr;
@@ -297,7 +298,8 @@  static void *phdr_to_first_cached_entry(struct smem_partition_header *phdr,
 	return p + le32_to_cpu(phdr->size) - ALIGN(sizeof(*e), cacheline);
 }
 
-static void *phdr_to_last_cached_entry(struct smem_partition_header *phdr)
+static void *
+phdr_to_last_cached_entry(struct smem_partition_header *phdr)
 {
 	void *p = phdr;