Commit 4192a40f authored by Ondrej Zary's avatar Ondrej Zary Committed by Martin K. Petersen

atp870u: Rename is885() to atp_is()

Now that all the is* functions except is885() are gone, rename is885() to
atp_is() to avoid confusion. Don't know what "is" means, though...
Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Reviewed-by: default avatarHannes Reinicke <hare@suse.de>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 851eb661
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
static struct scsi_host_template atp870u_template; static struct scsi_host_template atp870u_template;
static void send_s870(struct atp_unit *dev,unsigned char c); static void send_s870(struct atp_unit *dev,unsigned char c);
static void is885(struct atp_unit *dev, unsigned char c, bool wide_chip, unsigned char lvdmode); static void atp_is(struct atp_unit *dev, unsigned char c, bool wide_chip, unsigned char lvdmode);
static void tscam_885(void); static void tscam_885(void);
static inline void atp_writeb_base(struct atp_unit *atp, u8 reg, u8 val) static inline void atp_writeb_base(struct atp_unit *atp, u8 reg, u8 val)
...@@ -1373,7 +1373,7 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1373,7 +1373,7 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
outb(0x20, base_io + 0x51); outb(0x20, base_io + 0x51);
tscam(shpnt); tscam(shpnt);
is885(p, 0, true, atp_readb_base(p, 0x3f) & 0x40); atp_is(p, 0, true, atp_readb_base(p, 0x3f) & 0x40);
outb(0xb0, base_io + 0x38); outb(0xb0, base_io + 0x38);
shpnt->max_id = 16; shpnt->max_id = 16;
shpnt->this_id = host_id; shpnt->this_id = host_id;
...@@ -1519,10 +1519,10 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1519,10 +1519,10 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
tscam_885(); tscam_885();
printk(KERN_INFO " Scanning Channel A SCSI Device ...\n"); printk(KERN_INFO " Scanning Channel A SCSI Device ...\n");
is885(p, 0, true, atp_readb_io(p, 0, 0x1b) >> 7); atp_is(p, 0, true, atp_readb_io(p, 0, 0x1b) >> 7);
atp_writeb_io(p, 0, 0x16, 0x80); atp_writeb_io(p, 0, 0x16, 0x80);
printk(KERN_INFO " Scanning Channel B SCSI Device ...\n"); printk(KERN_INFO " Scanning Channel B SCSI Device ...\n");
is885(p, 1, true, atp_readb_io(p, 1, 0x1b) >> 7); atp_is(p, 1, true, atp_readb_io(p, 1, 0x1b) >> 7);
atp_writeb_io(p, 1, 0x16, 0x80); atp_writeb_io(p, 1, 0x16, 0x80);
k = inb(base_io + 0x28) & 0xcf; k = inb(base_io + 0x28) & 0xcf;
k |= 0xc0; k |= 0xc0;
...@@ -1605,7 +1605,7 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1605,7 +1605,7 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
tscam(shpnt); tscam(shpnt);
atp_writeb_io(p, 0, 0x3a, atp_readb_io(p, 0, 0x3a) | 0x10); atp_writeb_io(p, 0, 0x3a, atp_readb_io(p, 0, 0x3a) | 0x10);
is885(p, 0, p->chip_ver == 4, 0); atp_is(p, 0, p->chip_ver == 4, 0);
atp_writeb_io(p, 0, 0x3a, atp_readb_io(p, 0, 0x3a) & 0xef); atp_writeb_io(p, 0, 0x3a, atp_readb_io(p, 0, 0x3a) & 0xef);
outb((inb(base_io + 0x3a) & 0xef), base_io + 0x3a); outb((inb(base_io + 0x3a) & 0xef), base_io + 0x3a);
outb((inb(base_io + 0x3b) | 0x20), base_io + 0x3b); outb((inb(base_io + 0x3b) | 0x20), base_io + 0x3b);
...@@ -1826,7 +1826,7 @@ static void tscam_885(void) ...@@ -1826,7 +1826,7 @@ static void tscam_885(void)
static void is885(struct atp_unit *dev, unsigned char c, bool wide_chip, unsigned char lvdmode) static void atp_is(struct atp_unit *dev, unsigned char c, bool wide_chip, unsigned char lvdmode)
{ {
unsigned char i, j, k, rmb, n; unsigned char i, j, k, rmb, n;
unsigned short int m; unsigned short int m;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment