diff mbox series

x86/hyperv: conditionally build hv_get_nested_reg()

Message ID 20230114015643.3950640-1-trix@redhat.com
State New
Headers
Series x86/hyperv: conditionally build hv_get_nested_reg() |

Commit Message

Tom Rix Jan. 14, 2023, 1:56 a.m. UTC 
  cppcheck reports
[arch/x86/kernel/cpu/mshyperv.c:44]: (style) The function 'hv_get_nested_reg' is never used.

hv_get_nested_reg() is built unconditially but is only used conditionally in
hv_get_register() and hv_set_register() by CONFIG_HYPERV.

Move the conditional #if to also include hv_get_nested_reg()

Fixes: 89acd9b2ff8e ("Drivers: hv: Setup synic registers in case of nested root partition")
Signed-off-by: Tom Rix <trix@redhat.com>
---
 arch/x86/kernel/cpu/mshyperv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jinank Jain Jan. 17, 2023, 10:11 a.m. UTC | #1 
Reviewed-by: Jinank Jain <jinankjain@linux.microsoft.com>

On 1/14/2023 7:26 AM, Tom Rix wrote:
> cppcheck reports
> [arch/x86/kernel/cpu/mshyperv.c:44]: (style) The function 'hv_get_nested_reg' is never used.
>
> hv_get_nested_reg() is built unconditially but is only used conditionally in
> hv_get_register() and hv_set_register() by CONFIG_HYPERV.
>
> Move the conditional #if to also include hv_get_nested_reg()
>
> Fixes: 89acd9b2ff8e ("Drivers: hv: Setup synic registers in case of nested root partition")
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
>   arch/x86/kernel/cpu/mshyperv.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
> index b8bb13daacf7..9ca202970569 100644
> --- a/arch/x86/kernel/cpu/mshyperv.c
> +++ b/arch/x86/kernel/cpu/mshyperv.c
> @@ -41,6 +41,7 @@ bool hv_root_partition;
>   bool hv_nested;
>   struct ms_hyperv_info ms_hyperv;
>   
> +#if IS_ENABLED(CONFIG_HYPERV)
>   static inline unsigned int hv_get_nested_reg(unsigned int reg)
>   {
>   	switch (reg) {
> @@ -61,7 +62,6 @@ static inline unsigned int hv_get_nested_reg(unsigned int reg)
>   	}
>   }
>   
> -#if IS_ENABLED(CONFIG_HYPERV)
>   u64 hv_get_non_nested_register(unsigned int reg)
>   {
>   	u64 value;
Wei Liu Jan. 17, 2023, 1:12 p.m. UTC | #2 
On Tue, Jan 17, 2023 at 03:41:18PM +0530, Jinank Jain wrote:
> Reviewed-by: Jinank Jain <jinankjain@linux.microsoft.com>
> 

I will just fold this into the buggy patch since that has not been sent
to Linus.

Thanks Tom and Jinank.

> On 1/14/2023 7:26 AM, Tom Rix wrote:
> > cppcheck reports
> > [arch/x86/kernel/cpu/mshyperv.c:44]: (style) The function 'hv_get_nested_reg' is never used.
> > 
> > hv_get_nested_reg() is built unconditially but is only used conditionally in
> > hv_get_register() and hv_set_register() by CONFIG_HYPERV.
> > 
> > Move the conditional #if to also include hv_get_nested_reg()
> > 
> > Fixes: 89acd9b2ff8e ("Drivers: hv: Setup synic registers in case of nested root partition")
> > Signed-off-by: Tom Rix <trix@redhat.com>
> > ---
> >   arch/x86/kernel/cpu/mshyperv.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
> > index b8bb13daacf7..9ca202970569 100644
> > --- a/arch/x86/kernel/cpu/mshyperv.c
> > +++ b/arch/x86/kernel/cpu/mshyperv.c
> > @@ -41,6 +41,7 @@ bool hv_root_partition;
> >   bool hv_nested;
> >   struct ms_hyperv_info ms_hyperv;
> > +#if IS_ENABLED(CONFIG_HYPERV)
> >   static inline unsigned int hv_get_nested_reg(unsigned int reg)
> >   {
> >   	switch (reg) {
> > @@ -61,7 +62,6 @@ static inline unsigned int hv_get_nested_reg(unsigned int reg)
> >   	}
> >   }
> > -#if IS_ENABLED(CONFIG_HYPERV)
> >   u64 hv_get_non_nested_register(unsigned int reg)
> >   {
> >   	u64 value;
diff mbox series

Patch

diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index b8bb13daacf7..9ca202970569 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -41,6 +41,7 @@  bool hv_root_partition;
 bool hv_nested;
 struct ms_hyperv_info ms_hyperv;
 
+#if IS_ENABLED(CONFIG_HYPERV)
 static inline unsigned int hv_get_nested_reg(unsigned int reg)
 {
 	switch (reg) {
@@ -61,7 +62,6 @@  static inline unsigned int hv_get_nested_reg(unsigned int reg)
 	}
 }
 
-#if IS_ENABLED(CONFIG_HYPERV)
 u64 hv_get_non_nested_register(unsigned int reg)
 {
 	u64 value;