From patchwork Tue Mar 7 22:46:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 65919 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4609wrd; Tue, 7 Mar 2023 14:49:51 -0800 (PST) X-Google-Smtp-Source: AK7set+CG5SFvDlpA5UTRmIv+JKvMwSylXJi+g6EsOwbY1Nn6Gh4r7KAH9YUZFkHCBU84MIOERH5 X-Received: by 2002:a05:6a21:99a5:b0:a5:df86:f0e1 with SMTP id ve37-20020a056a2199a500b000a5df86f0e1mr15782905pzb.16.1678229391643; Tue, 07 Mar 2023 14:49:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678229391; cv=none; d=google.com; s=arc-20160816; b=ae+htUmYiFD7ZNq/Ept8PmZPItHvIVtEIgwZAicnvpOS24OSGSOQwJUqyi83X0za+Q zxYyG6tiabuylZbb/aCUDlLkHc6GnOQOTElreQIR7n/e/bORCDKF+e93zcVFl9vaOYbt keKzmz0jj/NyU5ieYu37X4BJdPCFk3BKM9X6N7nlDzEKcd3rtwyGhgh9B+9UKNSCeM8J XYwy5Mh9FXUaJrHPw8I3ZZgn8pzjjSwqpidh/Bj79qmtp0vIktD7eJ5RH29XeOIEXHFO 8+SKjpUNIsgjCWoBL9QEQmKmzKH1NYxhczpXi6QDN4XdMbZgalckh10WSgV1nQD4CPC9 tY8w== 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=ovGGXr0i5EJsFtnFnJoPYZR2KOLznYLsMeYVa5VB/Z8=; b=LxkJZWGF1dTMhIIzczqrXjrr6pL6nriFo/jtAwx/VwtDQL6kVL8YruUkcrbO3QV50P BxPTgB8iSVWy/96ca70BMQz78z/UCEZ5bIJ+HGzC9F1go30H5ZVTDzjVN0/+VxiNZ15k HGAF5a9JVv81nY9gVYaiDycJkf7FL6g3L+0rp006KIz1FSwa4esDmqxSRsPhzXObvVXW 8gXeCwsfVVkv9BeN0kXll6xfNi82l8ebIwDUu/9gEVO+Ep14OeK+olHKIZm/ArqSRUga qmASvMHV8/Gc/Bv4W7GQ5tEda0YMRU+c8ZmtsM/1QyN4C3nwjRxc3naSpT2Z6wp3lcDx NztA== 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 y187-20020a6232c4000000b005a8ac97d6cdsi12467784pfy.344.2023.03.07.14.49.37; Tue, 07 Mar 2023 14:49:51 -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 S231639AbjCGWsL (ORCPT + 99 others); Tue, 7 Mar 2023 17:48:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230177AbjCGWrM (ORCPT ); Tue, 7 Mar 2023 17:47:12 -0500 Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 813FD166D6; Tue, 7 Mar 2023 14:47:05 -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 ABC9A7A0731; 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 17/32] pata_parport-bpck6: merge ppc6_wr_port into bpck6_write_regr Date: Tue, 7 Mar 2023 23:46:12 +0100 Message-Id: <20230307224627.28011-18-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?1759751062332625586?= X-GMAIL-MSGID: =?utf-8?q?1759751062332625586?= ppc6_wr_port is only called by bpck6_write_regr. Merge ppc6_wr_port into bpck6_write_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 2918fc9e9def..8e0094e3b02b 100644 --- a/drivers/ata/pata_parport/bpck6.c +++ b/drivers/ata/pata_parport/bpck6.c @@ -29,7 +29,10 @@ static int bpck6_read_regr(struct pi_adapter *pi, int cont, int reg) static void bpck6_write_regr(struct pi_adapter *pi, int cont, int reg, int val) { - ppc6_wr_port(pi, cont?reg|8:reg, val); + u8 port = cont ? reg | 8 : reg; + + ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_WRITE); + ppc6_wr_data_byte(pi, val); } static void bpck6_write_block(struct pi_adapter *pi, char *buf, int len) diff --git a/drivers/ata/pata_parport/ppc6lnx.c b/drivers/ata/pata_parport/ppc6lnx.c index 23dce177b722..35427742e4d3 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 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); static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count); @@ -287,15 +286,6 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi) //*************************************************************************** -static void ppc6_wr_port(struct pi_adapter *pi, u8 port, u8 data) -{ - ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_WRITE); - - ppc6_wr_data_byte(pi, data); -} - -//*************************************************************************** - static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count) { switch (mode_map[pi->mode])