Received: by 2002:a05:7412:40d:b0:e2:908c:2ebd with SMTP id 13csp282940rdf; Tue, 21 Nov 2023 02:37:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IFeZCdkXQCm7tI5I/55IgV07tVAZrDbGNrdYGAG9XS543ILQQnUrVIQfo2Ta+mYg91hMG/z X-Received: by 2002:a05:6a00:8c02:b0:6be:acc:8973 with SMTP id ih2-20020a056a008c0200b006be0acc8973mr8976473pfb.20.1700563057656; Tue, 21 Nov 2023 02:37:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700563057; cv=none; d=google.com; s=arc-20160816; b=HkR71wXcgzUHCnnrTl/+FNurkoG9N2lazx5rU1KSbMbfhEHxYUZeGfwWJI75GcbyAK QRF3S+wgXnOmijSDsq5EW9OlmtfY/z1E01raf8Dm6ui2L/HENXji05qMgwlN39sZiZ1c p8Fz1LPu1wfjOChpPPufXPsE2vbk5qteMK0/mKw4Di50h0fMobmQ5lFA5r5i8M5wbAak MfNZNpfHeXNL095x5fYVNTY/eGGVR0HWLbi9XehyJy1f/9ueAcWzP819k+3VXlNU2Nag tw2UKjWR1jOQzsjLA8l5NTaEd4e9d2qq16bHrtbIAXLNUwJeWClyontq5tG1Go6y9tKU oqRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YbSO4DXht9gY3mlRV1ppT5rDbCaRJQqG3flpc4aaEMQ=; fh=1YNwm5KBWetjB3qGkhgLqh/dZnCTsWuqRk83JW6hjgE=; b=ONcDk3gypOesZPK5Obzm1/aAcrgZCQVghQidvzbvtS0NnHan6CQl9u3xJ1iKhDtbL/ C/9LlcW031i0fAZ+SiFor3GiToSgAihZniGtj8JLUmPcoD3bjK27dfLOcoEIueKuJynv 93I/6fbysNqb1e9zC3depsgcqrklc65Qo32tdRykBpDcA0guXsXmFf2mXUiYc4J600vV uwJDpnWQdoxLxvhI4WCwBLutjvS7uc1IYt/kEbB/OSH26rhv0SWLWmk6SkTgODR0zH8z mLR7qJpqbIsx+o77Mk2b/RA0jpOlUisgMxA1ej5Mdck2a6eAxSlckJ1IjQmSY9hQiEV+ 1/MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=F5+fcHhD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id e22-20020a656796000000b005c05e260347si9973824pgr.419.2023.11.21.02.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 02:37:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=F5+fcHhD; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 65F4C8031D31; Tue, 21 Nov 2023 02:37:26 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231923AbjKUKgz (ORCPT + 99 others); Tue, 21 Nov 2023 05:36:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233850AbjKUKgn (ORCPT ); Tue, 21 Nov 2023 05:36:43 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9818F199 for ; Tue, 21 Nov 2023 02:36:37 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32D06C433C8; Tue, 21 Nov 2023 10:36:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700562997; bh=FnTt1y4GBgdu68w8crsWeSKtB9fLgimiwg29HboN+SE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F5+fcHhD47eYBb3BLeAuriqXUEjBh0WQEvFrsS7xm952S9hBAAgUCGcpZ1/NRL+sP QN/cLI2P+Mxt7+gXYvivW+aThT5lBEgY0G28YKGiLXZ/cz7clyWbFaVG+8/Cmgk67P kyGGkyFfriZbJnLyGilv+sOJ/BaS7tH33S337iNmPwI3TlyMfhHgTxAuK4BsZFrTWX 25r9tBqtSpEN+9p7PRKqX7uP/YpqM/S3WAgkaowK/mrT91eENnyeW2y9nEQ9J9cty+ vrYtYq3V1O7anljiFhI83xF4/+HRgSTMP4rMZPb9gfjUwLiupjGmvROCvXSxy6yI26 N0yFz+/RYzucQ== From: "Jiri Slaby (SUSE)" To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" Subject: [PATCH 3/6] tty: jsm: remove unused members from struct board_ops Date: Tue, 21 Nov 2023 11:36:23 +0100 Message-ID: <20231121103626.17772-4-jirislaby@kernel.org> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231121103626.17772-1-jirislaby@kernel.org> References: <20231121103626.17772-1-jirislaby@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 21 Nov 2023 02:37:26 -0800 (PST) clang-struct [1] found board_ops::get_uart_bytes_left() and ::send_immediate_char() unused. Both are only set but never called. And it has been like that since the git history, so drop both the members along with the cls+neo implementations. [1] https://github.com/jirislaby/clang-struct Signed-off-by: Jiri Slaby (SUSE) --- drivers/tty/serial/jsm/jsm.h | 2 -- drivers/tty/serial/jsm/jsm_cls.c | 36 ---------------------------- drivers/tty/serial/jsm/jsm_neo.c | 40 -------------------------------- 3 files changed, 78 deletions(-) diff --git a/drivers/tty/serial/jsm/jsm.h b/drivers/tty/serial/jsm/jsm.h index 8489c07f4cd5..08a42f045ec8 100644 --- a/drivers/tty/serial/jsm/jsm.h +++ b/drivers/tty/serial/jsm/jsm.h @@ -115,8 +115,6 @@ struct board_ops { void (*send_start_character)(struct jsm_channel *ch); void (*send_stop_character)(struct jsm_channel *ch); void (*copy_data_from_queue_to_uart)(struct jsm_channel *ch); - u32 (*get_uart_bytes_left)(struct jsm_channel *ch); - void (*send_immediate_char)(struct jsm_channel *ch, unsigned char); }; diff --git a/drivers/tty/serial/jsm/jsm_cls.c b/drivers/tty/serial/jsm/jsm_cls.c index 3fd57ac3ad81..1eda48964c0b 100644 --- a/drivers/tty/serial/jsm/jsm_cls.c +++ b/drivers/tty/serial/jsm/jsm_cls.c @@ -877,28 +877,6 @@ static void cls_uart_off(struct jsm_channel *ch) writeb(0, &ch->ch_cls_uart->ier); } -/* - * cls_get_uarts_bytes_left. - * Returns 0 is nothing left in the FIFO, returns 1 otherwise. - * - * The channel lock MUST be held by the calling function. - */ -static u32 cls_get_uart_bytes_left(struct jsm_channel *ch) -{ - u8 left = 0; - u8 lsr = readb(&ch->ch_cls_uart->lsr); - - /* Determine whether the Transmitter is empty or not */ - if (!(lsr & UART_LSR_TEMT)) - left = 1; - else { - ch->ch_flags |= (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM); - left = 0; - } - - return left; -} - /* * cls_send_break. * Starts sending a break thru the UART. @@ -916,18 +894,6 @@ static void cls_send_break(struct jsm_channel *ch) } } -/* - * cls_send_immediate_char. - * Sends a specific character as soon as possible to the UART, - * jumping over any bytes that might be in the write queue. - * - * The channel lock MUST be held by the calling function. - */ -static void cls_send_immediate_char(struct jsm_channel *ch, unsigned char c) -{ - writeb(c, &ch->ch_cls_uart->txrx); -} - struct board_ops jsm_cls_ops = { .intr = cls_intr, .uart_init = cls_uart_init, @@ -943,7 +909,5 @@ struct board_ops jsm_cls_ops = { .send_start_character = cls_send_start_character, .send_stop_character = cls_send_stop_character, .copy_data_from_queue_to_uart = cls_copy_data_from_queue_to_uart, - .get_uart_bytes_left = cls_get_uart_bytes_left, - .send_immediate_char = cls_send_immediate_char }; diff --git a/drivers/tty/serial/jsm/jsm_neo.c b/drivers/tty/serial/jsm/jsm_neo.c index 2bd640428970..1fa10f19368f 100644 --- a/drivers/tty/serial/jsm/jsm_neo.c +++ b/drivers/tty/serial/jsm/jsm_neo.c @@ -1309,25 +1309,6 @@ static void neo_uart_off(struct jsm_channel *ch) writeb(0, &ch->ch_neo_uart->ier); } -static u32 neo_get_uart_bytes_left(struct jsm_channel *ch) -{ - u8 left = 0; - u8 lsr = readb(&ch->ch_neo_uart->lsr); - - /* We must cache the LSR as some of the bits get reset once read... */ - ch->ch_cached_lsr |= lsr; - - /* Determine whether the Transmitter is empty or not */ - if (!(lsr & UART_LSR_TEMT)) - left = 1; - else { - ch->ch_flags |= (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM); - left = 0; - } - - return left; -} - /* Channel lock MUST be held by the calling function! */ static void neo_send_break(struct jsm_channel *ch) { @@ -1348,25 +1329,6 @@ static void neo_send_break(struct jsm_channel *ch) } } -/* - * neo_send_immediate_char. - * - * Sends a specific character as soon as possible to the UART, - * jumping over any bytes that might be in the write queue. - * - * The channel lock MUST be held by the calling function. - */ -static void neo_send_immediate_char(struct jsm_channel *ch, unsigned char c) -{ - if (!ch) - return; - - writeb(c, &ch->ch_neo_uart->txrx); - - /* flush write operation */ - neo_pci_posting_flush(ch->ch_bd); -} - struct board_ops jsm_neo_ops = { .intr = neo_intr, .uart_init = neo_uart_init, @@ -1382,6 +1344,4 @@ struct board_ops jsm_neo_ops = { .send_start_character = neo_send_start_character, .send_stop_character = neo_send_stop_character, .copy_data_from_queue_to_uart = neo_copy_data_from_queue_to_uart, - .get_uart_bytes_left = neo_get_uart_bytes_left, - .send_immediate_char = neo_send_immediate_char }; -- 2.42.1