staging: i4l: remove parens around return statement (06d1f85e) · Commits · 戴 / test

drivers/staging/i4l/act2000/capi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ actcapi_chkhdr(act2000_card card, actcapi_msghdr hdr)
		for (i = 0; i < num_valid_imsg; i++)
		if ((hdr->cmd.cmd == valid_msg[i].cmd.cmd) &&
		(hdr->cmd.subcmd == valid_msg[i].cmd.subcmd)) {
		return (i ? 1 : 2);
		return i ? 1 : 2;
		}
		return 0;
		}

drivers/staging/i4l/act2000/module.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ act2000_find_msn(act2000_card card, char msn, int ia5)
		p = p->next;
		}
		if (!ia5)
		return (1 << (eaz - '0'));
		return 1 << (eaz - '0');
		else
		return eaz;
		}
		@@ -110,10 +110,10 @@ act2000_find_eaz(act2000_card *card, char eaz)

		while (p) {
		if (p->eaz == eaz)
		return (p->msn);
		return p->msn;
		p = p->next;
		}
		return ("\0");
		return "\0";
		}

		/*
		@@ -292,7 +292,7 @@ act2000_command(act2000_card card, isdn_ctrl c)
		if (ret)
		return ret;
		if (card->flags & ACT2000_FLAGS_RUNNING)
		return (actcapi_manufacturer_req_msn(card));
		return actcapi_manufacturer_req_msn(card);
		return 0;
		case ACT2000_IOCTL_ADDCARD:
		if (copy_from_user(&cdef, arg,
		@@ -512,7 +512,7 @@ if_command(isdn_ctrl *c)
		act2000_card *card = act2000_findcard(c->driver);

		if (card)
		return (act2000_command(card, c));
		return act2000_command(card, c);
		printk(KERN_ERR
		"act2000: if_command %d called with invalid driverId %d!\n",
		c->command, c->driver);
		@@ -527,7 +527,7 @@ if_writecmd(const u_char __user *buf, int len, int id, int channel)
		if (card) {
		if (!(card->flags & ACT2000_FLAGS_RUNNING))
		return -ENODEV;
		return (len);
		return len;
		}
		printk(KERN_ERR
		"act2000: if_writecmd called with invalid driverId!\n");
		@@ -542,7 +542,7 @@ if_readstatus(u_char __user *buf, int len, int id, int channel)
		if (card) {
		if (!(card->flags & ACT2000_FLAGS_RUNNING))
		return -ENODEV;
		return (act2000_readstatus(buf, len, card));
		return act2000_readstatus(buf, len, card);
		}
		printk(KERN_ERR
		"act2000: if_readstatus called with invalid driverId!\n");
		@@ -557,7 +557,7 @@ if_sendbuf(int id, int channel, int ack, struct sk_buff *skb)
		if (card) {
		if (!(card->flags & ACT2000_FLAGS_RUNNING))
		return -ENODEV;
		return (act2000_sendbuf(card, channel, ack, skb));
		return act2000_sendbuf(card, channel, ack, skb);
		}
		printk(KERN_ERR
		"act2000: if_sendbuf called with invalid driverId!\n");
		@@ -777,7 +777,7 @@ act2000_addcard(int bus, int port, int irq, char *id)
		failed++;
		}
		}
		return (added - failed);
		return added - failed;
		}

		#define DRIVERNAME "IBM Active 2000 ISDN driver"

Admin message