From patchwork Tue Mar 7 22:45:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 65931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp7483wrd; Tue, 7 Mar 2023 14:57:57 -0800 (PST) X-Google-Smtp-Source: AK7set+ofgwUblhIdPCK/9CjxzLeIQgFZuhrsFS8gh6cH8Ge7vxtGoWKqKLz0r564TCNhv3Q4tKC X-Received: by 2002:a17:907:8b98:b0:8b1:76dd:f5f6 with SMTP id tb24-20020a1709078b9800b008b176ddf5f6mr21541120ejc.50.1678229877182; Tue, 07 Mar 2023 14:57:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678229877; cv=none; d=google.com; s=arc-20160816; b=ShiJChocbMuBRjiCu86707F2OtMxcI3YnLWaeH6g1IDvW82Y9jywR/ayIvbQXKfzZR ay+6NGM+nchkUiU0zRZVDaqY2Xe3JbJ0ws2wh+HU2zpRfAkHmEfJXqoJGCKDlb0u9euD c7WUEfLDhrhbqHVaJhkHlLSp2KKqPVT0JB2zcUQ684HOcMRoD7g+hXYZpjzStXFABM24 MgJMKZltEaGI45Bo1gHizdfX1IMkyed3lerABduHXv2l4kQdFhKvQo4EnSvTNdEJlI4u 7v/POsieAscBZPS296IPPJ1OPzOAskTkcRlmil3w9eeqmPAzN0EZbGfXWhZcvQzpUYz1 MopA== 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=FgQ5r9Zl3+qVxpo8SESUC4P3nUYq+D07VOLc4JPPDYQ=; b=NsLLkBhDtdzqx1iDIzj9tmW84rI98hg0NtIbHw73CVdLbNlCXlWIoGiu4YquXWZ+45 o04RGxhvRkujqwjEgIMAWTrs1qWoApMcx8eY/V/INbqniKdc7b+LqVpzv76dxS4IsD40 Am4T87AvEIE19107FE+JzuouAUpm5qT+unpmRogLV/CK8Lgvnl53ZK8l5k/3xWyRRyR9 rd4Xu4zRKpe3okiOan7QKDNnJ/C9xQVr/uRON489MyiVXNIrPPChc4vb7PExe/9RGg56 FF3E4BSmOojgaZuZrsMovbW3nW0xF05kCgdvnxTgPuRLkiblaGP8GvF92+GM4qIX7r/L 4ebg== 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 gb7-20020a170907960700b008b1810ef12esi328117ejc.65.2023.03.07.14.57.33; Tue, 07 Mar 2023 14:57:57 -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 S230361AbjCGWrI (ORCPT + 99 others); Tue, 7 Mar 2023 17:47:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229746AbjCGWrA (ORCPT ); Tue, 7 Mar 2023 17:47:00 -0500 Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3EB4993C8; Tue, 7 Mar 2023 14:46:49 -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 E06927A02E3; Tue, 7 Mar 2023 23:46:47 +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 01/32] pata_parport-bpck6: remove useless defines Date: Tue, 7 Mar 2023 23:45:56 +0100 Message-Id: <20230307224627.28011-2-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?1759751571435268197?= X-GMAIL-MSGID: =?utf-8?q?1759751571435268197?= Almost all the ATAPI_ defines are unused. Remove them and use ATA_REG_DATA instead of ATAPI_DATA. Signed-off-by: Ondrej Zary Reviewed-by: Sergey Shtylyov --- drivers/ata/pata_parport/bpck6.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bpck6.c index 964bc688e280..842e8116b649 100644 --- a/drivers/ata/pata_parport/bpck6.c +++ b/drivers/ata/pata_parport/bpck6.c @@ -23,23 +23,6 @@ #define PPCSTRUCT(pi) ((Interface *)(pi->private)) -/****************************************************************/ -/* - ATAPI CDROM DRIVE REGISTERS -*/ -#define ATAPI_DATA 0 /* data port */ -#define ATAPI_ERROR 1 /* error register (read) */ -#define ATAPI_FEATURES 1 /* feature register (write) */ -#define ATAPI_INT_REASON 2 /* interrupt reason register */ -#define ATAPI_COUNT_LOW 4 /* byte count register (low) */ -#define ATAPI_COUNT_HIGH 5 /* byte count register (high) */ -#define ATAPI_DRIVE_SEL 6 /* drive select register */ -#define ATAPI_STATUS 7 /* status port (read) */ -#define ATAPI_COMMAND 7 /* command port (write) */ -#define ATAPI_ALT_STATUS 0x0e /* alternate status reg (read) */ -#define ATAPI_DEVICE_CONTROL 0x0e /* device control (write) */ -/****************************************************************/ - static int bpck6_read_regr(struct pi_adapter *pi, int cont, int reg) { unsigned int out; @@ -64,12 +47,12 @@ static void bpck6_write_regr(struct pi_adapter *pi, int cont, int reg, int val) static void bpck6_write_block(struct pi_adapter *pi, char *buf, int len) { - ppc6_wr_port16_blk(PPCSTRUCT(pi),ATAPI_DATA,buf,(u32)len>>1); + ppc6_wr_port16_blk(PPCSTRUCT(pi), ATA_REG_DATA, buf, (u32)len>>1); } static void bpck6_read_block(struct pi_adapter *pi, char *buf, int len) { - ppc6_rd_port16_blk(PPCSTRUCT(pi),ATAPI_DATA,buf,(u32)len>>1); + ppc6_rd_port16_blk(PPCSTRUCT(pi), ATA_REG_DATA, buf, (u32)len>>1); } static void bpck6_connect(struct pi_adapter *pi)