2018-04-24 13:55:52

by Luc Van Oostenryck

Subject: [PATCH] apple-gmux: fix gmux_get_client_id()'s return type

The method struct vga_switcheroo_handler::get_client_id() is defined
as returning an 'enum vga_switcheroo_client_id' but the implementation
in this driver, gmux_get_client_id(), returns an 'int'.

Fix this by returning 'enum vga_switcheroo_client_id' in this driver too.

Signed-off-by: Luc Van Oostenryck <[email protected]>
---
drivers/platform/x86/apple-gmux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c
index 7c4eb86c8..fd2ffebc8 100644
--- a/drivers/platform/x86/apple-gmux.c
+++ b/drivers/platform/x86/apple-gmux.c
@@ -495,7 +495,7 @@ static int gmux_set_power_state(enum vga_switcheroo_client_id id,
return gmux_set_discrete_state(apple_gmux_data, state);
}

-static int gmux_get_client_id(struct pci_dev *pdev)
+static enum vga_switcheroo_client_id gmux_get_client_id(struct pci_dev *pdev)
{
/*
* Early Macbook Pros with switchable graphics use nvidia
--
2.17.0

2018-04-25 14:19:54

by Andy Shevchenko

Subject: Re: [PATCH] apple-gmux: fix gmux_get_client_id()'s return type

On Tue, Apr 24, 2018 at 4:15 PM, Luc Van Oostenryck
<[email protected]> wrote:
> The method struct vga_switcheroo_handler::get_client_id() is defined
> as returning an 'enum vga_switcheroo_client_id' but the implementation
> in this driver, gmux_get_client_id(), returns an 'int'.
>
> Fix this by returning 'enum vga_switcheroo_client_id' in this driver too.
>

Pushed to my review and testing queue, thanks!

> Signed-off-by: Luc Van Oostenryck <[email protected]>
> ---
> drivers/platform/x86/apple-gmux.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c
> index 7c4eb86c8..fd2ffebc8 100644
> --- a/drivers/platform/x86/apple-gmux.c
> +++ b/drivers/platform/x86/apple-gmux.c
> @@ -495,7 +495,7 @@ static int gmux_set_power_state(enum vga_switcheroo_client_id id,
> return gmux_set_discrete_state(apple_gmux_data, state);
> }
>
> -static int gmux_get_client_id(struct pci_dev *pdev)
> +static enum vga_switcheroo_client_id gmux_get_client_id(struct pci_dev *pdev)
> {
> /*
> * Early Macbook Pros with switchable graphics use nvidia
> --
> 2.17.0
>



--
With Best Regards,
Andy Shevchenko