From patchwork Fri Feb 1 01:14:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yasuaki Ishimatsu X-Patchwork-Id: 2076811 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 30AFCDFE75 for ; Fri, 1 Feb 2013 06:47:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 190A8E6AE1 for ; Thu, 31 Jan 2013 22:47:18 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fgwmail6.fujitsu.co.jp (fgwmail6.fujitsu.co.jp [192.51.44.36]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B9CAE6EE5 for ; Thu, 31 Jan 2013 17:14:49 -0800 (PST) Received: from m1.gw.fujitsu.co.jp (unknown [10.0.50.71]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 645B93EE0C1 for ; Fri, 1 Feb 2013 10:14:48 +0900 (JST) Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 4C1DC45DE5D for ; Fri, 1 Feb 2013 10:14:48 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 3324145DE59 for ; Fri, 1 Feb 2013 10:14:48 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 2684E1DB8053 for ; Fri, 1 Feb 2013 10:14:48 +0900 (JST) Received: from g01jpexchyt31.g01.fujitsu.local (g01jpexchyt31.g01.fujitsu.local [10.128.193.114]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id C3F851DB804B for ; Fri, 1 Feb 2013 10:14:47 +0900 (JST) Received: from [127.0.0.1] (10.124.101.33) by g01jpexchyt31.g01.fujitsu.local (10.128.193.114) with Microsoft SMTP Server id 14.2.309.2; Fri, 1 Feb 2013 10:14:44 +0900 X-SecurityPolicyCheck: OK by SHieldMailChecker v1.7.4 Message-ID: <510B16EC.7030903@jp.fujitsu.com> Date: Fri, 1 Feb 2013 10:14:20 +0900 From: Yasuaki Ishimatsu User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: Subject: Re: [UPDATE][PATCH 4/4] GPU/i915: Fix acpi_bus_get_device() check in drivers/gpu/drm/i915/intel_opregion.c References: <1451967.YMyGeCCNtu@vostro.rjw.lan> <6099377.PFvsxPeyib@vostro.rjw.lan> <5109E11A.5030400@jp.fujitsu.com> <5109E2AF.2000107@jp.fujitsu.com> <5109E49E.1070005@jp.fujitsu.com> <20130131100330.GE5885@phenom.ffwll.local> <510B1168.2080401@jp.fujitsu.com> <510B1200.3000509@jp.fujitsu.com> In-Reply-To: <510B1200.3000509@jp.fujitsu.com> X-Mailman-Approved-At: Thu, 31 Jan 2013 22:40:31 -0800 Cc: Toshi Kani , Mika Westerberg , LKML , dri-devel@lists.freedesktop.org, "Rafael J. Wysocki" , ACPI Devel Maling List , Yinghai Lu X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org 2013/02/01 9:53, Yasuaki Ishimatsu wrote: > 2013/02/01 9:50, Yasuaki Ishimatsu wrote: >> 2013/01/31 19:03, Daniel Vetter wrote: >>> On Thu, Jan 31, 2013 at 12:27:26PM +0900, Yasuaki Ishimatsu wrote: >>>> I forgot to change subject. So I resend a patch. >>>> >>>> --- >>>> acpi_bus_get_device() returns int not acpi_status. >>>> >>>> The patch change not to apply ACPI_FAILURE() to the return value of >>>> acpi_bus_get_device(). >>>> >>>> Signed-off-by: Yasuaki Ishimatsu >>> >>> I've tried to apply this to drm-intel-next-queued, but git am didn't >>> really like your patch - it failed to apply. Can you please rebase to the >>> drm-intel-next-queued branch from >>> >>> git://people.freedesktop.org/~danvet/drm-intel >>> >>> and please resubmit the patch, preferrably formatted with git >>> format-patch? >> >> My mailer added a space in the patch. I updated the patch. >> How abot it? >> >> --- >> acpi_bus_get_device() returns int not acpi_status. >> >> The patch change not to apply ACPI_FAILURE() to the return value of >> acpi_bus_get_device(). >> >> Signed-off-by: Yasuaki Ishimatsu >> --- >> drivers/gpu/drm/i915/intel_opregion.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c >> index 7741c22..4d33874 100644 >> --- a/drivers/gpu/drm/i915/intel_opregion.c >> +++ b/drivers/gpu/drm/i915/intel_opregion.c >> @@ -347,7 +347,7 @@ static void intel_didl_outputs(struct drm_device *dev) >> int i = 0; >> >> handle = DEVICE_ACPI_HANDLE(&dev->pdev->dev); >> - if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) >> + if (!handle || acpi_bus_get_device(handle, &acpi_dev)) >> return; >> >> if (acpi_is_video_device(acpi_dev)) >> > > Oops. My mailer added a space again... > I'll check my mailer again. I do not understand why space was added to the patch. So I attached the patch. Please check it. Thanks, Yasuaki Ishimatsu > > Thanks, > Yasuaki Ishimatsu > >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html acpi_bus_get_device() returns int not acpi_status. The patch change not to apply ACPI_FAILURE() to the return value of acpi_bus_get_device(). Signed-off-by: Yasuaki Ishimatsu --- drivers/gpu/drm/i915/intel_opregion.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index 7741c22..4d33874 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c @@ -347,7 +347,7 @@ static void intel_didl_outputs(struct drm_device *dev) int i = 0; handle = DEVICE_ACPI_HANDLE(&dev->pdev->dev); - if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &acpi_dev))) + if (!handle || acpi_bus_get_device(handle, &acpi_dev)) return; if (acpi_is_video_device(acpi_dev))