From nobody Fri Dec 19 00:22:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D56FC4167B for ; Fri, 1 Dec 2023 17:24:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379231AbjLARYt (ORCPT ); Fri, 1 Dec 2023 12:24:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379181AbjLARYN (ORCPT ); Fri, 1 Dec 2023 12:24:13 -0500 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2080C2736 for ; Fri, 1 Dec 2023 09:23:28 -0800 (PST) Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-5c627dd2accso928081a12.0 for ; Fri, 01 Dec 2023 09:23:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701451407; x=1702056207; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=pF1HXnbmSrYchthIdE2P0kzrKumbnX3teWalqa1zpFg=; b=F5QbRUFiAnUl+CmA58PzE2VL2S0EWPi732gmuGSDf7TKZtymWuH/KgeMsMSldaQTkL 7O76c1DoHzUWF2DfCjweg8yz7zZv21ySNClcjv5rKbR1zV+P0cv9D+l7thjMRUR+tQTb mkP4unOdzdgEquKhGe80WlEZTPa6vjFGJx1yivPSgs5givJfDwdgfM1vVfsRfbgwG/YA BM2RWBZxDyRFt0uvSRAr9x98BF34g8pf/0L6hzV30LnAMadV++gNZTnUkvVIdbB4A/zU W4tkV4xFahdU8U9ManfEn2ZitYa/VMHdN+XUmmzWOE9JfBn+Bk2d0/YnCkOrtVWO9EdM fKDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701451407; x=1702056207; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pF1HXnbmSrYchthIdE2P0kzrKumbnX3teWalqa1zpFg=; b=umqVVEZu6oqpEwutKBBc3aBYQ5yFM9mWNWu/78NS7Wx6tAOWwmm9+LJ/ml8QoO2XQe /jWtmxbHmbUVZXGRDIUYWNcVSxgW+/SP5ZSD4B6cyAbJ4PjKmqt2ReqVwIiiNPysmev3 JQfY6aKXGJp1xoct/CKne9quyAzOBJVDxNonzleKkqI77RhccQDHeScB4BNhmZL6QftR gWp95wtJdmEXwpiDQcRUk+tW5+TC0xsIM/HSZsPsLLPtGOB8I1u0MO3vKpqMGeyEvrAy TPYie1FwtaRC1GRNW4GwQAcGDCxOG5jXuFTB7x5MI+ADIkWS0kug4hLAC2KB+xkNxRwW VaSQ== X-Gm-Message-State: AOJu0YwMW+KhvBijXLPV6fMCdVa5nj+lLIWjdluvGC3H2ru3tBeIkFIQ EauLOZrBIcknY/fk2r6+2OuvTCiPw58L7w== X-Google-Smtp-Source: AGHT+IHGjfY5XTrK9i72lt1Po9ugG7UBlXvPtE0jY1V4k8nhhcjmWPgtcgyZfDrCVYTGCv+s3fb14BSFs1yWBQ== X-Received: from xllamas.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5070]) (user=cmllamas job=sendgmr) by 2002:a63:2218:0:b0:5be:123c:5fc with SMTP id i24-20020a632218000000b005be123c05fcmr3883861pgi.10.1701451407544; Fri, 01 Dec 2023 09:23:27 -0800 (PST) Date: Fri, 1 Dec 2023 17:21:53 +0000 In-Reply-To: <20231201172212.1813387-1-cmllamas@google.com> Mime-Version: 1.0 References: <20231201172212.1813387-1-cmllamas@google.com> X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog Message-ID: <20231201172212.1813387-25-cmllamas@google.com> Subject: [PATCH v2 24/28] binder: collapse print_binder_buffer() into caller From: Carlos Llamas To: Greg Kroah-Hartman , "=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Christian Brauner , Carlos Llamas , Suren Baghdasaryan Cc: linux-kernel@vger.kernel.org, kernel-team@android.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The code in print_binder_buffer() is quite small so it can be collapsed into its single caller binder_alloc_print_allocated(). No functional change in this patch. Signed-off-by: Carlos Llamas Reviewed-by: Alice Ryhl --- drivers/android/binder_alloc.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c index edd9714ec9f5..60c829506d31 100644 --- a/drivers/android/binder_alloc.c +++ b/drivers/android/binder_alloc.c @@ -978,16 +978,6 @@ void binder_alloc_deferred_release(struct binder_alloc= *alloc) __func__, alloc->pid, buffers, page_count); } =20 -static void print_binder_buffer(struct seq_file *m, const char *prefix, - struct binder_buffer *buffer) -{ - seq_printf(m, "%s %d: %lx size %zd:%zd:%zd %s\n", - prefix, buffer->debug_id, buffer->user_data, - buffer->data_size, buffer->offsets_size, - buffer->extra_buffers_size, - buffer->transaction ? "active" : "delivered"); -} - /** * binder_alloc_print_allocated() - print buffer info * @m: seq_file for output via seq_printf() @@ -999,12 +989,18 @@ static void print_binder_buffer(struct seq_file *m, c= onst char *prefix, void binder_alloc_print_allocated(struct seq_file *m, struct binder_alloc *alloc) { + struct binder_buffer *buffer; struct rb_node *n; =20 mutex_lock(&alloc->mutex); - for (n =3D rb_first(&alloc->allocated_buffers); n !=3D NULL; n =3D rb_nex= t(n)) - print_binder_buffer(m, " buffer", - rb_entry(n, struct binder_buffer, rb_node)); + for (n =3D rb_first(&alloc->allocated_buffers); n; n =3D rb_next(n)) { + buffer =3D rb_entry(n, struct binder_buffer, rb_node); + seq_printf(m, " buffer %d: %lx size %zd:%zd:%zd %s\n", + buffer->debug_id, buffer->user_data, + buffer->data_size, buffer->offsets_size, + buffer->extra_buffers_size, + buffer->transaction ? "active" : "delivered"); + } mutex_unlock(&alloc->mutex); } =20 --=20 2.43.0.rc2.451.g8631bc7472-goog