From patchwork Fri Sep 9 20:57:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12972174 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B9B79ECAAA1 for ; Fri, 9 Sep 2022 20:59:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ozyxKJcBDv2ehwB10Z26Il80EutqRFZmH4C3InbA++U=; b=Ogm/tBWqKzr6bY KrptIpjVWG8woW96RwW8daVadS/yCaaq8iiQLiZ4EW7UbVlLGewC9hmlDAgIvECC2xaW0n0Y3KSqo EcdVAYTPJmZH+N8Yw7j0chJGYKyLHqeHiZtSJyCxmc2pvjROo7iErbhj/Q7IBV1D1DZKFX5/j4eWC Czh5KvPpTY8mFbpLOfdulzMDxLDRMwj6e/++xRPslBN7q/bQ369uJKU/bj7ihD21IU79guX0DN2m+ 6fiCPSlOpDhgLVZmUBhx+22TQpxbG2yWzqrE+Y+Jt1I3ZM5Q8RyqcUVHLDYiGcEe+q9QuHieIAohZ XrbVxyOYkgrQJipoYMKg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWl4y-002pcI-Rs; Fri, 09 Sep 2022 20:58:24 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWl4h-002pSl-Hi for linux-arm-kernel@lists.infradead.org; Fri, 09 Sep 2022 20:58:08 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 26EF0620F7; Fri, 9 Sep 2022 20:58:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25B9DC433D7; Fri, 9 Sep 2022 20:58:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662757086; bh=dQw4HWC0oOIla3gYVBmqDe8D3/Z8MiYwfdPl0jwhfrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ho5K4FiGJ2mgCqJc6pKhMI1aeVMqjhIwHTcGYjhkRrjJGauWLT9gtr78SfLMav3BJ SadJrc03aTCgGBc1ATGZNyyx5oAXtYc8SgtVZjSL0/pNXBRBqhLskD/4qs55KaEG9T IZbuE0AvjONA5ykvqFjOHNInNBIhKjzln+lptWQBktSm+W5iL55G6CgTlkdbYV/BRE 9iJNSbyI+dB+4eJS4qjGS3at7OEMdwTpFdwaSVU47wEztNX5NNW658K6Mv+spvTO1P bB72jxGuzRWy8tMylNdUakRQdFv2XxxpnXuDw+hI/Q6IXVy3rOz2rpXQjKLcr7JdHF aE/2DeX1dKGRw== From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Arnd Bergmann , Russell King , Christoph Hellwig , Linus Walleij , Marc Zyngier Subject: [PATCH v3 2/5] ARM: footbridge: remove leftover from personal-server Date: Fri, 9 Sep 2022 22:57:46 +0200 Message-Id: <20220909205749.1793677-3-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220909205749.1793677-1-arnd@kernel.org> References: <20220909205749.1793677-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220909_135807_647765_C0B743A5 X-CRM114-Status: GOOD ( 17.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann The machine was removed a while ago, and the checks are now useless. Reviewed-by: Christoph Hellwig Tested-by: Marc Zyngier Signed-off-by: Arnd Bergmann --- arch/arm/mach-footbridge/isa.c | 11 +++++------ drivers/tty/serial/21285.c | 3 --- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-footbridge/isa.c b/arch/arm/mach-footbridge/isa.c index 3375ac23c046..84caccddce44 100644 --- a/arch/arm/mach-footbridge/isa.c +++ b/arch/arm/mach-footbridge/isa.c @@ -80,12 +80,11 @@ static int __init footbridge_isa_init(void) int err = 0; /* Personal server doesn't have RTC */ - if (!machine_is_personal_server()) { - isa_rtc_init(); - err = platform_device_register(&rtc_device); - if (err) - printk(KERN_ERR "Unable to register RTC device: %d\n", err); - } + isa_rtc_init(); + err = platform_device_register(&rtc_device); + if (err) + printk(KERN_ERR "Unable to register RTC device: %d\n", err); + err = platform_device_register(&serial_device); if (err) printk(KERN_ERR "Unable to register serial device: %d\n", err); diff --git a/drivers/tty/serial/21285.c b/drivers/tty/serial/21285.c index 7520cc02fd4d..65d6af755567 100644 --- a/drivers/tty/serial/21285.c +++ b/drivers/tty/serial/21285.c @@ -461,9 +461,6 @@ static int __init serial21285_console_setup(struct console *co, char *options) int parity = 'n'; int flow = 'n'; - if (machine_is_personal_server()) - baud = 57600; - /* * Check whether an invalid uart number has been specified, and * if so, search for the first available port that does have