aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Van Oostenryck <luc.vanoostenryck@gmail.com>2018-04-24 09:15:41 -0400
committerAlex Deucher <alexander.deucher@amd.com>2018-05-15 14:43:51 -0400
commit4a8f264a8a8756bb7d3a478d08e449c67d291ab9 (patch)
tree1cd0cf3eb52621d8f45856fe4ba760afb003449c
parent09daf474d27aeb9fbd2f665b613d98c76f1e84f0 (diff)
drm/radeon: fix radeon_atpx_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, radeon_atpx_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: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/radeon/radeon_atpx_handler.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
index 40be4068ca69..fa5fadaa9bbb 100644
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
@@ -526,7 +526,7 @@ static int radeon_atpx_init(void)
526 * look up whether we are the integrated or discrete GPU (all asics). 526 * look up whether we are the integrated or discrete GPU (all asics).
527 * Returns the client id. 527 * Returns the client id.
528 */ 528 */
529static int radeon_atpx_get_client_id(struct pci_dev *pdev) 529static enum vga_switcheroo_client_id radeon_atpx_get_client_id(struct pci_dev *pdev)
530{ 530{
531 if (radeon_atpx_priv.dhandle == ACPI_HANDLE(&pdev->dev)) 531 if (radeon_atpx_priv.dhandle == ACPI_HANDLE(&pdev->dev))
532 return VGA_SWITCHEROO_IGD; 532 return VGA_SWITCHEROO_IGD;