From patchwork Wed Feb 8 15:11:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 54455 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3517410wrn; Wed, 8 Feb 2023 07:25:22 -0800 (PST) X-Google-Smtp-Source: AK7set9MWh6XOdxb9qGFEav3IKuFPruXcT3u5J1yZ3yGe002yeKhMs6Q21iR+Lq5W/ZyeJ7OlVSI X-Received: by 2002:a17:906:1d2:b0:893:526b:c77b with SMTP id 18-20020a17090601d200b00893526bc77bmr8038619ejj.7.1675869922195; Wed, 08 Feb 2023 07:25:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675869922; cv=none; d=google.com; s=arc-20160816; b=Orqk+Dvpm3DoudokvSD2XTrfbD4aGwaq6DKeDY8GtsgutWa2ux4VJxnl38ErBDWBQD 3/dG17jGoKk2AgAhHJbaaPw0jV6AM5GlYiIVJGWzaGnL6r+9RDQOJMumqsCIyE3Z3lWA 6TQGUvmpoiVmBNJ4I4nx9RHd017V34k29hKW03zQFzi8WhcYdUYxlIPUK0ZKra3Omll0 D8H6LWUg6BTGn/BJP1OhxkFvRZVSKvQWJSoPsZa7o/kmUhvvuV9EoYzxIFmNBU9pUOLP FHdYqE1vBFcbaT8GcmDp4J/5rs1RaRFXFG4recleBsyFDGdxaI6yF6I5oVW5kIDip8Fy Durg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=aruwxogAbd7R64hOq5poEnS9oBfDMwIqUltKE5bge6A=; b=ibw+/JDtWxuPTGrBageBb8cqSmxjQa4E8pixoAoSBqu9/7ZPebU1I0//J/1rj15WCz UEiTyAmsRXxx//kBIfYmL19QSsi02Abg6YoJLw5NpMl/tlP6WnWLbetS29BM/lwdk+Fz sERkwpvsv0Dr4EBMSZLhGB/A7ZKkNhPfIGDtyF8H3Res9eQAEEDul2bypXY0ZUQ5TqJD eyW3DydLfGVWlvF+0H2TLsHblQs8SoiU+pZs+3CAJE+nLD3AbVCPfe1WPuIBp/2i62c2 zyhMBZtCUoxbXt1QIsPvlnorVD5wVJWbk81o5MJ4HVV1EcYSQjwMTATTDI7oYLRm8vSK XRTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=oFbrVtI8; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e13-20020a170906748d00b0086f3e470d23si23248684ejl.723.2023.02.08.07.24.59; Wed, 08 Feb 2023 07:25:22 -0800 (PST) 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=@intel.com header.s=Intel header.b=oFbrVtI8; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231788AbjBHPPJ (ORCPT + 99 others); Wed, 8 Feb 2023 10:15:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231744AbjBHPO6 (ORCPT ); Wed, 8 Feb 2023 10:14:58 -0500 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CBDC16ADD; Wed, 8 Feb 2023 07:14:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675869297; x=1707405297; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qdeP526/pU66HQlswFPVV6tWqeMSCXdda5mdSvOrkgw=; b=oFbrVtI8+JVq8BKRDV2YKFPjO2JtjdZsHqsjNw/LHhUZDZJ1zBGm8sYv zEKuuoeOzoXJIsBKYJBiWFu8qLeZelOoUMFBma+GEXklT+qnf3j6DZE9n ZZ/yR4xQQ7OA7Tum9NrJ9dk3TKs+diKMtiqr2Fww/L1LC15OA6+Phcn4U PqNjPI0bJwAyNEX5KTQa9IvsXR24eE0JxAscX55vQ9o7uj4gdBM0Fb4cs Eq/PwfYvkTTsEt6bpc0RX69f4L1SjqAtvKc1ijuBp/lG9T/GNxUdUdVBH xegJgOOEcwVnZfspSNP5tHOHi7zMBO/tJyLYC6aqdqzX1rfL9+LoaU7Zm A==; X-IronPort-AV: E=McAfee;i="6500,9779,10615"; a="357218239" X-IronPort-AV: E=Sophos;i="5.97,281,1669104000"; d="scan'208";a="357218239" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Feb 2023 07:10:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10615"; a="730898827" X-IronPort-AV: E=Sophos;i="5.97,281,1669104000"; d="scan'208";a="730898827" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 08 Feb 2023 07:10:54 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 2878337D; Wed, 8 Feb 2023 17:11:31 +0200 (EET) From: Andy Shevchenko To: Mathias Nyman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mathias Nyman , Greg Kroah-Hartman , Andy Shevchenko Subject: [PATCH v2 7/7] xhci: mem: Join string literals back Date: Wed, 8 Feb 2023 17:11:29 +0200 Message-Id: <20230208151129.28987-8-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230208151129.28987-1-andriy.shevchenko@linux.intel.com> References: <20230208151129.28987-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE 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?1757276979146975864?= X-GMAIL-MSGID: =?utf-8?q?1757276979146975864?= For easy grepping on debug purposes join string literals back in the messages. No functional change. Signed-off-by: Andy Shevchenko --- drivers/usb/host/xhci-mem.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index 67ac02d177b5..7e106bd804ca 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -607,8 +607,7 @@ struct xhci_stream_info *xhci_alloc_stream_info(struct xhci_hcd *xhci, int ret; struct device *dev = xhci_to_hcd(xhci)->self.sysdev; - xhci_dbg(xhci, "Allocating %u streams and %u " - "stream context array entries.\n", + xhci_dbg(xhci, "Allocating %u streams and %u stream context array entries.\n", num_streams, num_stream_ctxs); if (xhci->cmd_ring_reserved_trbs == MAX_RSVD_CMD_TRBS) { xhci_dbg(xhci, "Command ring has no reserved TRBs available\n"); @@ -1950,8 +1949,7 @@ static void xhci_set_hc_event_deq(struct xhci_hcd *xhci, struct xhci_interrupter deq = xhci_trb_virt_to_dma(ir->event_ring->deq_seg, ir->event_ring->dequeue); if (!deq) - xhci_warn(xhci, "WARN something wrong with SW event ring " - "dequeue ptr.\n"); + xhci_warn(xhci, "WARN something wrong with SW event ring dequeue ptr.\n"); /* Update HC event ring dequeue pointer */ temp = xhci_read_64(xhci, &ir->ir_set->erst_dequeue); temp &= ERST_PTR_MASK; @@ -1960,8 +1958,7 @@ static void xhci_set_hc_event_deq(struct xhci_hcd *xhci, struct xhci_interrupter */ temp &= ~ERST_EHB; xhci_dbg_trace(xhci, trace_xhci_dbg_init, - "// Write event ring dequeue pointer, " - "preserving EHB bit"); + "// Write event ring dequeue pointer, preserving EHB bit"); xhci_write_64(xhci, ((u64) deq & (u64) ~ERST_PTR_MASK) | temp, &ir->ir_set->erst_dequeue); } @@ -1994,8 +1991,7 @@ static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports, } else if (major_revision <= 0x02) { rhub = &xhci->usb2_rhub; } else { - xhci_warn(xhci, "Ignoring unknown port speed, " - "Ext Cap %p, revision = 0x%x\n", + xhci_warn(xhci, "Ignoring unknown port speed, Ext Cap %p, revision = 0x%x\n", addr, major_revision); /* Ignoring port protocol we can't understand. FIXME */ return; @@ -2010,9 +2006,8 @@ static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports, port_offset = XHCI_EXT_PORT_OFF(temp); port_count = XHCI_EXT_PORT_COUNT(temp); xhci_dbg_trace(xhci, trace_xhci_dbg_init, - "Ext Cap %p, port offset = %u, " - "count = %u, revision = 0x%x", - addr, port_offset, port_count, major_revision); + "Ext Cap %p, port offset = %u, count = %u, revision = 0x%x", + addr, port_offset, port_count, major_revision); /* Port count includes the current port offset */ if (port_offset == 0 || (port_offset + port_count - 1) > num_ports) /* WTF? "Valid values are ‘1’ to MaxPorts" */ @@ -2069,10 +2064,8 @@ static void xhci_add_in_port(struct xhci_hcd *xhci, unsigned int num_ports, struct xhci_port *hw_port = &xhci->hw_ports[i]; /* Duplicate entry. Ignore the port if the revisions differ. */ if (hw_port->rhub) { - xhci_warn(xhci, "Duplicate port entry, Ext Cap %p," - " port %u\n", addr, i); - xhci_warn(xhci, "Port was marked as USB %u, " - "duplicated as USB %u\n", + xhci_warn(xhci, "Duplicate port entry, Ext Cap %p, port %u\n", addr, i); + xhci_warn(xhci, "Port was marked as USB %u, duplicated as USB %u\n", hw_port->rhub->maj_rev, major_revision); /* Only adjust the roothub port counts if we haven't * found a similar duplicate. @@ -2411,8 +2404,8 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) val = readl(&xhci->cap_regs->db_off); val &= DBOFF_MASK; xhci_dbg_trace(xhci, trace_xhci_dbg_init, - "// Doorbell array is located at offset 0x%x" - " from cap regs base addr", val); + "// Doorbell array is located at offset 0x%x from cap regs base addr", + val); xhci->dba = (void __iomem *) xhci->cap_regs + val; /* Set ir_set to interrupt register set 0 */