iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ata: pata_parport-bpck6: move ppc6_deselect to bpck6.c and rename

Browse Source 
Move ppc6_deselect to bpck6.c and rename it to bpck6_deselect

Signed-off-by: Ondrej Zary <linux@zary.sk>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
This commit is contained in:
Ondrej Zary 2023-03-07 23:46:21 +01:00 committed by Damien Le Moal
parent cad40b2a00
commit 82e16f824e
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/ata/pata_parport/bpck6.c
View File

@ -235,6 +235,21 @@ static int bpck6_open(struct pi_adapter *pi)
return 0; // FAIL return 0; // FAIL
} }
static void bpck6_deselect(struct pi_adapter *pi)
{
if (mode_map[pi->mode] & 4) // EPP
parport_frob_control(pi->pardev->port, PARPORT_CONTROL_INIT,
PARPORT_CONTROL_INIT);
else // PPC/ECP
parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT,
PARPORT_CONTROL_SELECT);
parport_write_data(pi->pardev->port, pi->saved_r0);
parport_write_control(pi->pardev->port,
pi->saved_r2 | PARPORT_CONTROL_SELECT);
parport_write_control(pi->pardev->port, pi->saved_r2);
}
static void bpck6_wr_extout(struct pi_adapter *pi, u8 regdata) static void bpck6_wr_extout(struct pi_adapter *pi, u8 regdata)
{ {
ppc6_send_cmd(pi, REG_VERSION | ACCESS_REG | ACCESS_WRITE); ppc6_send_cmd(pi, REG_VERSION | ACCESS_REG | ACCESS_WRITE);
@ -253,7 +268,7 @@ static void bpck6_disconnect(struct pi_adapter *pi)
{ {
dev_dbg(&pi->dev, "disconnect\n"); dev_dbg(&pi->dev, "disconnect\n");
bpck6_wr_extout(pi, 0x0); bpck6_wr_extout(pi, 0x0);
ppc6_deselect(pi); bpck6_deselect(pi);
} }
static int bpck6_test_port(struct pi_adapter *pi) /* check for 8-bit port */ static int bpck6_test_port(struct pi_adapter *pi) /* check for 8-bit port */
@ -285,7 +300,7 @@ static int bpck6_probe_unit(struct pi_adapter *pi)
if(out) if(out)
{ {
ppc6_deselect(pi); bpck6_deselect(pi);
dev_dbg(&pi->dev, "leaving probe\n"); dev_dbg(&pi->dev, "leaving probe\n");
pi->mode = saved_mode; pi->mode = saved_mode;
return(1); return(1);

19
drivers/ata/pata_parport/ppc6lnx.c
View File

@ -67,7 +67,6 @@
//*************************************************************************** //***************************************************************************
static void ppc6_deselect(struct pi_adapter *pi);
static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd); static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd);
static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data); static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data);
static u8 ppc6_rd_data_byte(struct pi_adapter *pi); static u8 ppc6_rd_data_byte(struct pi_adapter *pi);
@ -79,24 +78,6 @@ int mode_map[] = { PPCMODE_UNI_FW, PPCMODE_BI_FW, PPCMODE_EPP_BYTE,
//*************************************************************************** //***************************************************************************
static void ppc6_deselect(struct pi_adapter *pi)
{
if (mode_map[pi->mode] & 4) // EPP
parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_INIT, PARPORT_CONTROL_INIT);
else // PPC/ECP
parport_frob_control(pi->pardev->port,
PARPORT_CONTROL_SELECT, PARPORT_CONTROL_SELECT);
parport_write_data(pi->pardev->port, pi->saved_r0);
parport_write_control(pi->pardev->port, (pi->saved_r2 | PARPORT_CONTROL_SELECT));
parport_write_control(pi->pardev->port, pi->saved_r2);
}
//***************************************************************************
static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd) static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd)
{ {
switch (mode_map[pi->mode]) switch (mode_map[pi->mode])