This patch fixes some spelling mistakes and improves wording in some
comments. It also renames one variable to unify naming with others.
Signed-off-by: Klemen Košir <klemen.kosir@xxxxxxxx>
---
drivers/usb/serial/cp210x.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index a373cd63b3a4..7bcc253143a5 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -430,8 +430,8 @@ struct cp210x_comm_status {
/*
* CP210X_PURGE - 16 bits passed in wValue of USB request.
* SiLabs app note AN571 gives a strange description of the 4 bits:
- * bit 0 or bit 2 clears the transmit queue and 1 or 3 receive.
- * writing 1 to all, however, purges cp2108 well enough to avoid the hang.
+ * bit 0 or bit 2 clears the transmit queue and 1 or 3 clears the receive queue.
+ * Writing 1 to all, however, purges CP2108 well enough to avoid the hang.
*/
#define PURGE_ALL 0x000f
@@ -443,7 +443,6 @@ struct cp210x_comm_status {
#define CP210X_LSR_FRAME BIT(3)
#define CP210X_LSR_BREAK BIT(4)
-
/* CP210X_GET_FLOW/CP210X_SET_FLOW read/write these 0x10 bytes */
struct cp210x_flow_ctl {
__le32 ulControlHandshake;
@@ -764,7 +763,7 @@ static void cp210x_close(struct usb_serial_port *port)
usb_serial_generic_close(port);
- /* Clear both queues; cp2108 needs this to avoid an occasional hang */
+ /* Clear both queues; CP2108 needs this to avoid an occasional hang. */
cp210x_write_u16_reg(port, CP210X_PURGE, PURGE_ALL);
cp210x_write_u16_reg(port, CP210X_IFC_ENABLE, UART_DISABLE);
@@ -1009,9 +1008,9 @@ static speed_t cp210x_get_actual_rate(speed_t baud)
* div = round(freq / (2 x prescale x request))
* actual = freq / (2 x prescale x div)
*
- * For CP2104 and CP2105 freq is 48Mhz and prescale is 4 for request <= 365bps
+ * For CP2104 and CP2105 freq is 48MHz and prescale is 4 for request <= 365bps
* or 1 otherwise.
- * For CP2110 freq is 24Mhz and prescale is 4 for request <= 300bps or 1
+ * For CP2110 freq is 24MHz and prescale is 4 for request <= 300bps or 1
* otherwise.
*/
static void cp210x_change_speed(struct tty_struct *tty,
@@ -1023,7 +1022,7 @@ static void cp210x_change_speed(struct tty_struct *tty,
/*
* This maps the requested rate to the actual rate, a valid rate on
- * cp2102 or cp2103, or to an arbitrary rate in [1M, max_speed].
+ * CP2102 or CP2103, or to an arbitrary rate in [1M, max_speed].
*
* NOTE: B0 is not implemented.
*/
@@ -1286,6 +1285,7 @@ static int cp210x_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct usb_serial_port *port = tty->driver_data;
+
return cp210x_tiocmset_port(port, set, clear);
}
@@ -1552,7 +1552,7 @@ static int cp210x_gpio_set_config(struct gpio_chip *gc, unsigned int gpio,
/*
* This function is for configuring GPIO using shared pins, where other signals
* are made unavailable by configuring the use of GPIO. This is believed to be
- * only applicable to the cp2105 at this point, the other devices supported by
+ * only applicable to the CP2105 at this point, the other devices supported by
* this driver that provide GPIO do so in a way that does not impact other
* signals and are thus expected to have very different initialisation.
*/
@@ -1561,7 +1561,7 @@ static int cp2105_gpioconf_init(struct usb_serial *serial)
struct cp210x_serial_private *priv = usb_get_serial_data(serial);
struct cp210x_pin_mode mode;
struct cp210x_dual_port_config config;
- u8 intf_num = cp210x_interface_num(serial);
+ u8 iface_num = cp210x_interface_num(serial);
u8 iface_config;
int result;
@@ -1577,8 +1577,8 @@ static int cp2105_gpioconf_init(struct usb_serial *serial)
if (result < 0)
return result;
- /* 2 banks of GPIO - One for the pins taken from each serial port */
- if (intf_num == 0) {
+ /* 2 banks of GPIO - One for the pins taken from each serial port */
+ if (iface_num == 0) {
if (mode.eci == CP210X_PIN_MODE_MODEM) {
/* mark all GPIOs of this interface as reserved */
priv->gpio_altfunc = 0xff;
@@ -1590,7 +1590,7 @@ static int cp2105_gpioconf_init(struct usb_serial *serial)
CP210X_ECI_GPIO_MODE_MASK) >>
CP210X_ECI_GPIO_MODE_OFFSET);
priv->gc.ngpio = 2;
- } else if (intf_num == 1) {
+ } else if (iface_num == 1) {
if (mode.sci == CP210X_PIN_MODE_MODEM) {
/* mark all GPIOs of this interface as reserved */
priv->gpio_altfunc = 0xff;
@@ -1659,7 +1659,7 @@ static int cp2104_gpioconf_init(struct usb_serial *serial)
*/
for (i = 0; i < priv->gc.ngpio; ++i) {
/*
- * Set direction to "input" iff pin is open-drain and reset
+ * Set direction to "input" if pin is open-drain and reset
* value is 1.
*/
if (!(priv->gpio_pushpull & BIT(i)) && (gpio_latch & BIT(i)))
@@ -1733,7 +1733,7 @@ static int cp2102n_gpioconf_init(struct usb_serial *serial)
* For the QFN28 package, GPIO4-6 are controlled by
* the low three bits of the mode/latch fields.
* Contrary to the document linked above, the bits for
- * the SUSPEND pins are elsewhere. No alternate
+ * the SUSPEND pins are elsewhere. No alternate
* function is available for these pins.
*/
priv->gc.ngpio = 7;
@@ -1742,16 +1742,16 @@ static int cp2102n_gpioconf_init(struct usb_serial *serial)
}
/*
- * The CP2102N does not strictly has input and output pin modes,
+ * The CP2102N does not strictly have input and output pin modes,
* it only knows open-drain and push-pull modes which is set at
- * factory. An open-drain pin can function both as an
+ * the factory. An open-drain pin can function both as an
* input or an output. We emulate input mode for open-drain pins
* by making sure they are not driven low, and we do not allow
* push-pull pins to be set as an input.
*/
for (i = 0; i < priv->gc.ngpio; ++i) {
/*
- * Set direction to "input" iff pin is open-drain and reset
+ * Set direction to "input" if pin is open-drain and reset
* value is 1.
*/
if (!(priv->gpio_pushpull & BIT(i)) && (gpio_latch & BIT(i)))
--
2.29.2
