From 46e99c4a1d57dc73e518466bb3a8da9e7094415e Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 24 Oct 2012 23:29:41 +0900 Subject: tty: Fix typo in tty drivers Correct spelling typo in debug messages within tty drivers. Signed-off-by: Masanari Iida Acked-by: Alan Cox Signed-off-by: Jiri Kosina --- drivers/tty/hvc/hvc_opal.c | 2 +- drivers/tty/hvc/hvc_vio.c | 2 +- drivers/tty/serial/8250/Kconfig | 2 +- drivers/tty/serial/bfin_uart.c | 2 +- drivers/tty/serial/icom.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/tty') diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c index 0d2ea0c224c3..a4f488fa9579 100644 --- a/drivers/tty/hvc/hvc_opal.c +++ b/drivers/tty/hvc/hvc_opal.c @@ -178,7 +178,7 @@ static int __devinit hvc_opal_probe(struct platform_device *dev) proto = HV_PROTOCOL_HVSI; ops = &hvc_opal_hvsi_ops; } else { - pr_err("hvc_opal: Unkown protocol for %s\n", + pr_err("hvc_opal: Unknown protocol for %s\n", dev->dev.of_node->full_name); return -ENXIO; } diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c index ee307799271a..56e97258e55a 100644 --- a/drivers/tty/hvc/hvc_vio.c +++ b/drivers/tty/hvc/hvc_vio.c @@ -250,7 +250,7 @@ static int __devinit hvc_vio_probe(struct vio_dev *vdev, proto = HV_PROTOCOL_HVSI; ops = &hvterm_hvsi_ops; } else { - pr_err("hvc_vio: Unkown protocol for %s\n", vdev->dev.of_node->full_name); + pr_err("hvc_vio: Unknown protocol for %s\n", vdev->dev.of_node->full_name); return -ENXIO; } diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index a27dd0569bd7..93958000a133 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -271,7 +271,7 @@ config SERIAL_8250_DW present in the Synopsys DesignWare APB UART. config SERIAL_8250_EM - tristate "Support for Emma Mobile intergrated serial port" + tristate "Support for Emma Mobile integrated serial port" depends on SERIAL_8250 && ARM && HAVE_CLK help Selecting this option will add support for the integrated serial diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c index bd97db23985b..58913eecefe5 100644 --- a/drivers/tty/serial/bfin_uart.c +++ b/drivers/tty/serial/bfin_uart.c @@ -815,7 +815,7 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios, lcr = WLS(5); break; default: - printk(KERN_ERR "%s: word lengh not supported\n", + printk(KERN_ERR "%s: word length not supported\n", __func__); } diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c index defc4e3393a3..613151677df0 100644 --- a/drivers/tty/serial/icom.c +++ b/drivers/tty/serial/icom.c @@ -505,7 +505,7 @@ static void load_code(struct icom_port *icom_port) /* Stop processor */ stop_processor(icom_port); - dev_err(&icom_port->adapter->pci_dev->dev,"Port not opertional\n"); + dev_err(&icom_port->adapter->pci_dev->dev,"Port not operational\n"); } if (new_page != NULL) -- cgit v1.2.3 From b3834be5c42a5d2fd85ff4b819fa38983b1450e6 Mon Sep 17 00:00:00 2001 From: Adam Buchbinder Date: Wed, 19 Sep 2012 21:48:02 -0400 Subject: various: Fix spelling of "asynchronous" in comments. "Asynchronous" is misspelled in some comments. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina --- drivers/char/ipmi/ipmi_msghandler.c | 2 +- drivers/char/ipmi/ipmi_si_intf.c | 2 +- drivers/firewire/init_ohci1394_dma.c | 4 ++-- drivers/firewire/ohci.c | 2 +- drivers/net/ethernet/mellanox/mlx4/eq.c | 2 +- drivers/tty/ipwireless/setup_protocol.h | 2 +- fs/notify/notification.c | 2 +- include/linux/dlm.h | 2 +- include/linux/ipmi_smi.h | 2 +- mm/memory_hotplug.c | 6 +++--- sound/pci/sis7019.c | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) (limited to 'drivers/tty') diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index a0c84bb30856..053201b062a4 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -3789,7 +3789,7 @@ static int handle_one_recv_msg(ipmi_smi_t intf, } else if ((msg->rsp[0] == ((IPMI_NETFN_APP_REQUEST|1) << 2)) && (msg->rsp[1] == IPMI_READ_EVENT_MSG_BUFFER_CMD)) { - /* It's an asyncronous event. */ + /* It's an asynchronous event. */ requeue = handle_read_event_rsp(intf, msg); } else { /* It's a response from the local BMC. */ diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 32a6c7e256bd..c9c3501784e0 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -155,7 +155,7 @@ enum si_stat_indexes { /* Number of watchdog pretimeouts. */ SI_STAT_watchdog_pretimeouts, - /* Number of asyncronous messages received. */ + /* Number of asynchronous messages received. */ SI_STAT_incoming_messages, diff --git a/drivers/firewire/init_ohci1394_dma.c b/drivers/firewire/init_ohci1394_dma.c index a9a347adb353..2cc89ce745c9 100644 --- a/drivers/firewire/init_ohci1394_dma.c +++ b/drivers/firewire/init_ohci1394_dma.c @@ -149,10 +149,10 @@ static inline void __init init_ohci1394_initialize(struct ohci *ohci) reg_write(ohci, OHCI1394_IsoXmitIntMaskClear, 0xffffffff); reg_write(ohci, OHCI1394_IsoXmitIntEventClear, 0xffffffff); - /* Accept asyncronous transfer requests from all nodes for now */ + /* Accept asynchronous transfer requests from all nodes for now */ reg_write(ohci, OHCI1394_AsReqFilterHiSet, 0x80000000); - /* Specify asyncronous transfer retries */ + /* Specify asynchronous transfer retries */ reg_write(ohci, OHCI1394_ATRetries, OHCI1394_MAX_AT_REQ_RETRIES | (OHCI1394_MAX_AT_RESP_RETRIES<<4) | diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 834e71d2324d..961e4398664b 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -1281,7 +1281,7 @@ static int at_context_queue_packet(struct context *ctx, d[0].res_count = cpu_to_le16(packet->timestamp); /* - * The DMA format for asyncronous link packets is different + * The DMA format for asynchronous link packets is different * from the IEEE1394 layout, so shift the fields around * accordingly. */ diff --git a/drivers/net/ethernet/mellanox/mlx4/eq.c b/drivers/net/ethernet/mellanox/mlx4/eq.c index b84a88bc44dc..c48cf6f6529c 100644 --- a/drivers/net/ethernet/mellanox/mlx4/eq.c +++ b/drivers/net/ethernet/mellanox/mlx4/eq.c @@ -1267,7 +1267,7 @@ int mlx4_test_interrupts(struct mlx4_dev *dev) /* Temporary use polling for command completions */ mlx4_cmd_use_polling(dev); - /* Map the new eq to handle all asyncronous events */ + /* Map the new eq to handle all asynchronous events */ err = mlx4_MAP_EQ(dev, get_async_ev_mask(dev), 0, priv->eq_table.eq[i].eqn); if (err) { diff --git a/drivers/tty/ipwireless/setup_protocol.h b/drivers/tty/ipwireless/setup_protocol.h index 9d6bcc77c73c..002c34e72521 100644 --- a/drivers/tty/ipwireless/setup_protocol.h +++ b/drivers/tty/ipwireless/setup_protocol.h @@ -59,7 +59,7 @@ struct tl_setup_config_done_msg { unsigned char sig_no; /* TL_SETUP_SIGNO_CONFIG_DONE_MSG */ } __attribute__ ((__packed__)); -/* Asyncronous messages */ +/* Asynchronous messages */ struct tl_setup_open_msg { unsigned char sig_no; /* TL_SETUP_SIGNO_OPEN_MSG */ unsigned char port_no; diff --git a/fs/notify/notification.c b/fs/notify/notification.c index c887b1378f7e..48cb994e4922 100644 --- a/fs/notify/notification.c +++ b/fs/notify/notification.c @@ -18,7 +18,7 @@ /* * Basic idea behind the notification queue: An fsnotify group (like inotify) - * sends the userspace notification about events asyncronously some time after + * sends the userspace notification about events asynchronously some time after * the event happened. When inotify gets an event it will need to add that * event to the group notify queue. Since a single event might need to be on * multiple group's notification queues we can't add the event directly to each diff --git a/include/linux/dlm.h b/include/linux/dlm.h index 1d47dcce11e1..d02da2c6fc1a 100644 --- a/include/linux/dlm.h +++ b/include/linux/dlm.h @@ -98,7 +98,7 @@ int dlm_release_lockspace(dlm_lockspace_t *lockspace, int force); /* * dlm_lock * - * Make an asyncronous request to acquire or convert a lock on a named + * Make an asynchronous request to acquire or convert a lock on a named * resource. * * lockspace: context for the request diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h index fcb5d44ea635..8ea3fe0b9759 100644 --- a/include/linux/ipmi_smi.h +++ b/include/linux/ipmi_smi.h @@ -216,7 +216,7 @@ int ipmi_unregister_smi(ipmi_smi_t intf); /* * The lower layer reports received messages through this interface. - * The data_size should be zero if this is an asyncronous message. If + * The data_size should be zero if this is an asynchronous message. If * the lower layer gets an error sending a message, it should format * an error response in the message response. */ diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 56b758ae57d2..bb81b7f417a8 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -950,10 +950,10 @@ repeat: goto repeat; } } - /* drain all zone's lru pagevec, this is asyncronous... */ + /* drain all zone's lru pagevec, this is asynchronous... */ lru_add_drain_all(); yield(); - /* drain pcp pages , this is synchrouns. */ + /* drain pcp pages, this is synchronous. */ drain_all_pages(); /* check again */ offlined_pages = check_pages_isolated(start_pfn, end_pfn); @@ -962,7 +962,7 @@ repeat: goto failed_removal; } printk(KERN_INFO "Offlined Pages %ld\n", offlined_pages); - /* Ok, all of our target is islaoted. + /* Ok, all of our target is isolated. We cannot do rollback at this point. */ offline_isolated_pages(start_pfn, end_pfn); /* reset pagetype flags and makes migrate type to be MOVABLE */ diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index 51e43407ebc5..9024545ebb86 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c @@ -1171,7 +1171,7 @@ static int sis_chip_init(struct sis7019 *sis) outl(SIS_DMA_CSR_PCI_SETTINGS, io + SIS_DMA_CSR); /* Reset the synchronization groups for all of the channels - * to be asyncronous. If we start doing SPDIF or 5.1 sound, etc. + * to be asynchronous. If we start doing SPDIF or 5.1 sound, etc. * we'll need to change how we handle these. Until then, we just * assign sub-mixer 0 to all playback channels, and avoid any * attenuation on the audio. -- cgit v1.2.3