From patchwork Tue Mar 7 22:46:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 65947 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp10611wrd; Tue, 7 Mar 2023 15:04:02 -0800 (PST) X-Google-Smtp-Source: AK7set93IxLOc9W6FzIGXA0zk06H+cQBCksiZ+xT1i2Kn/uSGxsdfuYa95SJn5mL2cHAbC0wkoEX X-Received: by 2002:aa7:c14e:0:b0:4ac:d2cd:81c7 with SMTP id r14-20020aa7c14e000000b004acd2cd81c7mr16361448edp.5.1678230242628; Tue, 07 Mar 2023 15:04:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678230242; cv=none; d=google.com; s=arc-20160816; b=BVI3ljtDB2/azaZUqpIzyirvBXAihQS3ttDnWil0nhEhnJ9PovrSqonwjZuPpCU1cI DHAh6/87XEB3rlpO2ihMayMQ3CEh77PikzAbgA7YQx6rCI3evlb+q+JvU8C6bt2LIrZy m69/icM+vD5B2URVHklX+2shP70jdJLdvSwVWYHgrJXoHpwm/S6fLn5mQMoJl9XsXQ8y iITNaCIoR32HIcYZB23DjFCalRpf9N0w21JsQ/7YdORsEakSGAhFx90RvPu7lnV2oITh Hl154i4U/UZaRLPXUeRHIRiCff82e5sdT67O866Gmgi/oNaMGNePneLgmpMMU/sdrBKI IThg== 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=f2C+e1PLVza+0oQah+SevyUi8FgCmveZqT7y7CXVSDc=; b=bFXQ3faeHixScyPHZJUT9XYIo/VIGsG7NepsSJnCYL5cXOXU4NxVfAg17tWAnLpi6i uuyzSKa/10mfOezPHHCuKBi5Q1XlPdQ+1iOI0l695mkpXPTGR833KF35Kr0PDcmrvCrT NdnNzRt0dE4hED83R2x04LGDvMBVjxntY4NggvuwDiOlwSujreRaZqmcogxW2a9q36OM dXhRrzVNcG8swaQw3j96oRIlnXRY94nzKWqD1TXjv3FhbKGYRJ7tBWRgA60ADdoE+xlE zf0N8uFq64KSbGbZEHcDuN4Qop1/kzZfud40DCenSM4c1mUZzY28DUOLfbL5zJPDYTFA LjCA== 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 b4-20020aa7d484000000b004acc575090fsi3925307edr.36.2023.03.07.15.03.38; Tue, 07 Mar 2023 15:04:02 -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 S231132AbjCGWry (ORCPT + 99 others); Tue, 7 Mar 2023 17:47:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229991AbjCGWrK (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 EEEED43928; Tue, 7 Mar 2023 14:47:02 -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 503E87A071B; 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 14/32] pata_parport-bpck6: remove PPC_FLAGS Date: Tue, 7 Mar 2023 23:46:09 +0100 Message-Id: <20230307224627.28011-15-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?1759751954934064449?= X-GMAIL-MSGID: =?utf-8?q?1759751954934064449?= pi->private is now not used for any other purpose, so store wait_fifo flag directly there and remove PPC_FLAGS define. Signed-off-by: Ondrej Zary Reviewed-by: Sergey Shtylyov --- drivers/ata/pata_parport/ppc6lnx.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/ata/pata_parport/ppc6lnx.c b/drivers/ata/pata_parport/ppc6lnx.c index fdc11875bf1b..9a166f396112 100644 --- a/drivers/ata/pata_parport/ppc6lnx.c +++ b/drivers/ata/pata_parport/ppc6lnx.c @@ -49,10 +49,6 @@ //*************************************************************************** -#define PPC_FLAGS (((u8 *)&pi->private)[1]) - -//*************************************************************************** - // ppc_flags #define fifo_wait 0x10 @@ -405,7 +401,7 @@ static void ppc6_wait_for_fifo(struct pi_adapter *pi) { int i; - if (PPC_FLAGS & fifo_wait) + if (pi->private & fifo_wait) { for(i=0; i<20; i++) parport_read_status(pi->pardev->port); @@ -562,7 +558,7 @@ static int ppc6_open(struct pi_adapter *pi) if (ret == 0) return(ret); - PPC_FLAGS &= ~fifo_wait; + pi->private = 0; ppc6_send_cmd(pi, ACCESS_REG | ACCESS_WRITE | REG_RAMSIZE); ppc6_wr_data_byte(pi, RAMSIZE_128K); @@ -570,7 +566,7 @@ static int ppc6_open(struct pi_adapter *pi) ppc6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION); if ((ppc6_rd_data_byte(pi) & 0x3F) == 0x0C) - PPC_FLAGS |= fifo_wait; + pi->private |= fifo_wait; return(ret); }