From patchwork Sat Oct 22 07:29:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7751 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1113798wrr; Sat, 22 Oct 2022 02:04:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5x+4lIUz932KHu+cOBUVJSDNFlCAK50/6dL1tdo4A80SsA0ruTrFxrWelcy4R9SCtSnEgp X-Received: by 2002:a63:a5f:0:b0:46e:c9cf:e702 with SMTP id z31-20020a630a5f000000b0046ec9cfe702mr4474306pgk.198.1666429484137; Sat, 22 Oct 2022 02:04:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666429484; cv=none; d=google.com; s=arc-20160816; b=F6i6Cug9lT/h7dEypf428CAax6Wb6yE5Z9Ru8un/tlvy1flI6LPFrPuBhkB6J2G0xu Kw/GXKeOVdARbR7zjT4ag+CiVPdmSAVyQLQJW1hPQEBo6KMAKPUeUX8ng5fQf8jTs/jQ Eod6yTohWSHL0HeCDD9x8BUlpKmtDOGkzc5zqqTqKMLfl6FFYg+4J/M6CoI/s1gWz+tU /OBDZkv1D4KufQKp6lYSZ3bkBMaZKMRPAIaf8ILt4rxwpfpVWMab7pls6MMgWrzYmytO DoK1Ezf0t4zUciflWvheR5m9YmX4y9ufT5LbAcUolRNCj7ueZg/fHAtHW48AtK592EkM sr/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2to1ioURcdvHsxBAdafFL1M/LwatrfPD9G9nU3C4g7E=; b=FGI2UQn4cjg2M37xyl6LeQzboPKqaMwgXY0pJdG5NT4LYq0tL9lUNKwNd77ghwhtkB kemKBvaOtoe0peZyElHGpHHBPoJ35ccVXqw5CpsIYZzPAx0IRqJSHrVHVKrKGHq62jdn lvBW7POPIijzkzcCOBF+ASMHsCf3/prvsuTR3oJv4PWEaGOuUbnnLD5vTF5Ul+T1XSAe UeD032K5qaDdlsLsFzBouNgfbEbOZGTIH9ZUqu3s+sou2jeHkgdeKlSHZuUR59yZu1Ig q2L6mORwnKz5GkpXjwxq8Xlr0W8SqASiwMGv/LxigEySNwgmqZ0yw20vDo9hi7vhErgt qvHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=We9RWXtK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n3-20020a632703000000b0043ac3ec9d9csi29227370pgn.758.2022.10.22.02.04.31; Sat, 22 Oct 2022 02:04:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=We9RWXtK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234969AbiJVIzl (ORCPT + 99 others); Sat, 22 Oct 2022 04:55:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235184AbiJVIyl (ORCPT ); Sat, 22 Oct 2022 04:54:41 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC3292F5844; Sat, 22 Oct 2022 01:13:37 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 45B85B82E49; Sat, 22 Oct 2022 08:08:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 746A5C433D6; Sat, 22 Oct 2022 08:08:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666426093; bh=crSfYZdlpZpIdRFdSPKQ20saC6ktN5bPHpKGg0bi5tU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=We9RWXtKsE3dYEfDC8eVI7zTjixvCPN9zdbCvWIjqeuIqC2mUEfkTLdQAq5AQaSPv plFxdkV0hi9iY4+GMMn+AxegOLSfI7cLHWTraTsdok+yDUVkXlU2PauFxw28A6NQR2 6blr8OUAFuAFPnJJ3QgAwXqqgeV7/Ux90BcQOSu8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= , Jani Nikula Subject: [PATCH 5.19 715/717] drm/i915: Rename block_size()/block_offset() Date: Sat, 22 Oct 2022 09:29:54 +0200 Message-Id: <20221022072530.098549125@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747377963107093372?= X-GMAIL-MSGID: =?utf-8?q?1747377963107093372?= From: Ville Syrjälä commit 39b1bc4b5bcccac781267bb826b035fbb99c8b9d upstream. Give block_size()/block_offset() a "raw_" prefix since they both operate on the "raw" (as in not duplicated) BDB block contents. What actually spurred this was a conflict between intel_bios.c block_size() vs. block_size() from blkdev.h. That only happened to me on a custom tree where we somehow manage to include blkdev.h into intel_bios.c. But I think the rename makes sense anyway to clarify the purpose of these functions. Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20220519140010.10600-1-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/display/intel_bios.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -123,7 +123,7 @@ find_raw_section(const void *_bdb, enum * Offset from the start of BDB to the start of the * block data (just past the block header). */ -static u32 block_offset(const void *bdb, enum bdb_block_id section_id) +static u32 raw_block_offset(const void *bdb, enum bdb_block_id section_id) { const void *block; @@ -135,7 +135,7 @@ static u32 block_offset(const void *bdb, } /* size of the block excluding the header */ -static u32 block_size(const void *bdb, enum bdb_block_id section_id) +static u32 raw_block_size(const void *bdb, enum bdb_block_id section_id) { const void *block; @@ -232,7 +232,7 @@ static bool validate_lfp_data_ptrs(const int data_block_size, lfp_data_size; int i; - data_block_size = block_size(bdb, BDB_LVDS_LFP_DATA); + data_block_size = raw_block_size(bdb, BDB_LVDS_LFP_DATA); if (data_block_size == 0) return false; @@ -309,7 +309,7 @@ static bool fixup_lfp_data_ptrs(const vo u32 offset; int i; - offset = block_offset(bdb, BDB_LVDS_LFP_DATA); + offset = raw_block_offset(bdb, BDB_LVDS_LFP_DATA); for (i = 0; i < 16; i++) { if (ptrs->ptr[i].fp_timing.offset < offset ||