Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d02a030 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

[PATCH] hisax niccy cleanup 



Whitespace cleanup, delete unnecesasry parenthesis and braces.

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Acked-by: default avatarKarsten Keil <kkeil@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 176f00ff

drivers/isdn/hisax/niccy.c

+109 −114
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
 *

 */





#include <linux/init.h>

#include "hisax.h"

#include "isac.h"
@@ -45,33 +44,31 @@ static const char *niccy_revision = "$Revision: 1.21.2.4 $"; 
#define PCI_IRQ_DISABLE		0xff0000

#define PCI_IRQ_ASSERT		0x800000



static inline u_char

readreg(unsigned int ale, unsigned int adr, u_char off)

static inline u_char readreg(unsigned int ale, unsigned int adr, u_char off)

{

	register u_char ret;



	byteout(ale, off);

	ret = bytein(adr);

	return (ret);

	return ret;

}



static inline void

readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size)

static inline void readfifo(unsigned int ale, unsigned int adr, u_char off,

		u_char *data, int size)

{

	byteout(ale, off);

	insb(adr, data, size);

}





static inline void

writereg(unsigned int ale, unsigned int adr, u_char off, u_char data)

static inline void writereg(unsigned int ale, unsigned int adr, u_char off,

		u_char data)

{

	byteout(ale, off);

	byteout(adr, data);

}



static inline void

writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size)

static inline void writefifo(unsigned int ale, unsigned int adr, u_char off,

		u_char *data, int size)

{

	byteout(ale, off);

	outsb(adr, data, size);
@@ -79,39 +76,34 @@ writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int siz 


/* Interface functions */



static u_char

ReadISAC(struct IsdnCardState *cs, u_char offset)

static u_char ReadISAC(struct IsdnCardState *cs, u_char offset)

{

	return (readreg(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, offset));

	return readreg(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, offset);

}



static void

WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value)

static void WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value)

{

	writereg(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, offset, value);

}



static void

ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size)

static void ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size)

{

	readfifo(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, 0, data, size);

}



static void

WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size)

static void WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size)

{

	writefifo(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, 0, data, size);

}



static u_char

ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset)

static u_char ReadHSCX(struct IsdnCardState *cs, int hscx, u_char offset)

{

	return (readreg(cs->hw.niccy.hscx_ale,

			cs->hw.niccy.hscx, offset + (hscx ? 0x40 : 0)));

	return readreg(cs->hw.niccy.hscx_ale,

			cs->hw.niccy.hscx, offset + (hscx ? 0x40 : 0));

}



static void

WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value)

static void WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset,

		u_char value)

{

	writereg(cs->hw.niccy.hscx_ale,

		 cs->hw.niccy.hscx, offset + (hscx ? 0x40 : 0), value);
@@ -130,8 +122,8 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) 


#include "hscx_irq.c"



static irqreturn_t

niccy_interrupt(int intno, void *dev_id, struct pt_regs *regs)

static irqreturn_t niccy_interrupt(int intno, void *dev_id,

		struct pt_regs *regs)

{

	struct IsdnCardState *cs = dev_id;

	u_char val;
@@ -147,7 +139,8 @@ niccy_interrupt(int intno, void *dev_id, struct pt_regs *regs) 
		}

		outl(ival, cs->hw.niccy.cfg_reg + PCI_IRQ_CTRL_REG);

	}

	val = readreg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, HSCX_ISTA + 0x40);

	val = readreg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx,

			HSCX_ISTA + 0x40);

Start_HSCX:

	if (val)

		hscx_int_main(cs, val);
@@ -155,7 +148,8 @@ niccy_interrupt(int intno, void *dev_id, struct pt_regs *regs) 
Start_ISAC:

	if (val)

		isac_interrupt(cs, val);

	val = readreg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, HSCX_ISTA + 0x40);

	val = readreg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx,

			HSCX_ISTA + 0x40);

	if (val) {

		if (cs->debug & L1_DEB_HSCX)

			debugl1(cs, "HSCX IntStat after IntRoutine");
@@ -168,7 +162,8 @@ niccy_interrupt(int intno, void *dev_id, struct pt_regs *regs) 
		goto Start_ISAC;

	}

	writereg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, HSCX_MASK, 0xFF);

	writereg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, HSCX_MASK + 0x40, 0xFF);

	writereg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, HSCX_MASK + 0x40,

		 0xFF);

	writereg(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, ISAC_MASK, 0xFF);

	writereg(cs->hw.niccy.isac_ale, cs->hw.niccy.isac, ISAC_MASK, 0);

	writereg(cs->hw.niccy.hscx_ale, cs->hw.niccy.hscx, HSCX_MASK, 0);
@@ -177,8 +172,7 @@ niccy_interrupt(int intno, void *dev_id, struct pt_regs *regs) 
	return IRQ_HANDLED;

}



static void

release_io_niccy(struct IsdnCardState *cs)

static void release_io_niccy(struct IsdnCardState *cs)

{

	if (cs->subtyp == NICCY_PCI) {

		int val;
@@ -194,8 +188,7 @@ release_io_niccy(struct IsdnCardState *cs) 
	}

}



static void

niccy_reset(struct IsdnCardState *cs)

static void niccy_reset(struct IsdnCardState *cs)

{

	if (cs->subtyp == NICCY_PCI) {

		int val;
@@ -207,8 +200,7 @@ niccy_reset(struct IsdnCardState *cs) 
	inithscxisac(cs, 3);

}



static int

niccy_card_msg(struct IsdnCardState *cs, int mt, void *arg)

static int niccy_card_msg(struct IsdnCardState *cs, int mt, void *arg)

{

	u_long flags;
@@ -217,19 +209,19 @@ niccy_card_msg(struct IsdnCardState *cs, int mt, void *arg) 
		spin_lock_irqsave(&cs->lock, flags);

		niccy_reset(cs);

		spin_unlock_irqrestore(&cs->lock, flags);

			return(0);

		return 0;

	case CARD_RELEASE:

		release_io_niccy(cs);

			return(0);

		return 0;

	case CARD_INIT:

		spin_lock_irqsave(&cs->lock, flags);

		niccy_reset(cs);

		spin_unlock_irqrestore(&cs->lock, flags);

			return(0);

		return 0;

	case CARD_TEST:

			return(0);

		return 0;

	}

	return(0);

	return 0;

}



static struct pci_dev *niccy_dev __devinitdata = NULL;
@@ -237,8 +229,7 @@ static struct pci_dev *niccy_dev __devinitdata = NULL; 
static struct pnp_card *pnp_c __devinitdata = NULL;

#endif



int __devinit

setup_niccy(struct IsdnCard *card)

int __devinit setup_niccy(struct IsdnCard *card)

{

	struct IsdnCardState *cs = card->cs;

	char tmp[64];
@@ -246,41 +237,45 @@ setup_niccy(struct IsdnCard *card) 
	strcpy(tmp, niccy_revision);

	printk(KERN_INFO "HiSax: Niccy driver Rev. %s\n", HiSax_getrev(tmp));

	if (cs->typ != ISDN_CTYPE_NICCY)

		return (0);

		return 0;

#ifdef __ISAPNP__

	if (!card->para[1] && isapnp_present()) {

		struct pnp_dev *pnp_d = NULL;

		int err;



		if ((pnp_c = pnp_find_card(

		pnp_c = pnp_find_card(ISAPNP_VENDOR('S', 'D', 'A'),

				ISAPNP_FUNCTION(0x0150), pnp_c);

		if (pnp_c) {

			pnp_d = pnp_find_dev(pnp_c,

					ISAPNP_VENDOR('S', 'D', 'A'),

			ISAPNP_FUNCTION(0x0150), pnp_c))) {

			if (!(pnp_d = pnp_find_dev(pnp_c,

				ISAPNP_VENDOR('S', 'D', 'A'),

				ISAPNP_FUNCTION(0x0150), pnp_d))) {

				printk(KERN_ERR "NiccyPnP: PnP error card found, no device\n");

				return (0);

					ISAPNP_FUNCTION(0x0150), pnp_d);

			if (!pnp_d) {

				printk(KERN_ERR "NiccyPnP: PnP error card "

					"found, no device\n");

				return 0;

			}

			pnp_disable_dev(pnp_d);

			err = pnp_activate_dev(pnp_d);

			if (err < 0) {

				printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",

					__FUNCTION__, err);

				return(0);

				printk(KERN_WARNING "%s: pnp_activate_dev "

					"ret(%d)\n", __FUNCTION__, err);

				return 0;

			}

			card->para[1] = pnp_port_start(pnp_d, 0);

			card->para[2] = pnp_port_start(pnp_d, 1);

			card->para[0] = pnp_irq(pnp_d, 0);

			if (!card->para[0] || !card->para[1] || !card->para[2]) {

				printk(KERN_ERR "NiccyPnP:some resources are missing %ld/%lx/%lx\n",

					card->para[0], card->para[1], card->para[2]);

			if (!card->para[0] || !card->para[1] ||

					!card->para[2]) {

				printk(KERN_ERR "NiccyPnP:some resources are "

					"missing %ld/%lx/%lx\n",

					card->para[0], card->para[1],

					card->para[2]);

				pnp_disable_dev(pnp_d);

				return(0);

				return 0;

			}

		} else {

		} else

			printk(KERN_INFO "NiccyPnP: no ISAPnP card found\n");

	}

	}

#endif

	if (card->para[1]) {

		cs->hw.niccy.isac = card->para[1] + ISAC_PNP;
@@ -291,50 +286,51 @@ setup_niccy(struct IsdnCard *card) 
		cs->subtyp = NICCY_PNP;

		cs->irq = card->para[0];

		if (!request_region(cs->hw.niccy.isac, 2, "niccy data")) {

			printk(KERN_WARNING

				"HiSax: %s data port %x-%x already in use\n",

				CardType[card->typ],

				cs->hw.niccy.isac,

				cs->hw.niccy.isac + 1);

			return (0);

			printk(KERN_WARNING "HiSax: %s data port %x-%x "

				"already in use\n", CardType[card->typ],

				cs->hw.niccy.isac, cs->hw.niccy.isac + 1);

			return 0;

		}

		if (!request_region(cs->hw.niccy.isac_ale, 2, "niccy addr")) {

			printk(KERN_WARNING

				"HiSax: %s address port %x-%x already in use\n",

				CardType[card->typ],

			printk(KERN_WARNING "HiSax: %s address port %x-%x "

				"already in use\n", CardType[card->typ],

				cs->hw.niccy.isac_ale,

				cs->hw.niccy.isac_ale + 1);

			release_region(cs->hw.niccy.isac, 2);

			return (0);

			return 0;

		}

	} else {

#ifdef CONFIG_PCI

		u_int pci_ioaddr;

		cs->subtyp = 0;

		if ((niccy_dev = pci_find_device(PCI_VENDOR_ID_SATSAGEM,

			PCI_DEVICE_ID_SATSAGEM_NICCY, niccy_dev))) {

						 PCI_DEVICE_ID_SATSAGEM_NICCY,

						 niccy_dev))) {

			if (pci_enable_device(niccy_dev))

				return(0);

				return 0;

			/* get IRQ */

			if (!niccy_dev->irq) {

				printk(KERN_WARNING "Niccy: No IRQ for PCI card found\n");

				return(0);

				printk(KERN_WARNING

				       "Niccy: No IRQ for PCI card found\n");

				return 0;

			}

			cs->irq = niccy_dev->irq;

			cs->hw.niccy.cfg_reg = pci_resource_start(niccy_dev, 0);

			if (!cs->hw.niccy.cfg_reg) {

				printk(KERN_WARNING "Niccy: No IO-Adr for PCI cfg found\n");

				return(0);

				printk(KERN_WARNING

				       "Niccy: No IO-Adr for PCI cfg found\n");

				return 0;

			}

			pci_ioaddr = pci_resource_start(niccy_dev, 1);

			if (!pci_ioaddr) {

				printk(KERN_WARNING "Niccy: No IO-Adr for PCI card found\n");

				return(0);

				printk(KERN_WARNING

				       "Niccy: No IO-Adr for PCI card found\n");

				return 0;

			}

			cs->subtyp = NICCY_PCI;

		} else {

			printk(KERN_WARNING "Niccy: No PCI card found\n");

			return(0);

			return 0;

		}

		cs->irq_flags |= IRQF_SHARED;

		cs->hw.niccy.isac = pci_ioaddr + ISAC_PCI_DATA;
@@ -345,9 +341,8 @@ setup_niccy(struct IsdnCard *card) 
			printk(KERN_WARNING

			       "HiSax: %s data port %x-%x already in use\n",

			       CardType[card->typ],

				cs->hw.niccy.isac,

				cs->hw.niccy.isac + 4);

			return (0);

			       cs->hw.niccy.isac, cs->hw.niccy.isac + 4);

			return 0;

		}

		if (!request_region(cs->hw.niccy.cfg_reg, 0x40, "niccy pci")) {

			printk(KERN_WARNING
@@ -356,12 +351,12 @@ setup_niccy(struct IsdnCard *card) 
			       cs->hw.niccy.cfg_reg,

			       cs->hw.niccy.cfg_reg + 0x40);

			release_region(cs->hw.niccy.isac, 4);

			return (0);

			return 0;

		}

#else

		printk(KERN_WARNING "Niccy: io0 0 and NO_PCI_BIOS\n");

		printk(KERN_WARNING "Niccy: unable to config NICCY PCI\n");

		return (0);

		return 0;

#endif				/* CONFIG_PCI */

	}

	printk(KERN_INFO "HiSax: %s %s config irq:%d data:0x%X ale:0x%X\n",
@@ -379,10 +374,10 @@ setup_niccy(struct IsdnCard *card) 
	cs->irq_func = &niccy_interrupt;

	ISACVersion(cs, "Niccy:");

	if (HscxVersion(cs, "Niccy:")) {

		printk(KERN_WARNING

		    "Niccy: wrong HSCX versions check IO address\n");

		printk(KERN_WARNING "Niccy: wrong HSCX versions check IO "

			"address\n");

		release_io_niccy(cs);

		return (0);

		return 0;

	}

	return (1);

	return 1;

}