summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLuc Van Oostenryck <luc.vanoostenryck@gmail.com>2018-04-24 15:15:43 +0200
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>2018-04-24 18:55:33 +0200
commit19e752052b9dd5b1ab901f1982b5d2ae7c188ca2 (patch)
treea45d188fab13af61ec38b20ceec9d7ef6f760511 /drivers
parentplatform/x86: Kconfig: Fix dell-laptop dependency chain. (diff)
downloadlinux-19e752052b9dd5b1ab901f1982b5d2ae7c188ca2.tar.xz
linux-19e752052b9dd5b1ab901f1982b5d2ae7c188ca2.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/apple-gmux.c2
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,
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