summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/greybus/battery-gb.c4
-rw-r--r--drivers/staging/greybus/connection.h2
-rw-r--r--drivers/staging/greybus/core.c2
-rw-r--r--drivers/staging/greybus/es1-ap-usb.c2
-rw-r--r--drivers/staging/greybus/manifest.c2
-rw-r--r--drivers/staging/greybus/module.c2
-rw-r--r--drivers/staging/greybus/operation.c12
-rw-r--r--drivers/staging/greybus/protocol.c4
-rw-r--r--drivers/staging/greybus/uart-gb.c2
9 files changed, 15 insertions, 17 deletions
diff --git a/drivers/staging/greybus/battery-gb.c b/drivers/staging/greybus/battery-gb.c
index 02178f53cc5b..13ade437d63c 100644
--- a/drivers/staging/greybus/battery-gb.c
+++ b/drivers/staging/greybus/battery-gb.c
@@ -165,7 +165,7 @@ static int get_tech(struct gb_battery *gb)
/*
* Map greybus values to power_supply values. Hopefully these are
- * "identical" which should allow gcc to optomize the code away to
+ * "identical" which should allow gcc to optimize the code away to
* nothing.
*/
technology = le32_to_cpu(tech_response.technology);
@@ -209,7 +209,7 @@ static int get_status(struct gb_battery *gb)
/*
* Map greybus values to power_supply values. Hopefully these are
- * "identical" which should allow gcc to optomize the code away to
+ * "identical" which should allow gcc to optimize the code away to
* nothing.
*/
battery_status = le16_to_cpu(status_response.battery_status);
diff --git a/drivers/staging/greybus/connection.h b/drivers/staging/greybus/connection.h
index e190944508ea..8cde114f5ac2 100644
--- a/drivers/staging/greybus/connection.h
+++ b/drivers/staging/greybus/connection.h
@@ -37,7 +37,7 @@ struct gb_connection {
u16 op_cycle;
struct list_head operations;
- struct list_head pending; /* awaiting reponse */
+ struct list_head pending; /* awaiting response */
void *private;
};
diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index 2c50dd3e2a47..9203ebd2db7f 100644
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -39,7 +39,7 @@ static int greybus_module_match(struct device *dev, struct device_driver *drv)
id = gb_module_match_id(gmod, driver->id_table);
if (id)
return 1;
- /* FIXME - Dyanmic ids? */
+ /* FIXME - Dynamic ids? */
return 0;
}
diff --git a/drivers/staging/greybus/es1-ap-usb.c b/drivers/staging/greybus/es1-ap-usb.c
index 3daa6eb8dd38..bab6f259dd70 100644
--- a/drivers/staging/greybus/es1-ap-usb.c
+++ b/drivers/staging/greybus/es1-ap-usb.c
@@ -450,7 +450,7 @@ static void cport_out_callback(struct urb *urb)
*
* This protocol is "needed" due to some hardware restrictions on the
* current generation of Unipro controllers. Think about it for a
- * minute, this is a USB driver, talking to a Unipro bridge, impediance
+ * minute, this is a USB driver, talking to a Unipro bridge, impedance
* mismatch is huge, yet the Unipro controller are even more
* underpowered than this little USB controller. We rely on the round
* trip to keep stalls in the Unipro controllers from happening so that
diff --git a/drivers/staging/greybus/manifest.c b/drivers/staging/greybus/manifest.c
index 37540350cb75..28abd2ad395e 100644
--- a/drivers/staging/greybus/manifest.c
+++ b/drivers/staging/greybus/manifest.c
@@ -46,7 +46,7 @@ static void release_manifest_descriptors(void)
/*
* Validate the given descriptor. Its reported size must fit within
- * the number of bytes reamining, and it must have a recognized
+ * the number of bytes remaining, and it must have a recognized
* type. Check that the reported size is at least as big as what
* we expect to see. (It could be bigger, perhaps for a new version
* of the format.)
diff --git a/drivers/staging/greybus/module.c b/drivers/staging/greybus/module.c
index f432bea3c818..f72e6aef4dc4 100644
--- a/drivers/staging/greybus/module.c
+++ b/drivers/staging/greybus/module.c
@@ -68,7 +68,7 @@ struct device_type greybus_module_type = {
};
/*
- * A Greybus module represents a user-replacable component on an Ara
+ * A Greybus module represents a user-replicable component on an Ara
* phone.
*
* Create a gb_module structure to represent a discovered module.
diff --git a/drivers/staging/greybus/operation.c b/drivers/staging/greybus/operation.c
index 74dd48a5a489..442046562bfb 100644
--- a/drivers/staging/greybus/operation.c
+++ b/drivers/staging/greybus/operation.c
@@ -146,7 +146,7 @@ static void gb_message_cancel(struct gb_message *message)
}
/*
- * An operations's response message has arrived. If no callback was
+ * An operation's response message has arrived. If no callback was
* supplied it was submitted for asynchronous completion, so we notify
* any waiters. Otherwise we assume calling the completion is enough
* and nobody else will be waiting.
@@ -169,7 +169,6 @@ int gb_operation_wait(struct gb_operation *operation)
if (ret < 0)
gb_message_cancel(operation->request);
return ret;
-
}
static void gb_operation_request_handle(struct gb_operation *operation)
@@ -299,9 +298,8 @@ static void gb_operation_message_free(struct gb_message *message)
}
/*
- * Map an enum gb_operation_status value (which is represted in a
- * message as a single back a single byte) to an appropriate Linux
- * negative errno.
+ * Map an enum gb_operation_status value (which is represented in a
+ * message as a single byte) to an appropriate Linux negative errno.
*/
int gb_operation_status_map(u8 status)
{
@@ -329,7 +327,7 @@ int gb_operation_status_map(u8 status)
/*
* Create a Greybus operation to be sent over the given connection.
- * The request buffer will big enough for a payload of the given
+ * The request buffer will be big enough for a payload of the given
* size. Outgoing requests must specify the size of the response
* buffer size, which must be sufficient to hold all expected
* response data.
@@ -544,7 +542,7 @@ void gb_connection_recv_request(struct gb_connection *connection,
/*
* We've received data that appears to be an operation response
* message. Look up the operation, and record that we've received
- * its repsonse.
+ * its response.
*
* This is called in interrupt context, so just copy the incoming
* data into the response buffer and handle the rest via workqueue.
diff --git a/drivers/staging/greybus/protocol.c b/drivers/staging/greybus/protocol.c
index 346120f8d4e3..55ef387b812f 100644
--- a/drivers/staging/greybus/protocol.c
+++ b/drivers/staging/greybus/protocol.c
@@ -38,7 +38,7 @@ static struct gb_protocol *_gb_protocol_find(u8 id, u8 major, u8 minor)
return NULL;
}
-/* Returns true if protocol was succesfully registered, false otherwise */
+/* Returns true if protocol was successfully registered, false otherwise */
bool gb_protocol_register(struct gb_protocol *protocol)
{
struct gb_protocol *existing;
@@ -93,7 +93,7 @@ bool gb_protocol_register(struct gb_protocol *protocol)
* XXX Currently this fails (and reports an error to the caller) if
* XXX the protocol is currently in use. We may want to forcefully
* XXX kill off a protocol and all its active users at some point.
- * XXX But I think that's better handled by quescing modules that
+ * XXX But I think that's better handled by quiescing modules that
* XXX have users and having those users drop their reference.
*
* Returns true if successful, false otherwise.
diff --git a/drivers/staging/greybus/uart-gb.c b/drivers/staging/greybus/uart-gb.c
index 7d7e223059a7..48fad7b4c886 100644
--- a/drivers/staging/greybus/uart-gb.c
+++ b/drivers/staging/greybus/uart-gb.c
@@ -816,7 +816,7 @@ static void gb_uart_connection_exit(struct gb_connection *connection)
tty_unregister_device(gb_tty_driver, gb_tty->minor);
- /* FIXME - free transmit / recieve buffers */
+ /* FIXME - free transmit / receive buffers */
tty_port_put(&gb_tty->port);