From patchwork Tue Aug 6 15:29:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Draszik?= X-Patchwork-Id: 13755187 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 BA7BDC3DA64 for ; Tue, 6 Aug 2024 15:32:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Rk2Awb+sGDAUp2fed+2uqRPu8RHHDA4mh3PcSw6gyEg=; b=DLXzrnjM/a4G3IebxX+LllP72N efKDQwNcoJvmcmy2hfyCPAf7lA0y6PYblkL8OZmwYAG13vLawUIeBjLf1KrmWSz45P1tyX5rp9drk YaM0eMaSTRzfcNwtQlMwXE+P0Ub2rFR0eIQYpqf3pq2UivM8US3080dbw9GGJoGOMdmZYl6y+iz7Y ufDe+5h4fuSBh/hzAH0isO3k8WyEx+3JElPDNq/se+Cwskx0ARmQy/t2q/20pAVzO/qeNCnJQb2QW d4ETqhKBs/sfCJtXIPQerdji1NUAQqLNQ6/dVNVrVAzbqHO6Bt1QiK8WSK49b2C9p4XUmd4aynoAr JhHLCt1w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbMAR-00000002Bwq-3BtP; Tue, 06 Aug 2024 15:32:07 +0000 Received: from mail-lf1-x12c.google.com ([2a00:1450:4864:20::12c]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbM8M-00000002BRB-3LuA for linux-arm-kernel@lists.infradead.org; Tue, 06 Aug 2024 15:30:00 +0000 Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-52f025ab3a7so1167057e87.2 for ; Tue, 06 Aug 2024 08:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722958196; x=1723562996; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Rk2Awb+sGDAUp2fed+2uqRPu8RHHDA4mh3PcSw6gyEg=; b=CuhKk/VVQsbwezi6XBl7aB6Op4SzBmjz5At8JqtFQWtHXTPovBHVRLxFx212UAjFXh jrCk24ATM/m4pyAsKXHjqM7JAzaGeaeDXav8Q1neHFY/7wjvoJOUcJofYfhyrig5/PM9 ktYN8pMKN/DqcEu0n2fBimBXDczQXnC8mc8c0Ygq0BXB5gr7tn0xu4EAoX+5Y/Ya8wz5 /dvPLkNc959286oSF4VDhhvbJ/O3tOenNHNbh3x4dIypt4q6vWrhg8SKCC1FW1UkHHGW kGTQr0vlrxOl6lMpHoU3vLQFMf+hSnSa0b/YBIIeuupM3txz5M+8VgY+qVL93BPDiM21 yNyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722958196; x=1723562996; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Rk2Awb+sGDAUp2fed+2uqRPu8RHHDA4mh3PcSw6gyEg=; b=K8dLR8r3L/3BroxfCzsw5CVylEGYVIRYJ3Kk63+E3ykOK3CLl/IwmMS8dzekZI4oEW J/YQdfa+LX0bBAO/jmYygzh7QbxJQ9y4XIWpsGFZclcyz+u6H9xjLh6y0GRd3W86vzIP dygKNepDFk48OlSZErY+TkgV5/t3+7plz05T9ATYsqd5ilouEPlzfNOGt/+QbNstqjMB FnQgQaRjrlr6JSFsK0Dna4rFYvVgsBDSO4oouf+MPb6sfeVmKOIo6AtMZbaGY22xhdwy 5WeShRUIU73/RGfZvn/POjuImpavyEbmxv/RQFyaXeLB423gCW4Ks7b6QWLgQ8B8TMig lSgA== X-Forwarded-Encrypted: i=1; AJvYcCUbSg5uiuI/EF/7WdRo2K4zHlwz2Y90jd7919xLz+vsen2fXYjuneDOIX3pERLUdvO0YpEzeW93p0plGF7q1nqfOpc2rz7egjpJUzwRJE+k4j8EIiA= X-Gm-Message-State: AOJu0Yxg6bU2d61y2sVuWW0sB95xwferHcTp5+tyzykY5wBMvGsJrAPM I0mv/JvqZbh8CD09ALQl9CLHEJ/7qiDTZlNgQkD+2KUEjc547yTeKXsZN4dJ0i8= X-Google-Smtp-Source: AGHT+IEzRSe9RZ8IZ7a79GIk6K9Ld7GIQxp37hHU2EYAuNypM9NuHuI6ejLRItdRTqLiJvXepFVECQ== X-Received: by 2002:ac2:4c88:0:b0:530:bbe7:4db3 with SMTP id 2adb3069b0e04-530bbe74f4cmr7491016e87.39.1722958196387; Tue, 06 Aug 2024 08:29:56 -0700 (PDT) Received: from puffmais.c.googlers.com (64.227.90.34.bc.googleusercontent.com. [34.90.227.64]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7dc9d4294fsm555274266b.103.2024.08.06.08.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Aug 2024 08:29:56 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Tue, 06 Aug 2024 16:29:45 +0100 Subject: [PATCH 1/2] tty: serial: samsung_tty: drop unused argument to irq handlers MIME-Version: 1.0 Message-Id: <20240806-samsung-tty-cleanup-v1-1-a68d3abf31fe@linaro.org> References: <20240806-samsung-tty-cleanup-v1-0-a68d3abf31fe@linaro.org> In-Reply-To: <20240806-samsung-tty-cleanup-v1-0-a68d3abf31fe@linaro.org> To: Krzysztof Kozlowski , Alim Akhtar , Greg Kroah-Hartman , Jiri Slaby Cc: Peter Griffin , Tudor Ambarus , Will McVicker , kernel-team@android.com, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, =?utf-8?q?Andr?= =?utf-8?q?=C3=A9_Draszik?= X-Mailer: b4 0.13.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240806_082958_859353_EF698F0A X-CRM114-Status: GOOD ( 13.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 The 'irq' argument is not used in any of the callees, we can just drop it and simplify the code. No functional changes. Signed-off-by: André Draszik Reviewed-by: Tudor Ambarus --- drivers/tty/serial/samsung_tty.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c index dc35eb77d2ef..1c6d0ffe5649 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -855,7 +855,7 @@ static irqreturn_t s3c24xx_serial_rx_chars_pio(void *dev_id) return IRQ_HANDLED; } -static irqreturn_t s3c24xx_serial_rx_irq(int irq, void *dev_id) +static irqreturn_t s3c24xx_serial_rx_irq(void *dev_id) { struct s3c24xx_uart_port *ourport = dev_id; @@ -928,7 +928,7 @@ static void s3c24xx_serial_tx_chars(struct s3c24xx_uart_port *ourport) s3c24xx_serial_stop_tx(port); } -static irqreturn_t s3c24xx_serial_tx_irq(int irq, void *id) +static irqreturn_t s3c24xx_serial_tx_irq(void *id) { struct s3c24xx_uart_port *ourport = id; struct uart_port *port = &ourport->port; @@ -950,11 +950,11 @@ static irqreturn_t s3c64xx_serial_handle_irq(int irq, void *id) irqreturn_t ret = IRQ_HANDLED; if (pend & S3C64XX_UINTM_RXD_MSK) { - ret = s3c24xx_serial_rx_irq(irq, id); + ret = s3c24xx_serial_rx_irq(id); wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_RXD_MSK); } if (pend & S3C64XX_UINTM_TXD_MSK) { - ret = s3c24xx_serial_tx_irq(irq, id); + ret = s3c24xx_serial_tx_irq(id); wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_TXD_MSK); } return ret; @@ -971,11 +971,11 @@ static irqreturn_t apple_serial_handle_irq(int irq, void *id) if (pend & (APPLE_S5L_UTRSTAT_RXTHRESH | APPLE_S5L_UTRSTAT_RXTO)) { wr_regl(port, S3C2410_UTRSTAT, APPLE_S5L_UTRSTAT_RXTHRESH | APPLE_S5L_UTRSTAT_RXTO); - ret = s3c24xx_serial_rx_irq(irq, id); + ret = s3c24xx_serial_rx_irq(id); } if (pend & APPLE_S5L_UTRSTAT_TXTHRESH) { wr_regl(port, S3C2410_UTRSTAT, APPLE_S5L_UTRSTAT_TXTHRESH); - ret = s3c24xx_serial_tx_irq(irq, id); + ret = s3c24xx_serial_tx_irq(id); } return ret; From patchwork Tue Aug 6 15:29:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Draszik?= X-Patchwork-Id: 13755186 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 496FAC52D71 for ; Tue, 6 Aug 2024 15:32:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=McdwXMf+aVpukum1jWBbRDvrxSrkWixRhMvgP59hNnk=; b=4OeWVC4OCwCzMEP+xFpmBphpev sSMr2hngWlqMyjtFH8fx+PgUhLm+Q/zfyaiWMWE3GjOfbjmntQnOWAqy8bcJSZjU2sW/lLKyuBQLz W1bkw+PgshO4UC3xRUii5m8sKfvIkoqexGdI1T1j9uhsofi6dq0FmtxjW+9UnRHFqqLhbAOMrk3zY 2EieEkNltKwrjbicNrOZZeEwG38bCcoL0hdIu5t5Bxwu2B0rlXUG3MInMfJIt11nn/pWNigfe93pN YLeCz+zoAirpMMdQghSxJqWsIul88F+EJ9m/+nDYE84yQ/9z9vPocFT/jffaN9wX8+2eks8fXcgOh VgwTccOw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbMAT-00000002Bx6-08Ef; Tue, 06 Aug 2024 15:32:09 +0000 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbM8N-00000002BRD-0BV5 for linux-arm-kernel@lists.infradead.org; Tue, 06 Aug 2024 15:30:01 +0000 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-52efbb55d24so1442069e87.1 for ; Tue, 06 Aug 2024 08:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722958197; x=1723562997; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=McdwXMf+aVpukum1jWBbRDvrxSrkWixRhMvgP59hNnk=; b=ZUy+oJ30kh7jn1S3vF32mDO1XZsatGjgAzC/b0NFkrQpN5NAdxLLG6Eo2hLe2SspS9 4a+o2S9sotw2bIbE/v1BiSk8QoWm1ArjFsfhLAtbLeSrYgA9EHPrtcRmdZ+EVPQ5P8u5 bJ/XdUvqUzFZxJxJxOFcYgdmOLcfXAlp2c2yZ8hkrjXcuNi3wyG5+YoJ7/cnGXEfAR2G 109R6FgCyupazCjElnYmKl8/3rYbDHcpFpg7JBXKcaVa1wvdtr4nJtV8zVYYno4I3wxY 2iUwQbOT3QwV09bjvaWFia/B5Fq/jlbciu4jUyrDHAt1TSQX4Ww3vfdC+NBN81caQTKF CWxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722958197; x=1723562997; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=McdwXMf+aVpukum1jWBbRDvrxSrkWixRhMvgP59hNnk=; b=gHjRTlrzNbN5xu1ySp8URFA9jgQEn5D5xQiasYY9dIdgat4D+iIroX4ZC/u1nV3nvJ A36UUtODVh6KiLgWHHTC1C+KsZ2QvD8s/dO3MWwKoGwmzbHBg9qHMvgrSKIA4FIWfrOi iQkE2eML8CogV2lYCukk0bUPdlccEN9Kw//l8OBEtvCC+R8MVvzj1yESN6dr+R+bGENv hs9pNeftGMegIBeAQYa9oa4pUerx6texXtzdFZ1zRpIpWMzziONsK98sibMRAlL+JJ7N 3pSIIVj4WayW9rMKTHzdGTz9pa4f7DoAY3WPtFJpu0krZtV13x/ExJAnAinkWz1qNXKm EY8A== X-Forwarded-Encrypted: i=1; AJvYcCXtl5y0QFmPMMl5z4ZhQpm60n0iZrOph4olhX2PUOIHZK3ETh1cNoQ0FMxR3CI8S3jB3QvOJ8XzbJoxzJUgx+V/YqocprHU/lh5nWea6hvZnNOO//8= X-Gm-Message-State: AOJu0YwpYLsj7Srvd27o89r3Wq9bsIvsDmhND/5lxariDie9qwKfLrcd adfEvWSy5FppFe3P5KgQ02SAzE3AIvtPUS4mUhvEGTGFxs0Nz/zBVEnT6bDFWvI= X-Google-Smtp-Source: AGHT+IFyj16EIZLaKK/87iLqK95suicQ+dQY2KgzMLkd9+nLfafpYvKVTsIdMVkQYiVfRocIZ68TBA== X-Received: by 2002:a05:6512:3e26:b0:52c:dd25:9ac6 with SMTP id 2adb3069b0e04-530bb38cae9mr13232800e87.29.1722958196994; Tue, 06 Aug 2024 08:29:56 -0700 (PDT) Received: from puffmais.c.googlers.com (64.227.90.34.bc.googleusercontent.com. [34.90.227.64]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7dc9d4294fsm555274266b.103.2024.08.06.08.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Aug 2024 08:29:56 -0700 (PDT) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Tue, 06 Aug 2024 16:29:46 +0100 Subject: [PATCH 2/2] tty: serial: samsung_tty: cast the interrupt's void *id just once MIME-Version: 1.0 Message-Id: <20240806-samsung-tty-cleanup-v1-2-a68d3abf31fe@linaro.org> References: <20240806-samsung-tty-cleanup-v1-0-a68d3abf31fe@linaro.org> In-Reply-To: <20240806-samsung-tty-cleanup-v1-0-a68d3abf31fe@linaro.org> To: Krzysztof Kozlowski , Alim Akhtar , Greg Kroah-Hartman , Jiri Slaby Cc: Peter Griffin , Tudor Ambarus , Will McVicker , kernel-team@android.com, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, =?utf-8?q?Andr?= =?utf-8?q?=C3=A9_Draszik?= X-Mailer: b4 0.13.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240806_082959_112390_DCAD6FF6 X-CRM114-Status: GOOD ( 12.39 ) 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 The interrupt handler routines and helpers are casting the 'void *' pointer to 'struct exynos_uart_port *' all over the place. There is no need for that, we can do the casting once and keep passing the 'struct exynos_uart_port *', simplifying the code and saving a few lines of code. No functional changes. Signed-off-by: André Draszik Reviewed-by: Tudor Ambarus --- drivers/tty/serial/samsung_tty.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/tty/serial/samsung_tty.c b/drivers/tty/serial/samsung_tty.c index 1c6d0ffe5649..971765aaeaca 100644 --- a/drivers/tty/serial/samsung_tty.c +++ b/drivers/tty/serial/samsung_tty.c @@ -707,9 +707,8 @@ static void enable_rx_pio(struct s3c24xx_uart_port *ourport) static void s3c24xx_serial_rx_drain_fifo(struct s3c24xx_uart_port *ourport); -static irqreturn_t s3c24xx_serial_rx_chars_dma(void *dev_id) +static irqreturn_t s3c24xx_serial_rx_chars_dma(struct s3c24xx_uart_port *ourport) { - struct s3c24xx_uart_port *ourport = dev_id; struct uart_port *port = &ourport->port; struct s3c24xx_uart_dma *dma = ourport->dma; struct tty_struct *tty = tty_port_tty_get(&ourport->port.state->port); @@ -843,9 +842,8 @@ static void s3c24xx_serial_rx_drain_fifo(struct s3c24xx_uart_port *ourport) tty_flip_buffer_push(&port->state->port); } -static irqreturn_t s3c24xx_serial_rx_chars_pio(void *dev_id) +static irqreturn_t s3c24xx_serial_rx_chars_pio(struct s3c24xx_uart_port *ourport) { - struct s3c24xx_uart_port *ourport = dev_id; struct uart_port *port = &ourport->port; uart_port_lock(port); @@ -855,13 +853,11 @@ static irqreturn_t s3c24xx_serial_rx_chars_pio(void *dev_id) return IRQ_HANDLED; } -static irqreturn_t s3c24xx_serial_rx_irq(void *dev_id) +static irqreturn_t s3c24xx_serial_rx_irq(struct s3c24xx_uart_port *ourport) { - struct s3c24xx_uart_port *ourport = dev_id; - if (ourport->dma && ourport->dma->rx_chan) - return s3c24xx_serial_rx_chars_dma(dev_id); - return s3c24xx_serial_rx_chars_pio(dev_id); + return s3c24xx_serial_rx_chars_dma(ourport); + return s3c24xx_serial_rx_chars_pio(ourport); } static void s3c24xx_serial_tx_chars(struct s3c24xx_uart_port *ourport) @@ -928,9 +924,8 @@ static void s3c24xx_serial_tx_chars(struct s3c24xx_uart_port *ourport) s3c24xx_serial_stop_tx(port); } -static irqreturn_t s3c24xx_serial_tx_irq(void *id) +static irqreturn_t s3c24xx_serial_tx_irq(struct s3c24xx_uart_port *ourport) { - struct s3c24xx_uart_port *ourport = id; struct uart_port *port = &ourport->port; uart_port_lock(port); @@ -950,11 +945,11 @@ static irqreturn_t s3c64xx_serial_handle_irq(int irq, void *id) irqreturn_t ret = IRQ_HANDLED; if (pend & S3C64XX_UINTM_RXD_MSK) { - ret = s3c24xx_serial_rx_irq(id); + ret = s3c24xx_serial_rx_irq(ourport); wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_RXD_MSK); } if (pend & S3C64XX_UINTM_TXD_MSK) { - ret = s3c24xx_serial_tx_irq(id); + ret = s3c24xx_serial_tx_irq(ourport); wr_regl(port, S3C64XX_UINTP, S3C64XX_UINTM_TXD_MSK); } return ret; @@ -971,11 +966,11 @@ static irqreturn_t apple_serial_handle_irq(int irq, void *id) if (pend & (APPLE_S5L_UTRSTAT_RXTHRESH | APPLE_S5L_UTRSTAT_RXTO)) { wr_regl(port, S3C2410_UTRSTAT, APPLE_S5L_UTRSTAT_RXTHRESH | APPLE_S5L_UTRSTAT_RXTO); - ret = s3c24xx_serial_rx_irq(id); + ret = s3c24xx_serial_rx_irq(ourport); } if (pend & APPLE_S5L_UTRSTAT_TXTHRESH) { wr_regl(port, S3C2410_UTRSTAT, APPLE_S5L_UTRSTAT_TXTHRESH); - ret = s3c24xx_serial_tx_irq(id); + ret = s3c24xx_serial_tx_irq(ourport); } return ret;