From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36813C433ED for ; Mon, 19 Apr 2021 10:43:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 120A96101E for ; Mon, 19 Apr 2021 10:43:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232055AbhDSKnk (ORCPT ); Mon, 19 Apr 2021 06:43:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229537AbhDSKnf (ORCPT ); Mon, 19 Apr 2021 06:43:35 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 516B8C06174A for ; Mon, 19 Apr 2021 03:43:04 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id z5so3570172edr.11 for ; Mon, 19 Apr 2021 03:43:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=toGvDtMWhMDYlPHFOwwA+K972K5Nm/twg4hNfuZONK8=; b=i4haUFMAsLCC0tNC+XnDfjdSsLhN08jIapT0VisQ9lskMtKK1Jwhzqky7Qjr6qLx6Y p3i90RJ3IIVe5/sCH9QudKZ5xrnMZa+1meWz59lHu4BT8/jZIt1jmW0IrqP/SJ9TPDxz hBuWk7+tDOxGRHQX1y1rplTBXzkn6WTNC9P7E= 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:mime-version :content-transfer-encoding; bh=toGvDtMWhMDYlPHFOwwA+K972K5Nm/twg4hNfuZONK8=; b=GUTTO5SJr+AFdUm9DBhELMDmFro7j4clGu7IWMeQeyXQP1eO56aFLQ8SKPDMh/d/W8 9WDD/6zJvWbZs+5iRplUkJkxLsLJLfS+qG0a6syYNX55ZkA3swS9ei6+9CY9irt5lE30 RdcZ5h9S2Y9n6+5a77DfH/tbPMQlyElpJtAjuaap1C6tpov+8qcUkWgl3bLc71ycYsbt cRrrFS2km76OsmMIPTpGK0qwF9KtB1pXrxIHoOLOnlOo+n6zjzpPJNmH7GgrL8pWsqV1 8kXvMm2mRO/UVyeZJprxPkvHYAdS0esJ04MHiGABfCPH2//leKz06yu4mDpIkxuQ0eYD VtZw== X-Gm-Message-State: AOAM532F5bczuRORdkTUjJyJF5Z+1nxYdWgZgoj2pjUGAVoybrkR5EOG dbA3iT9SnlSWwnsPsuljLtxPIQ== X-Google-Smtp-Source: ABdhPJwqrtV7X+IYms1vvRKDl/1gqU2/QCLUUPSftWG0W2AHaImnxbgWGCg59YtsOyGfJfHeJl6LMg== X-Received: by 2002:aa7:cc94:: with SMTP id p20mr25005010edt.353.1618828982889; Mon, 19 Apr 2021 03:43:02 -0700 (PDT) Received: from prevas-ravi.prevas.se ([80.208.71.248]) by smtp.gmail.com with ESMTPSA id mm8sm10094623ejb.28.2021.04.19.03.43.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 03:43:02 -0700 (PDT) From: Rasmus Villemoes To: Greg Kroah-Hartman , "Rafael J. Wysocki" Cc: Andrzej Hajda , Rasmus Villemoes , linux-kernel@vger.kernel.org Subject: [PATCH] driver core: make device_set_deferred_probe_reason a no-op when !CONFIG_DEBUG_FS Date: Mon, 19 Apr 2021 12:42:56 +0200 Message-Id: <20210419104256.1709253-1-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When debugfs is not enabled, the deferred_probe_reason string is never read. So there's no reason to spend time and memory on recording it. There's still a bunch of redundant kfree(NULL) calls and NULL assignments, but this gives most of the benefit (avoiding two vsnprintf() and a kmalloc()) for the minimal amount of ifdeffery. Signed-off-by: Rasmus Villemoes --- drivers/base/dd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 37a5e5f8b221..6a197336c6a4 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -216,9 +216,13 @@ void device_unblock_probing(void) * device_set_deferred_probe_reason() - Set defer probe reason message for device * @dev: the pointer to the struct device * @vaf: the pointer to va_format structure with message + * + * The ->deferred_probe_reason string is only ever read when debugfs + * is enabled, so this is a no-op for !CONFIG_DEBUG_FS. */ void device_set_deferred_probe_reason(const struct device *dev, struct va_format *vaf) { +#ifdef CONFIG_DEBUG_FS const char *drv = dev_driver_string(dev); mutex_lock(&deferred_probe_mutex); @@ -227,6 +231,7 @@ void device_set_deferred_probe_reason(const struct device *dev, struct va_format dev->p->deferred_probe_reason = kasprintf(GFP_KERNEL, "%s: %pV", drv, vaf); mutex_unlock(&deferred_probe_mutex); +#endif } /* -- 2.29.2