diff options
| author | Luc Van Oostenryck <luc.vanoostenryck@gmail.com> | 2018-04-24 09:15:43 -0400 |
|---|---|---|
| committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2018-04-24 12:55:33 -0400 |
| commit | 19e752052b9dd5b1ab901f1982b5d2ae7c188ca2 (patch) | |
| tree | a45d188fab13af61ec38b20ceec9d7ef6f760511 | |
| parent | 6ed66c3ce095ae65bbc976b5817c318653745736 (diff) | |
platform/x86: 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 <luc.vanoostenryck@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
| -rw-r--r-- | drivers/platform/x86/apple-gmux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c index 7c4eb86c851e..fd2ffebc868f 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, | |||
| 495 | return gmux_set_discrete_state(apple_gmux_data, state); | 495 | return gmux_set_discrete_state(apple_gmux_data, state); |
| 496 | } | 496 | } |
| 497 | 497 | ||
| 498 | static int gmux_get_client_id(struct pci_dev *pdev) | 498 | static enum vga_switcheroo_client_id gmux_get_client_id(struct pci_dev *pdev) |
| 499 | { | 499 | { |
| 500 | /* | 500 | /* |
| 501 | * Early Macbook Pros with switchable graphics use nvidia | 501 | * Early Macbook Pros with switchable graphics use nvidia |