Received: by 10.192.165.148 with SMTP id m20csp4686764imm; Tue, 24 Apr 2018 06:55:52 -0700 (PDT) X-Google-Smtp-Source: AIpwx49fLhl4cpktFHmbNyMxHCj+lVatnrvtlnUe14NBmZ6mBs8F3Q71+EUhn52w93ZevFLL9PYc X-Received: by 2002:a17:902:6c07:: with SMTP id q7-v6mr25463052plk.67.1524578152305; Tue, 24 Apr 2018 06:55:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524578152; cv=none; d=google.com; s=arc-20160816; b=GshAV2PQ+xD4cLIgYprG4xsAmfzURnuYTU8WtVfzde1IBCXhlT7+L9dYyHNxWUYsIt PlO41dxG1mnK8vyRJAlhlxRsyiOaVcCyHqlUHMan+9RCLfNm/iXF32rMG2fpQKKf1V9z xhsMj46NtwUWkpwYOBQVoKSztAhEfhEVEU9l/ZQcGCwCgfT1aeEcOgjXE/d/kEgDE0Uk 2ejUZFx4RQdedM57V+vdtvIK9W5zC/DUTnm8tJ343YX3v3/1HcNXzMvVywYbMQXQ6Lv5 rXxa3L2bxg71s2b8twd/LNZ00n3ZPJphJI47xnd05QbiozjJ2p2tT0mlNSe3WKkTUGhd 2QBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=822f2XMKXam7muz1PV1znryj8syrhqvSfL8dlt5d0PU=; b=YiQ7BfSkKhnlEj8aYVCv/o+WK6SCvvIYyxHie+D6DhAHoqLP0u633hWid3YGZifPLl zE4dP1V1sYkG8o1PbLKJQcZ4kcR64e9HFlxF8t004U6HVi1DHLw3nYC/9G9JkM/7ZYq8 kovbXURIQz8aTftlpeG24kYBNUUbOQdCV/eK9vZfRJEF4QH3zg3EC7dHxcdvYAWSIbTA w51Za//crmX+LwK2ZDa21Y2Glf/hYQ40cLpv+VimRY6l/d9UxDgvSjqpi+E5AuxJKEKT Ye3NOoNj/FEAS0iWCxbPveSCJ70EEehSgpEHaSeXm7QQgy5d2jxo2G4pDnN8b15zlQHF VaqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=n7UNLMKd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c184si13180679pfc.367.2018.04.24.06.55.37; Tue, 24 Apr 2018 06:55:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=n7UNLMKd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933561AbeDXNPx (ORCPT + 99 others); Tue, 24 Apr 2018 09:15:53 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:36587 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933537AbeDXNPq (ORCPT ); Tue, 24 Apr 2018 09:15:46 -0400 Received: by mail-wm0-f65.google.com with SMTP id n10so791803wmc.1; Tue, 24 Apr 2018 06:15:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=822f2XMKXam7muz1PV1znryj8syrhqvSfL8dlt5d0PU=; b=n7UNLMKdbmpM+EGpjyZ8NDCwawzn5Ce77f2Brdfcif2s8XDaAmH86kw8J7pHb0q6Uq cj5VWQ9vysZLVhV/7siT+Uc14Vu4aKmblFzcXWETw/YqxTHImCUO5QNgerql+33eLuPJ Wla7Uu1SIT6W3+9y8SobN7v/WM3QSDGBztVbNlunKZVdfrOBg4AmDHzeOpr3XfgFAodw o+XKNGnIU7dGFVRDH4gdup2+g6LAu8QzYLr86zrUdV8s/b5cS0pmJGyfcwy8cKGDgRLB /QfcxkC1WHLNAT9VvLQvqYDOKuoiKPO7O1HXFTNNxEtAtPvcbSgZAUz8LDj1jlgubt1T CXFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=822f2XMKXam7muz1PV1znryj8syrhqvSfL8dlt5d0PU=; b=GcdqDdOHhTAbc7wirPg9TMqkeOYzuv/ZICHc/Y3crFvE2EZmqYbscahjaiBLvdze9I ypAkunnFLXuzipR5B3XrqKWqIq4vB/Rs/g+0KdGqiHXMbLmh18ey2CrRLORRw+Qo6hMU sWcONYKxG6/rdO+3z/WRiiisqBV2O0UzRGPuRZS3YGo/6YsqIJ8Y7FwVnl9wp9s9QKN2 BwxrJ+hmMpnR3HevnrHnmoVFcqg1NH3f/jzM+px89AdlwfgdzvuFJbp4CekdR9EKHi0G jXoZ3zNMQZ+CImFRmop4ZLJdHyCWIlj6SLg3Fkp0FXYHa5qmm7vi6LkFIC4b5BAOHMGq Q1ig== X-Gm-Message-State: ALQs6tD0IAYvirzAUtpZ04xPIi9ybbNoK+ct7c9/QI5abrn5UjoXTmjh DA+RZerhi9RZdmHOxMzZ8+X5CAxKnDM= X-Received: by 10.80.231.21 with SMTP id a21mr33310339edn.286.1524575744714; Tue, 24 Apr 2018 06:15:44 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:40e7:cd00:5113:f351:d61c:108c]) by smtp.gmail.com with ESMTPSA id z11sm9486165edj.89.2018.04.24.06.15.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 06:15:44 -0700 (PDT) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Cc: Luc Van Oostenryck , Darren Hart , Andy Shevchenko , platform-driver-x86@vger.kernel.org Subject: [PATCH] apple-gmux: fix gmux_get_client_id()'s return type Date: Tue, 24 Apr 2018 15:15:43 +0200 Message-Id: <20180424131543.2761-1-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.17.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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