X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=src%2Fcp210x.c;fp=src%2Fcp210x.c;h=d1fbf26753346a7a4a7351dab590fdac21c3fb07;hb=e1a0c29481c23a33bdf7dcbfb052cd5b9b440286;hp=1ec4b8eaa403d9c581e0474dde5d695933744e62;hpb=23306e7cf4f9a678f38e4baad9eda46da5ab3375;p=cp210x.git

diff --git a/src/cp210x.c b/src/cp210x.c
index 1ec4b8e..d1fbf26 100644
--- a/src/cp210x.c
+++ b/src/cp210x.c
@@ -248,10 +248,11 @@ static int make_usb_string(char *usbstr, size_t usblen, char *src,
  * is the size of the buffer at kbuf.
  * Returns the number of bytes used in kbuf.
  */
-static size_t cp210x_usbstr_from_user(char *kbuf, unsigned long ubuf, size_t klen)
+static size_t cp210x_usbstr_from_user(char *kbuf, unsigned long ubuf,
+		size_t klen)
 {
 	struct cp210x_buffer t;
-	char* str;
+	char *str;
 	size_t slen;
 
 	if (!kbuf || !ubuf || !klen)
@@ -293,7 +294,8 @@ static int cp210x_ctlmsg(struct usb_serial_port *port, u8 request,
 	u8 *tbuf;
 	int ret;
 
-	if (!(tbuf = kmalloc(size, GFP_KERNEL)))
+	tbuf = kmalloc(size, GFP_KERNEL);
+	if (!tbuf)
 		return -ENOMEM;
 	if (requestype & 0x80) {
 		ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), request,
@@ -308,8 +310,9 @@ static int cp210x_ctlmsg(struct usb_serial_port *port, u8 request,
 	}
 	kfree(tbuf);
 	if (ret < 0 && ret != -EPIPE) {
-		dev_printk(KERN_DEBUG, &dev->dev, "cp210x: control failed cmd rqt %u "
-				"rq %u len %u ret %d\n", requestype, request, size, ret);
+		dev_printk(KERN_DEBUG, &dev->dev,
+			"cp210x: ctl failed cmd rqt %u rq %u len %u ret %d\n",
+			requestype, request, size, ret);
 	}
 	return ret;
 }
@@ -319,10 +322,10 @@ static int cp210x_reset(struct usb_serial_port *port)
 	dbg("%s", __FUNCTION__);
 
 #if 1
-	/* Is this better than usb_device_reset?  It may be.  Once a client issues
-	 * the reset ioctl, it must disconnect and reconnect, since the USB
-	 * connections are torn down.  We also ignore the error return, since
-	 * the part resets and doesn't send one...
+	/* Is this better than usb_device_reset?  It may be.  Once a client
+	 * issues the reset ioctl, it must disconnect and reconnect, since the
+	 * USB connections are torn down.  We also ignore the error return,
+	 * since the part resets and doesn't send one...
 	 */
 	cp210x_ctlmsg(port, 0xff, 0x40, 0x0008, 0x00, NULL, 0);
 #else
@@ -437,7 +440,7 @@ static int cp210x_portconfset(struct usb_serial_port *port,
 
 	memcpy(&lconfig, config, sizeof(lconfig));
 
-	/* Words from cp2103 are MSB */
+	/* Words from cp210x are MSB */
 	lconfig.reset.mode = cpu_to_be16(config->reset.mode);
 	lconfig.reset.latch = cpu_to_be16(config->reset.latch);
 	lconfig.suspend.mode = cpu_to_be16(config->suspend.mode);
@@ -470,7 +473,7 @@ static int cp210x_portconfget(struct usb_serial_port *port,
 	ret = cp210x_ctlmsg(port, 0xff, 0xc0, 0x370c, 0, config,
 			sizeof(struct cp210x_port_config));
 	if (ret == sizeof(struct cp210x_port_config)) {
-		/* Words from cp2103 are MSB */
+		/* Words from cp210x are MSB */
 		config->reset.mode = be16_to_cpu(config->reset.mode);
 		config->reset.lowPower = be16_to_cpu(config->reset.lowPower);
 		config->reset.latch = be16_to_cpu(config->reset.latch);
@@ -690,8 +693,8 @@ static int cp210x_ioctl(struct usb_serial_port *port, struct file *file,
 			return -EFAULT;
 
 		/* this looks wrong: TIOCMSET isn't going to work right */
-		if (cp210x_tiocmset(port, file, cmd==TIOCMBIC ? 0 : val,
-					cmd==TIOCMBIC ? val : 0))
+		if (cp210x_tiocmset(port, file, (cmd == TIOCMBIC) ? 0 : val,
+					(cmd == TIOCMBIC) ? val : 0))
 			return -EFAULT;
 		return 0;
 	}
@@ -718,8 +721,8 @@ static int cp210x_ioctl(struct usb_serial_port *port, struct file *file,
 	case CP210x_IOCTL_GPIOBIS:
 	if (cp210x_get_partnum(port) == CP210x_PART_CP2103 &&
 			!cp210x_gpiosetb(port,
-				(cmd==CP210x_IOCTL_GPIOBIC) ?  0 : arg,
-				(cmd==CP210x_IOCTL_GPIOBIC) ? arg : 0))
+				(cmd == CP210x_IOCTL_GPIOBIC) ?  0 : arg,
+				(cmd == CP210x_IOCTL_GPIOBIC) ? arg : 0))
 		return 0;
 	return -EFAULT;
 	break;