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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_SANE_1 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 69EB7C4338F for ; Sat, 21 Aug 2021 20:48:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4406661037 for ; Sat, 21 Aug 2021 20:48:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230102AbhHUUtY (ORCPT ); Sat, 21 Aug 2021 16:49:24 -0400 Received: from mxout02.lancloud.ru ([45.84.86.82]:50228 "EHLO mxout02.lancloud.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229833AbhHUUtX (ORCPT ); Sat, 21 Aug 2021 16:49:23 -0400 Received: from LanCloud DKIM-Filter: OpenDKIM Filter v2.11.0 mxout02.lancloud.ru 049DB22F1230 Received: from LanCloud Received: from LanCloud Received: from LanCloud To: Greg Kroah-Hartman , From: Sergey Shtylyov Subject: [PATCH] usb: core: hcd: merge repetitive strings in usb_hcd_request_irqs() Organization: Open Mobile Platform Message-ID: Date: Sat, 21 Aug 2021 23:48:38 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [192.168.11.198] X-ClientProxiedBy: LFEXT01.lancloud.ru (fd00:f066::141) To LFEX1907.lancloud.ru (fd00:f066::207) Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Two dev_info() calls in usb_hcd_request_irqs() have the same "io " strings needlessly repeated. Merge these strings into the format strings of those dev_info() calls... Signed-off-by: Sergey Shtylyov --- The patch is against the 'usb-next' branch of Greg KH's 'usb.git' repo... drivers/usb/core/hcd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) Index: usb/drivers/usb/core/hcd.c =================================================================== --- usb.orig/drivers/usb/core/hcd.c +++ usb/drivers/usb/core/hcd.c @@ -2730,16 +2730,16 @@ static int usb_hcd_request_irqs(struct u return retval; } hcd->irq = irqnum; - dev_info(hcd->self.controller, "irq %d, %s 0x%08llx\n", irqnum, - (hcd->driver->flags & HCD_MEMORY) ? - "io mem" : "io base", - (unsigned long long)hcd->rsrc_start); + dev_info(hcd->self.controller, "irq %d, io %s 0x%08llx\n", + irqnum, (hcd->driver->flags & HCD_MEMORY) ? + "mem" : "base", + (unsigned long long)hcd->rsrc_start); } else { hcd->irq = 0; if (hcd->rsrc_start) - dev_info(hcd->self.controller, "%s 0x%08llx\n", + dev_info(hcd->self.controller, "io %s 0x%08llx\n", (hcd->driver->flags & HCD_MEMORY) ? - "io mem" : "io base", + "mem" : "base", (unsigned long long)hcd->rsrc_start); } return 0;