From patchwork Wed Aug 24 16:03:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Auld X-Patchwork-Id: 9298037 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4E7CC607F0 for ; Wed, 24 Aug 2016 16:04:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F2D5290DC for ; Wed, 24 Aug 2016 16:04:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 31ADA290DF; Wed, 24 Aug 2016 16:04:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AE6CE290DC for ; Wed, 24 Aug 2016 16:04:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A00E96E8EF; Wed, 24 Aug 2016 16:04:53 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id A3C346E8EF for ; Wed, 24 Aug 2016 16:04:52 +0000 (UTC) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP; 24 Aug 2016 09:04:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,571,1464678000"; d="scan'208";a="870504027" Received: from mwahaha.ld.intel.com ([10.103.238.160]) by orsmga003.jf.intel.com with ESMTP; 24 Aug 2016 09:04:51 -0700 From: Matthew Auld To: intel-gfx@lists.freedesktop.org Date: Wed, 24 Aug 2016 17:03:11 +0100 Message-Id: <1472054591-29619-1-git-send-email-matthew.auld@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [Intel-gfx] [PATCH] drm/i915: fix comment referencing imaginary functions X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP The comment which documents the proper usage of the *_FW family of macros makes reference to intel_uncore_forcewake_irq{unlock, lock}, which is just confusing, seeing as such a set of functions don't even exist and never have for that matter(according to git). Let's fix that by replacing them with intel_uncore_forcewake_{get, put}. Cc: Chris Wilson Signed-off-by: Matthew Auld Reviewed-by: Arkadiusz Hiler --- drivers/gpu/drm/i915/i915_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index ff96b7a..c285d61 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3792,8 +3792,8 @@ __raw_write(64, q) * critical sections inside IRQ handlers where forcewake is explicitly * controlled. * Think twice, and think again, before using these. - * Note: Should only be used between intel_uncore_forcewake_irqlock() and - * intel_uncore_forcewake_irqunlock(). + * Note: Should only be used between intel_uncore_forcewake_get and + * intel_uncore_forcewake_put. */ #define I915_READ_FW(reg__) __raw_i915_read32(dev_priv, (reg__)) #define I915_WRITE_FW(reg__, val__) __raw_i915_write32(dev_priv, (reg__), (val__))