2023-03-07 22:47:11

by Ondrej Zary

Subject: [PATCH 01/32] pata_parport-bpck6: remove useless defines

Almost all the ATAPI_ defines are unused. Remove them and use
ATA_REG_DATA instead of ATAPI_DATA.

Signed-off-by: Ondrej Zary <[email protected]>
---
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)
--
Ondrej Zary

2023-03-08 10:28:51

by Sergei Shtylyov

Subject: Re: [PATCH 01/32] pata_parport-bpck6: remove useless defines

Hello!

(Sending via my Gmail account, as the OMP SMTP server rejects mails...)

On 3/8/23 1:45 AM, Ondrej Zary wrote:

> Almost all the ATAPI_ defines are unused. Remove them and use
> ATA_REG_DATA instead of ATAPI_DATA.
>
> Signed-off-by: Ondrej Zary <[email protected]>

Reviewed-by: Sergey Shtylyov <[email protected]>

[...]

MBR, Sergey