From patchwork Tue Mar 7 22:46:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 65939 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp8531wrd; Tue, 7 Mar 2023 15:00:44 -0800 (PST) X-Google-Smtp-Source: AK7set99+5pdvTK2mLCipxY9/f5YKelKoDzrzK0dNr3O8NJtBfPv3Yfwf24YV30zOL2fOf3cvjum X-Received: by 2002:a05:6402:1619:b0:4af:63a7:7485 with SMTP id f25-20020a056402161900b004af63a77485mr15846959edv.17.1678230044539; Tue, 07 Mar 2023 15:00:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678230044; cv=none; d=google.com; s=arc-20160816; b=wGKjiGYhoUDa/PqoPzy6SOV5SVlJRIK7b6IrVdCwNTeDyQL3Lx4g0cTTfXcxmLHDhy wHvROuZIQRhd78a+U+Yx0kXHjfPvxRxTLwtHmw+sQAV/HtKTdLDUXYuIIn/E1dX4vd50 QTaBD5bvMzAIPdJSM1LgWqhtWDSedSdgJxFle6LfoD/XzFtuLfxNIniMZVOVEzaSFz8y oHIXTGnD0kL6qYfD9pfdHoxBDB6KjmV2U+x2CYbLN88wxlFcwrbYlaRKuebxQNI6Cbt3 Hm9svooZeLtnF2Lu050nA7CupHK3MXP5M7DlWYvaSQ2TiUV0Kzc4IEmHTkdSAGq0BIBR 4+Rw== 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=xHZ0de99UUR/EOFio2CgoB/350A0KhwGE0euUa3sIdk=; b=XY2ASP5vR+cswve0KLd/xdq0SoGsAs1/XP3aqizpPXEotdtSwkLUYo5dnOMBFgc5z0 uoTwU9u0nIS9LCbb6T5/2OMA2zTI9s9fysHZ90lIq3TpQ4PW2A4B41Z8r7wYPw9KR5tt Me9zMSJNesayEUceXWZHRhn/NX3RYoDljTAhwyPf16nAA7m4Wedm0JyqA87Fkl+jmKJM rNIqtXvt9BC1Nbt3X+rRYx/Bdsn6qEfgaloz5tpQafY/6Wmm6419FWeLhTFzINg72tjs USYG5WZVeoRM/YOYVLJWX2xWJYO9eAAxmer1+HuP5FM5/t/dcGRhoYOJOSPGfj8YZEDX kc7w== 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 t8-20020a17090616c800b008b71bc0308asi12986979ejd.139.2023.03.07.15.00.14; Tue, 07 Mar 2023 15:00:44 -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 S231811AbjCGWsD (ORCPT + 99 others); Tue, 7 Mar 2023 17:48:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230247AbjCGWrK (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 E823A4FAA7; 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 65F1C7A071E; 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 15/32] pata_parport-bpck6: remove ppc6_close Date: Tue, 7 Mar 2023 23:46:10 +0100 Message-Id: <20230307224627.28011-16-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?1759751747003486814?= X-GMAIL-MSGID: =?utf-8?q?1759751747003486814?= ppc6_close does not do anything except calling ppc6_deselect. Remove ppc6_close and call ppc6_deselect directly. Signed-off-by: Ondrej Zary --- drivers/ata/pata_parport/bpck6.c | 4 ++-- drivers/ata/pata_parport/ppc6lnx.c | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bpck6.c index 39ac6e1a0aee..b8135a6eed16 100644 --- a/drivers/ata/pata_parport/bpck6.c +++ b/drivers/ata/pata_parport/bpck6.c @@ -51,7 +51,7 @@ static void bpck6_disconnect(struct pi_adapter *pi) { dev_dbg(&pi->dev, "disconnect\n"); ppc6_wr_extout(pi, 0x0); - ppc6_close(pi); + ppc6_deselect(pi); } static int bpck6_test_port(struct pi_adapter *pi) /* check for 8-bit port */ @@ -83,7 +83,7 @@ static int bpck6_probe_unit(struct pi_adapter *pi) if(out) { - ppc6_close(pi); + ppc6_deselect(pi); dev_dbg(&pi->dev, "leaving probe\n"); pi->mode = saved_mode; return(1); diff --git a/drivers/ata/pata_parport/ppc6lnx.c b/drivers/ata/pata_parport/ppc6lnx.c index 9a166f396112..5b7796083e7e 100644 --- a/drivers/ata/pata_parport/ppc6lnx.c +++ b/drivers/ata/pata_parport/ppc6lnx.c @@ -81,7 +81,6 @@ static void ppc6_rd_port16_blk(struct pi_adapter *pi, u8 port, u8 *data, long le static void ppc6_wr_port16_blk(struct pi_adapter *pi, u8 port, u8 *data, long length); static void ppc6_wr_extout(struct pi_adapter *pi, u8 regdata); static int ppc6_open(struct pi_adapter *pi); -static void ppc6_close(struct pi_adapter *pi); //*************************************************************************** @@ -573,10 +572,3 @@ static int ppc6_open(struct pi_adapter *pi) //*************************************************************************** -static void ppc6_close(struct pi_adapter *pi) -{ - ppc6_deselect(pi); -} - -//*************************************************************************** -