Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp1802664ybj; Fri, 20 Sep 2019 17:15:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqxEpomWknffUOaGXD3ZZ/PBadaId3wXhq8Fzbd3pxiAAFat5vYi0D+G7WtkO1Xbp8vSW+Jl X-Received: by 2002:a50:ee92:: with SMTP id f18mr24829421edr.253.1569024901155; Fri, 20 Sep 2019 17:15:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569024901; cv=none; d=google.com; s=arc-20160816; b=u9DYpDM+StBUVEaX1xWRFuUro8qsjO78wL3K4CdyHC36+IaMz0p5faG39pRkQjRffL EfOUlOROPLkVbc3wtI7ec97onruGxFL/ONoGyCqzpIsAuUafwUjpZzDKt+exhF2T4aXa QxnvavJBN5gdh7NhWUzJ9C4ffPtPDC4uu0109vQ5z3plnWB/g7/nXWdNc/70dAfXy300 8ruZP1J3l+f33KoGFGmfiipOUqrQsP1kFhGvo0oc8lp3+yT69fSwPiLTRjRWZrF8tCSN PpNTvknPBcKwFMTfoPM0cnwl2OeNF8hMF4gp55qu5+tbzALYRBB/5s+PrWmM2mlSdQp0 EJDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=La6W2nKk3DlDXl5TNyB6icWIlrezEmXCOjwr1Ej7ZJY=; b=M2o5TN80KoHpqub3nBf4eQn6ASuOtjEN6oEXjx+j/96ljVIITg0G+v9OcmWggypvPF hVoSbcJMHXSeVTXbxJ7AoI9CCPQBO+wl4faOgy5usJVbEi9CqgEmX10N5yCQHVSYuFqr FDX8OE2L338hn/i9ilgObj2cKsM2d0GClNbkFv4KctEsVpgI89Nmvhyiwp3fkZPQEk4A YrsVnauPyuKDOCmbHoNeiZtltIDAUlWRX9KgyZGOunYdF5y4PwS0AR5uYQSo22OUo8/8 RHtcQaE6/W7YaSbodFFyOBQhfQakrOYUTZpLculhJS2yALnWivaPFI7X+u6POMqHz7wp cK+Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s14si1908837eju.289.2019.09.20.17.14.22; Fri, 20 Sep 2019 17:15:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437380AbfITGJY (ORCPT + 99 others); Fri, 20 Sep 2019 02:09:24 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:57860 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2437347AbfITGJN (ORCPT ); Fri, 20 Sep 2019 02:09:13 -0400 Received: from DGGEMS413-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 17052DF32EB6709A75B7; Fri, 20 Sep 2019 14:09:12 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS413-HUB.china.huawei.com (10.3.19.213) with Microsoft SMTP Server id 14.3.439.0; Fri, 20 Sep 2019 14:09:05 +0800 From: Kefeng Wang To: Joe Perches , Andrew Morton , Ingo Molnar , "David S. Miller" , Arnaldo Carvalho de Melo , Andy Whitcroft , Peter Zijlstra , "Alexei Starovoitov" , Daniel Borkmann , "Greg Kroah-Hartman" , Sergey Senozhatsky , Petr Mladek , Arnd Bergmann , CC: , Bartlomiej Zolnierkiewicz , Subject: [PATCH 23/32] vgacon: Use pr_warn instead of pr_warning Date: Fri, 20 Sep 2019 14:25:35 +0800 Message-ID: <20190920062544.180997-24-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190920062544.180997-1-wangkefeng.wang@huawei.com> References: <20190920062544.180997-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As said in commit f2c2cbcc35d4 ("powerpc: Use pr_warn instead of pr_warning"), removing pr_warning so all logging messages use a consistent _warn style. Let's do it. Cc: Bartlomiej Zolnierkiewicz Cc: linux-fbdev@vger.kernel.org Signed-off-by: Kefeng Wang --- drivers/video/console/vgacon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index c6b3bdbbdbc9..de7b8382aba9 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c @@ -113,9 +113,9 @@ static int __init text_mode(char *str) { vgacon_text_mode_force = true; - pr_warning("You have booted with nomodeset. This means your GPU drivers are DISABLED\n"); - pr_warning("Any video related functionality will be severely degraded, and you may not even be able to suspend the system properly\n"); - pr_warning("Unless you actually understand what nomodeset does, you should reboot without enabling it\n"); + pr_warn("You have booted with nomodeset. This means your GPU drivers are DISABLED\n"); + pr_warn("Any video related functionality will be severely degraded, and you may not even be able to suspend the system properly\n"); + pr_warn("Unless you actually understand what nomodeset does, you should reboot without enabling it\n"); return 1; } -- 2.20.1