From patchwork Tue Mar 7 22:46:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 65951 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp11316wrd; Tue, 7 Mar 2023 15:05:12 -0800 (PST) X-Google-Smtp-Source: AK7set/PGmaN4vtRjYUAzsLLiqegDNxURRF8NNwmDUtvVDTf2W70o/Lx8EbL54fgYmJO1iGgwopV X-Received: by 2002:a17:907:8a1e:b0:8b1:264d:6187 with SMTP id sc30-20020a1709078a1e00b008b1264d6187mr19748279ejc.46.1678230312784; Tue, 07 Mar 2023 15:05:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678230312; cv=none; d=google.com; s=arc-20160816; b=uiu3QenpVTvyQr5nl9EBHDNqR8rubePbuiQnUFnPv3FCKInNy1Xq91gB31KL664pYQ +anL3/1Fo1vt3jyCTcBWneLmAA+MJS90VYaAeYTtHxQ7VmXNbD5yspiy/b+N15y4zpWT gV966i15tRWCj2x6pwN4CFnPc/cd96oknpkHhYxEaAJ4h9DVBiG4T9n+SIt2VJYZ7Tx/ 1SplA8SiEAShGk3nn5crqhdZfklJsGcQwbL/fqzyxr7DCh2n38qj4+UBY4nvRysTO7qV I21Bc2KmtZ2FHgz0iMvBqIT+z0KE0GRN2xkdij0aVODDCw23y+iYBT20iy1v4v8dR9ay CGkQ== 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; bh=Hk/XJ5YCxnGdNqL98MjGVtT5Qoc8QUcleC3NCZPNmkA=; b=NBUUqm5DEeNSLvSAYevM0HVBzhezzmEtGQDrCrzrJXKcsCPGnjCfpI6spMM7B5NzW3 t6Vgfn0htC0PmIZFwg07X/tBLs1fxYWxvlTxJ6TMlXY/3xr5kOd8kZ6mNlQVZ84HUGi7 cWQnBovFAdVPR6P/tuglA3LMiFVQkCFdNCjxRrBMdoqBydhYY//PX10jPZ9DUWFlgQ6p MEoMOIilwIhRxVYcJkl5MukFaUjrS8QQhyk9m8MPVkC81xMol9Tt6ifX35sq+nCmIm5r ZjC3dkAzhBO9lp76T3rQD9kni/QWaYuc5fIAnL7ii7yYmTaIiVNDlTEwKGC3sJiwoMAv eIAA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ci25-20020a170906c35900b008e1cbdcd3b3si2206271ejb.195.2023.03.07.15.04.48; Tue, 07 Mar 2023 15:05:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230043AbjCGWsB (ORCPT + 99 others); Tue, 7 Mar 2023 17:48:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230044AbjCGWrK (ORCPT ); Tue, 7 Mar 2023 17:47:10 -0500 Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8CA5A838AD; Tue, 7 Mar 2023 14:47:04 -0800 (PST) Received: from gsql.ggedos.sk (off-20.infotel.telecom.sk [212.5.213.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by hosting.gsystem.sk (Postfix) with ESMTPSA id 834BD7A0728; Tue, 7 Mar 2023 23:46:49 +0100 (CET) From: Ondrej Zary To: Damien Le Moal , Sudip Mukherjee Cc: Christoph Hellwig , Sergey Shtylyov , Jens Axboe , Tim Waugh , linux-block@vger.kernel.org, linux-parport@lists.infradead.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 16/32] pata_parport-bpck6: merge ppc6_rd_port into bpck6_read_regr Date: Tue, 7 Mar 2023 23:46:11 +0100 Message-Id: <20230307224627.28011-17-linux@zary.sk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230307224627.28011-1-linux@zary.sk> References: <20230307224627.28011-1-linux@zary.sk> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759752028355699333?= X-GMAIL-MSGID: =?utf-8?q?1759752028355699333?= ppc6_rd_port is only called by bpck6_read_regr. Merge ppc6_rd_port into bpck6_read_regr. Signed-off-by: Ondrej Zary --- drivers/ata/pata_parport/bpck6.c | 5 ++++- drivers/ata/pata_parport/ppc6lnx.c | 10 ---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bpck6.c index b8135a6eed16..2918fc9e9def 100644 --- a/drivers/ata/pata_parport/bpck6.c +++ b/drivers/ata/pata_parport/bpck6.c @@ -21,7 +21,10 @@ static int bpck6_read_regr(struct pi_adapter *pi, int cont, int reg) { - return ppc6_rd_port(pi, cont?reg|8:reg); + u8 port = cont ? reg | 8 : reg; + + ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_READ); + return ppc6_rd_data_byte(pi); } static void bpck6_write_regr(struct pi_adapter *pi, int cont, int reg, int val) diff --git a/drivers/ata/pata_parport/ppc6lnx.c b/drivers/ata/pata_parport/ppc6lnx.c index 5b7796083e7e..23dce177b722 100644 --- a/drivers/ata/pata_parport/ppc6lnx.c +++ b/drivers/ata/pata_parport/ppc6lnx.c @@ -72,7 +72,6 @@ static void ppc6_deselect(struct pi_adapter *pi); static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd); static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data); static u8 ppc6_rd_data_byte(struct pi_adapter *pi); -static u8 ppc6_rd_port(struct pi_adapter *pi, u8 port); static void ppc6_wr_port(struct pi_adapter *pi, u8 port, u8 data); static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count); static void ppc6_wait_for_fifo(struct pi_adapter *pi); @@ -288,15 +287,6 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi) //*************************************************************************** -static u8 ppc6_rd_port(struct pi_adapter *pi, u8 port) -{ - ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_READ); - - return ppc6_rd_data_byte(pi); -} - -//*************************************************************************** - static void ppc6_wr_port(struct pi_adapter *pi, u8 port, u8 data) { ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_WRITE);