From patchwork Thu Aug 18 21:15:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12947976 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 DEB55C00140 for ; Thu, 18 Aug 2022 21:17:35 +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=/dGnFn55eTwmE2krl6RuMo2XWHUCGa7V1eqPyT6JFcE=; b=UHZFLgR7SAxTgc yyPbaQJWeSjnya8w5vYoEPrFXpUZcMr1wW1J8o8qTHj82142S+s4wA6Tbb1eq8WhUxxItYyK4/tD4 NsBv1NiNiGdwcsVKFYCi79d8UcEhjwn1lk+lGZnFz6JWAM9mujuzPKS5PmBBVxRfZAIDue5/q7Ra+ o5Dcojv1LWM0oV77aBpun5ej8+oa7pEep71p/xVjXtYk4yP8jnmWXTAq3TViSnMltdkg8USNlsUdD caFrpwJAGb/Sz17BYtCInz42L/WwEngAmOBw6Sqz7Ao7Mhve2LclLoN5m9uhy1zglaHeGyaw97t0c zv6CfH2epZRy0UqPWMKQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOmsU-009jA0-CV; Thu, 18 Aug 2022 21:16:34 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOms2-009itt-G6 for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2022 21:16:07 +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 ams.source.kernel.org (Postfix) with ESMTPS id 2EC18B8246D; Thu, 18 Aug 2022 21:16:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37532C433C1; Thu, 18 Aug 2022 21:16:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660857363; bh=XG6KXNr/XhLoTua87y5ZRB7Y9Skb9lfcJy6Wz27JkJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XMgqRXl6E+e3GoZDHzlCIykBB0pWNZ0NkQAPALjbu4szobunaHdY2/Ne+HId8sZkS WSfq9ZL60LZNBHfKMsBPkKn15QScX76p5QBu96TPg21cb8T5/2xhLuvIfjyxE2dYBd fWm9OcaHd/6SUKAZBhgjMxlGwcaN+GQxqhOB5LkOqUnRtj6kKhJ7xxGyMgaBwz97Ie oBN2cq/lokWG5WopFDRV2WsX/G0F/NNulC8/xqkMO2JV5qffSrCnJxTPPJjKvfRIOS xc3Amxc8G+zSjebuylT9sYVymWghJ7QJyprS2Nn9whOdKbYdUgKagcgzdHNi6Hqhv3 T286k6z26K0dg== From: Arnd Bergmann To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Arnd Bergmann , Russell King , Christoph Hellwig , Linus Walleij , Marc Zyngier Subject: [PATCH 2/4] ARM: footbridge: remove leftover from personal-server Date: Thu, 18 Aug 2022 23:15:48 +0200 Message-Id: <20220818211550.3272321-3-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220818211550.3272321-1-arnd@kernel.org> References: <20220818211550.3272321-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220818_141606_728985_C6F8249C X-CRM114-Status: GOOD ( 16.52 ) 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. Signed-off-by: Arnd Bergmann Reviewed-by: Christoph Hellwig --- 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