Skip to content

Commit cd3b394

Browse files
Ondrej ZaryDamien Le Moal
authored andcommitted
ata: pata_parport-bpck6: remove ppc6_close
ppc6_close does not do anything except calling ppc6_deselect. Remove ppc6_close and call ppc6_deselect directly. Signed-off-by: Ondrej Zary <linux@zary.sk> Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
1 parent 77c521d commit cd3b394

2 files changed

Lines changed: 2 additions & 10 deletions

File tree

drivers/ata/pata_parport/bpck6.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static void bpck6_disconnect(struct pi_adapter *pi)
5151
{
5252
dev_dbg(&pi->dev, "disconnect\n");
5353
ppc6_wr_extout(pi, 0x0);
54-
ppc6_close(pi);
54+
ppc6_deselect(pi);
5555
}
5656

5757
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)
8383

8484
if(out)
8585
{
86-
ppc6_close(pi);
86+
ppc6_deselect(pi);
8787
dev_dbg(&pi->dev, "leaving probe\n");
8888
pi->mode = saved_mode;
8989
return(1);

drivers/ata/pata_parport/ppc6lnx.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ static void ppc6_rd_port16_blk(struct pi_adapter *pi, u8 port, u8 *data, long le
8181
static void ppc6_wr_port16_blk(struct pi_adapter *pi, u8 port, u8 *data, long length);
8282
static void ppc6_wr_extout(struct pi_adapter *pi, u8 regdata);
8383
static int ppc6_open(struct pi_adapter *pi);
84-
static void ppc6_close(struct pi_adapter *pi);
8584

8685
//***************************************************************************
8786

@@ -573,10 +572,3 @@ static int ppc6_open(struct pi_adapter *pi)
573572

574573
//***************************************************************************
575574

576-
static void ppc6_close(struct pi_adapter *pi)
577-
{
578-
ppc6_deselect(pi);
579-
}
580-
581-
//***************************************************************************
582-

0 commit comments

Comments
 (0)