From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752370AbbKPPs4 (ORCPT ); Mon, 16 Nov 2015 10:48:56 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:55991 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751636AbbKPPsx (ORCPT ); Mon, 16 Nov 2015 10:48:53 -0500 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 5/6] serial: of: CONFIG_SERIAL_8250 is always set Date: Mon, 16 Nov 2015 16:48:13 +0100 Message-Id: <1447688894-2936779-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1447688894-2936779-1-git-send-email-arnd@arndb.de> References: <1447688894-2936779-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:XXAucjyIjh8Bc3IvJKTtt7xcKEqLissywlNjOYCM6xRoZnFwzjl Jnd2KxIP4Js2nJmObF6bFc336D6K1KvZO1fl7lHVtbkQoOLD8rurXXAC74yJvdtQnGeuHEI 8cGzTMH/NDBTOmoqbRcH1yft/lkewItV1/TJTFc3TuqkD+DLoyWh+MzfpTQP1qsN1mwFAOb PS34MqOGuubxstkDb9Nbw== X-UI-Out-Filterresults: notjunk:1;V01:K0:qxaUQstIUhk=:4x+J9tKK0jkFwI8HthimJ7 HMcqJqMHqdX2aAsK3WrkACm46bOWBW4E1FEJ060ln6zaTq704vgji7OermEkkD4fyJ71vps8k +A7RzAI4nlmByr8AfMUrrEAFXNgFyf5tSSd7VQOL3hXRsHFQi2/X1rxWeLyugqbUDhar1S8q+ e+93vQWpVqfwDx8xFld6PwlMQGKFd+mGIB+Ca5w7nBqO91R3rB1acGyTz/O89XVdyPcqmjO4k 2adAa4ca6vFlh9qHdIfZRFb5jiMKuCrBmsKhN+jAFmtazTQbElFRXcbMSPqEye6h8nTEVSgau bwUp84SGTepnWfezKg9v5STjKak4EtF3VrroMw1P2HgBnaRKbAISeu5QddUdKaoTTm7t6NTxm QWgtE41LyaV3l02qJToytVgqE1paZRaJIjcXoSrP8/MWx59+qNO0C1AzDRmRessSVvx1KKlBE 6jw7I9yTL/KRdpYOI227+xn8Bk2uvSzzlHCKfrBsr1tih1TJpNfm/Pu08S/vTrO/7SYic2sFk cPSnW55HsbiMmZJzL2bGXbo5E4ei4h2rv/Ixy74iXtvX0KFeE4+2rODFut4agcYU0Zc/w8u1I NV5qv+C0hbyEbKmOuzwCDlXetNGtqeBCNazzYlbbVMrPo0zfpadxGSnoiY4UmwzGy8gEhn8Ft 5LuX9H17x+MIyAPwHrLwnGvWWQISjv8qxey6kUf0wszInLJNzwf95c9n72979CXkq+Vc= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The only other user of this code was the nwp-serial driver, but that is now gone, so we can remove a couple of #ifdef statments in this driver. Signed-off-by: Arnd Bergmann --- drivers/tty/serial/of_serial.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c index 276c804e7eb4..7044eb2be91b 100644 --- a/drivers/tty/serial/of_serial.c +++ b/drivers/tty/serial/of_serial.c @@ -21,10 +21,6 @@ #include #include -#ifdef CONFIG_SERIAL_8250_MODULE -#define CONFIG_SERIAL_8250 CONFIG_SERIAL_8250_MODULE -#endif - #include "8250/8250.h" struct of_serial_info { @@ -195,7 +191,6 @@ static int of_platform_serial_probe(struct platform_device *ofdev) goto out; switch (port_type) { -#ifdef CONFIG_SERIAL_8250 case PORT_8250 ... PORT_MAX_8250: { struct uart_8250_port port8250; @@ -212,7 +207,6 @@ static int of_platform_serial_probe(struct platform_device *ofdev) ret = serial8250_register_8250_port(&port8250); break; } -#endif default: /* need to add code for these */ case PORT_UNKNOWN: @@ -240,11 +234,9 @@ static int of_platform_serial_remove(struct platform_device *ofdev) { struct of_serial_info *info = platform_get_drvdata(ofdev); switch (info->type) { -#ifdef CONFIG_SERIAL_8250 case PORT_8250 ... PORT_MAX_8250: serial8250_unregister_port(info->line); break; -#endif default: /* need to add code for these */ break; @@ -257,7 +249,6 @@ static int of_platform_serial_remove(struct platform_device *ofdev) } #ifdef CONFIG_PM_SLEEP -#ifdef CONFIG_SERIAL_8250 static void of_serial_suspend_8250(struct of_serial_info *info) { struct uart_8250_port *port8250 = serial8250_get_port(info->line); @@ -278,15 +269,6 @@ static void of_serial_resume_8250(struct of_serial_info *info) serial8250_resume_port(info->line); } -#else -static inline void of_serial_suspend_8250(struct of_serial_info *info) -{ -} - -static inline void of_serial_resume_8250(struct of_serial_info *info) -{ -} -#endif static int of_serial_suspend(struct device *dev) { -- 2.1.0.rc2