mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
atp870u: Unify code format in is870(), is880() and is885()
Unify code formatting in is870(), is880() and is885() functions to simplify comparing them. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Reviewed-by: Hannes Reinicke <hare@suse.de> Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Ondrej Zary
Martin K. Petersen
parent
5d2a5a4f86
commit
80b52a7f8d
1 changed files with 101 additions and 69 deletions
|
|
@ -1230,8 +1230,10 @@ static void is870(struct atp_unit *dev)
|
|||
|
||||
phase_cmd:
|
||||
atp_writeb_io(dev, 0, 0x18, 0x08);
|
||||
|
||||
while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
|
||||
j = atp_readb_io(dev, 0, 0x17);
|
||||
if (j != 0x16) {
|
||||
atp_writeb_io(dev, 0, 0x10, 0x41);
|
||||
|
|
@ -1287,9 +1289,9 @@ static void is870(struct atp_unit *dev)
|
|||
while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
|
||||
if (atp_readb_io(dev, 0, 0x17) != 0x16) {
|
||||
if (atp_readb_io(dev, 0, 0x17) != 0x16)
|
||||
goto sel_ok;
|
||||
}
|
||||
|
||||
inq_ok:
|
||||
mbuf[36] = 0;
|
||||
printk(KERN_INFO " ID: %2d %s\n", i, &mbuf[8]);
|
||||
|
|
@ -1710,6 +1712,7 @@ static void is880(struct atp_unit *dev)
|
|||
atp_writeb_io(dev, 0, 0x13, 0);
|
||||
atp_writeb_io(dev, 0, 0x14, 0);
|
||||
atp_writeb_io(dev, 0, 0x18, 0x08);
|
||||
|
||||
while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
|
||||
|
|
@ -1888,6 +1891,7 @@ static void is880(struct atp_unit *dev)
|
|||
if ((atp_readb_io(dev, 0, 0x1f) & 0x01) != 0)
|
||||
atp_writeb_io(dev, 0, 0x19, wide[j++]);
|
||||
}
|
||||
|
||||
while ((atp_readb_io(dev, 0, 0x17) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
|
||||
|
|
@ -2013,9 +2017,9 @@ static void is880(struct atp_unit *dev)
|
|||
while ((atp_readb_io(dev, 0, 0x1f) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
|
||||
if (atp_readb_io(dev, 0, 0x17) != 0x11 && atp_readb_io(dev, 0, 0x17) != 0x8e) {
|
||||
if (atp_readb_io(dev, 0, 0x17) != 0x11 && atp_readb_io(dev, 0, 0x17) != 0x8e)
|
||||
continue;
|
||||
}
|
||||
|
||||
while (atp_readb_io(dev, 0, 0x17) != 0x8e)
|
||||
cpu_relax();
|
||||
|
||||
|
|
@ -2862,7 +2866,6 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
atp_writeb_io(dev, c, 8, satn[5]);
|
||||
atp_writeb_io(dev, c, 0x0f, 0);
|
||||
atp_writeb_io(dev, c, 0x11, dev->id[c][i].devsp);
|
||||
|
||||
atp_writeb_io(dev, c, 0x12, 0);
|
||||
atp_writeb_io(dev, c, 0x13, satn[6]);
|
||||
atp_writeb_io(dev, c, 0x14, satn[7]);
|
||||
|
|
@ -2875,11 +2878,13 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
|
||||
while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
if ((atp_readb_io(dev, c, 0x17) != 0x11) && (atp_readb_io(dev, c, 0x17) != 0x8e)) {
|
||||
|
||||
if (atp_readb_io(dev, c, 0x17) != 0x11 && atp_readb_io(dev, c, 0x17) != 0x8e)
|
||||
continue;
|
||||
}
|
||||
|
||||
while (atp_readb_io(dev, c, 0x17) != 0x8e)
|
||||
cpu_relax();
|
||||
|
||||
dev->active_id[c] |= m;
|
||||
|
||||
atp_writeb_io(dev, c, 0x10, 0x30);
|
||||
|
|
@ -2887,8 +2892,10 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
|
||||
phase_cmd:
|
||||
atp_writeb_io(dev, c, 0x18, 0x08);
|
||||
|
||||
while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
|
||||
j = atp_readb_io(dev, c, 0x17);
|
||||
if (j != 0x16) {
|
||||
atp_writeb_io(dev, c, 0x10, 0x41);
|
||||
|
|
@ -2907,13 +2914,16 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
atp_writeb_io(dev, c, 0x13, inqd[6]);
|
||||
atp_writeb_io(dev, c, 0x14, inqd[7]);
|
||||
atp_writeb_io(dev, c, 0x18, inqd[8]);
|
||||
|
||||
while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
if ((atp_readb_io(dev, c, 0x17) != 0x11) && (atp_readb_io(dev, c, 0x17) != 0x8e)) {
|
||||
|
||||
if (atp_readb_io(dev, c, 0x17) != 0x11 && atp_readb_io(dev, c, 0x17) != 0x8e)
|
||||
continue;
|
||||
}
|
||||
|
||||
while (atp_readb_io(dev, c, 0x17) != 0x8e)
|
||||
cpu_relax();
|
||||
|
||||
atp_writeb_io(dev, c, 0x1b, 0x00);
|
||||
atp_writeb_io(dev, c, 0x18, 0x08);
|
||||
j = 0;
|
||||
|
|
@ -2935,11 +2945,13 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
atp_writeb_io(dev, c, 0x13, 0);
|
||||
atp_writeb_io(dev, c, 0x14, 0);
|
||||
atp_writeb_io(dev, c, 0x18, 0x08);
|
||||
|
||||
while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
if (atp_readb_io(dev, c, 0x17) != 0x16) {
|
||||
|
||||
if (atp_readb_io(dev, c, 0x17) != 0x16)
|
||||
goto sel_ok;
|
||||
}
|
||||
|
||||
inq_ok:
|
||||
mbuf[36] = 0;
|
||||
printk(KERN_INFO " ID: %2d %s\n", i, &mbuf[8]);
|
||||
|
|
@ -2955,7 +2967,8 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
if (lvdmode == 0) {
|
||||
goto chg_wide;
|
||||
}
|
||||
if (dev->sp[c][i] != 0x04) { // force u2
|
||||
if (dev->sp[c][i] != 0x04) // force u2
|
||||
{
|
||||
goto chg_wide;
|
||||
}
|
||||
|
||||
|
|
@ -2975,11 +2988,13 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
|
||||
while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
if ((atp_readb_io(dev, c, 0x17) != 0x11) && (atp_readb_io(dev, c, 0x17) != 0x8e)) {
|
||||
|
||||
if (atp_readb_io(dev, c, 0x17) != 0x11 && atp_readb_io(dev, c, 0x17) != 0x8e)
|
||||
continue;
|
||||
}
|
||||
|
||||
while (atp_readb_io(dev, c, 0x17) != 0x8e)
|
||||
cpu_relax();
|
||||
|
||||
try_u3:
|
||||
j = 0;
|
||||
atp_writeb_io(dev, c, 0x14, 0x09);
|
||||
|
|
@ -2990,8 +3005,10 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
atp_writeb_io(dev, c, 0x19, u3[j++]);
|
||||
cpu_relax();
|
||||
}
|
||||
|
||||
while ((atp_readb_io(dev, c, 0x17) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
|
||||
j = atp_readb_io(dev, c, 0x17) & 0x0f;
|
||||
if (j == 0x0f) {
|
||||
goto u3p_in;
|
||||
|
|
@ -3049,7 +3066,9 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
atp_writeb_io(dev, c, 0x10, 0x30);
|
||||
atp_writeb_io(dev, c, 0x14, 0x00);
|
||||
atp_writeb_io(dev, c, 0x18, 0x08);
|
||||
|
||||
while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00);
|
||||
|
||||
j = atp_readb_io(dev, c, 0x17);
|
||||
if (j != 0x16) {
|
||||
if (j == 0x4e) {
|
||||
|
|
@ -3093,11 +3112,13 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
|
||||
while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
if ((atp_readb_io(dev, c, 0x17) != 0x11) && (atp_readb_io(dev, c, 0x17) != 0x8e)) {
|
||||
|
||||
if (atp_readb_io(dev, c, 0x17) != 0x11 && atp_readb_io(dev, c, 0x17) != 0x8e)
|
||||
continue;
|
||||
}
|
||||
|
||||
while (atp_readb_io(dev, c, 0x17) != 0x8e)
|
||||
cpu_relax();
|
||||
|
||||
try_wide:
|
||||
j = 0;
|
||||
atp_writeb_io(dev, c, 0x14, 0x05);
|
||||
|
|
@ -3108,8 +3129,10 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
atp_writeb_io(dev, c, 0x19, wide[j++]);
|
||||
cpu_relax();
|
||||
}
|
||||
|
||||
while ((atp_readb_io(dev, c, 0x17) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
|
||||
j = atp_readb_io(dev, c, 0x17) & 0x0f;
|
||||
if (j == 0x0f) {
|
||||
goto widep_in;
|
||||
|
|
@ -3167,8 +3190,10 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
atp_writeb_io(dev, c, 0x10, 0x30);
|
||||
atp_writeb_io(dev, c, 0x14, 0x00);
|
||||
atp_writeb_io(dev, c, 0x18, 0x08);
|
||||
|
||||
while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
|
||||
j = atp_readb_io(dev, c, 0x17);
|
||||
if (j != 0x16) {
|
||||
if (j == 0x4e) {
|
||||
|
|
@ -3192,8 +3217,7 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
m = m << i;
|
||||
dev->wide_id[c] |= m;
|
||||
not_wide:
|
||||
if ((dev->id[c][i].devtype == 0x00) || (dev->id[c][i].devtype == 0x07) ||
|
||||
((dev->id[c][i].devtype == 0x05) && ((n & 0x10) != 0))) {
|
||||
if ((dev->id[c][i].devtype == 0x00) || (dev->id[c][i].devtype == 0x07) || ((dev->id[c][i].devtype == 0x05) && ((n & 0x10) != 0))) {
|
||||
m = 1;
|
||||
m = m << i;
|
||||
if ((dev->async[c] & m) != 0) {
|
||||
|
|
@ -3231,11 +3255,13 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
|
||||
while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
if ((atp_readb_io(dev, c, 0x17) != 0x11) && (atp_readb_io(dev, c, 0x17) != 0x8e)) {
|
||||
|
||||
if (atp_readb_io(dev, c, 0x17) != 0x11 && atp_readb_io(dev, c, 0x17) != 0x8e)
|
||||
continue;
|
||||
}
|
||||
|
||||
while (atp_readb_io(dev, c, 0x17) != 0x8e)
|
||||
cpu_relax();
|
||||
|
||||
try_sync:
|
||||
j = 0;
|
||||
atp_writeb_io(dev, c, 0x14, 0x06);
|
||||
|
|
@ -3258,8 +3284,10 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
while ((atp_readb_io(dev, c, 0x17) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
|
||||
j = atp_readb_io(dev, c, 0x17) & 0x0f;
|
||||
if (j == 0x0f) {
|
||||
goto phase_ins;
|
||||
|
|
@ -3306,7 +3334,9 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
if ((j & 0x80) == 0x00) {
|
||||
goto phase_ins1;
|
||||
}
|
||||
|
||||
while ((atp_readb_io(dev, c, 0x17) & 0x80) == 0x00);
|
||||
|
||||
j = atp_readb_io(dev, c, 0x17);
|
||||
if (j == 0x85) {
|
||||
goto tar_dcons;
|
||||
|
|
@ -3327,8 +3357,10 @@ static void is885(struct atp_unit *dev, unsigned char c)
|
|||
tar_dcons:
|
||||
atp_writeb_io(dev, c, 0x14, 0x00);
|
||||
atp_writeb_io(dev, c, 0x18, 0x08);
|
||||
|
||||
while ((atp_readb_io(dev, c, 0x1f) & 0x80) == 0x00)
|
||||
cpu_relax();
|
||||
|
||||
j = atp_readb_io(dev, c, 0x17);
|
||||
if (j != 0x16) {
|
||||
continue;
|
||||
|
|
|
|||
Loading…
Reference in a new issue