i before e except after c typos
Subsystems (15)
cover i before e except after c typos
Joe Perches (2):
treewide: Fix recieve/receive typos
treewide: transciever/transceiver spelling fixes
arch/arm/mach-pxa/include/mach/corgi.h | 2 +- arch/arm/mach-pxa/include/mach/pxa27x-udc.h | 4 +- arch/arm/mach-ux500/board-mop500-regulators.c | 2 +- drivers/i2c/busses/i2c-highlander.c | 2 +- drivers/mmc/host/vub300.c | 4 +- drivers/net/caif/caif_hsi.c | 2 +- drivers/net/eexpress.c | 2 +- drivers/net/irda/toim3232-sir.c | 2 +- drivers/net/natsemi.c | 2 +- drivers/net/wan/lmc/lmc_var.h | 2 +- drivers/tty/serial/8250_pci.c | 2 +- drivers/usb/gadget/pxa27x_udc.h | 4 +- drivers/usb/misc/ftdi-elan.c | 28 ++++++++++++------------ drivers/usb/musb/musb_core.c | 2 +- drivers/usb/otg/isp1301_omap.c | 4 +- include/scsi/osd_initiator.h | 2 +- sound/pci/ice1712/ice1712.c | 2 +- sound/soc/omap/ams-delta.c | 2 +- 18 files changed, 35 insertions(+), 35 deletions(-)
Signature · 1 line
1.7.6.rc1
PATCH 1/2 treewide: Fix recieve/receive typos
Just spelling fixes.
Signed-off-by Joe Perches <[email protected]>
--- drivers/mmc/host/vub300.c | 4 ++-- drivers/net/caif/caif_hsi.c | 2 +- drivers/net/wan/lmc/lmc_var.h | 2 +- drivers/usb/misc/ftdi-elan.c | 28 ++++++++++++++-------------- include/scsi/osd_initiator.h | 2 +- sound/soc/omap/ams-delta.c | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-)
drivers/mmc/host/vub300.c +2 -2
@@ -1625,8 +1625,8 @@ static void __vub300_command_response(struct vub300_mmc_host *vub300, cmd->error = respretval; }else if (cmd->error) {/* -* the error occured sending the command -* or recieving the response +* the error occurred sending the command +* or receiving the response */ }else if (vub300->command_out_urb->status) { vub300->usb_transport_fail = vub300->command_out_urb->status;
drivers/net/caif/caif_hsi.c +1 -1
@@ -988,7 +988,7 @@ int cfhsi_probe(struct platform_device *pdev) goto err_alloc_rx; } -/* Initialize recieve vaiables. */ +/* Initialize receive variables. */ cfhsi->rx_ptr = cfhsi->rx_buf; cfhsi->rx_len =CFHSI_DESC_SZ ;
drivers/net/wan/lmc/lmc_var.h +1 -1
@@ -380,7 +380,7 @@ struct lmc___softc {/* CSR6 settings */ #define OPERATION_MODE 0x00000200/* Full Duplex */ #define PROMISC_MODE 0x00000040/* Promiscuous Mode */ -#define RECIEVE_ALL 0x40000000/* Receive All */ +#define RECEIVE_ALL 0x40000000/* Receive All */ #define PASS_BAD_FRAMES 0x00000008/* Pass Bad Frames */ /* Dec control registers CSR6 as well */
drivers/usb/misc/ftdi-elan.c +14 -14
@@ -187,7 +187,7 @@ struct usb_ftdi {u32 controlreg;u8 response[4 +1024 ];int expected; -int recieved; +int received;int ed_found; };#define kref_to_usb_ftdi (d) container_of(d, struct usb_ftdi, kref)
@@ -353,7 +353,7 @@ static void ftdi_elan_abandon_targets(struct usb_ftdi *ftdi)mutex_lock (&ftdi->u132_lock); } } - ftdi->recieved =0 ; + ftdi->received =0 ; ftdi->expected =4 ; ftdi->ed_found =0 ;mutex_unlock (&ftdi->u132_lock);
@@ -411,7 +411,7 @@ static void ftdi_elan_flush_targets(struct usb_ftdi *ftdi) } } } - ftdi->recieved =0 ; + ftdi->received =0 ; ftdi->expected =4 ; ftdi->ed_found =0 ;mutex_unlock (&ftdi->u132_lock);
@@ -447,7 +447,7 @@ static void ftdi_elan_cancel_targets(struct usb_ftdi *ftdi) } } } - ftdi->recieved =0 ; + ftdi->received =0 ; ftdi->expected =4 ; ftdi->ed_found =0 ;mutex_unlock (&ftdi->u132_lock);
@@ -874,7 +874,7 @@ static char *have_ed_set_response(struct usb_ftdi *ftdi,mutex_unlock (&ftdi->u132_lock);ftdi_elan_do_callback (ftdi, target,4 + ftdi->response, payload); - ftdi->recieved =0 ; + ftdi->received =0 ; ftdi->expected =4 ; ftdi->ed_found =0 ;return ftdi->response;
@@ -890,7 +890,7 @@ static char *have_ed_set_response(struct usb_ftdi *ftdi,mutex_unlock (&ftdi->u132_lock);ftdi_elan_do_callback (ftdi, target,4 + ftdi->response, payload); - ftdi->recieved =0 ; + ftdi->received =0 ; ftdi->expected =4 ; ftdi->ed_found =0 ;return ftdi->response;
@@ -905,7 +905,7 @@ static char *have_ed_set_response(struct usb_ftdi *ftdi,mutex_unlock (&ftdi->u132_lock);ftdi_elan_do_callback (ftdi, target,4 + ftdi->response, payload); - ftdi->recieved =0 ; + ftdi->received =0 ; ftdi->expected =4 ; ftdi->ed_found =0 ;return ftdi->response;
@@ -914,7 +914,7 @@ static char *have_ed_set_response(struct usb_ftdi *ftdi,mutex_unlock (&ftdi->u132_lock);ftdi_elan_do_callback (ftdi, target,4 + ftdi->response, payload); - ftdi->recieved =0 ; + ftdi->received =0 ; ftdi->expected =4 ; ftdi->ed_found =0 ;return ftdi->response;
@@ -934,7 +934,7 @@ static char *have_ed_get_response(struct usb_ftdi *ftdi,if (target->active)ftdi_elan_do_callback (ftdi, target,NULL ,0 ); target->abandoning =0 ; - ftdi->recieved =0 ; + ftdi->received =0 ; ftdi->expected =4 ; ftdi->ed_found =0 ;return ftdi->response;
@@ -951,7 +951,7 @@ static char *have_ed_get_response(struct usb_ftdi *ftdi,*/ static int ftdi_elan_respond_engine (struct usb_ftdi *ftdi) { -u8 *b = ftdi->response + ftdi->recieved; +u8 *b = ftdi->response + ftdi->received;int bytes_read =0 ;int retry_on_empty =1 ;int retry_on_timeout =3 ;
@@ -1043,11 +1043,11 @@ static int ftdi_elan_respond_engine(struct usb_ftdi *ftdi)u8 c = ftdi->bulk_in_buffer[++ftdi->bulk_in_last]; bytes_read +=1 ; ftdi->bulk_in_left -=1 ; -if (ftdi->recieved ==0 && c ==0xFF ) { +if (ftdi->received ==0 && c ==0xFF ) { goto have; }else *b++ = c; -if (++ftdi->recieved < ftdi->expected) { +if (++ftdi->received < ftdi->expected) { goto have; }else if (ftdi->ed_found) {int ed_number = (ftdi->response[0 ] >>5 ) &0x03 ;
@@ -1069,7 +1069,7 @@ static int ftdi_elan_respond_engine(struct usb_ftdi *ftdi) }ftdi_elan_do_callback (ftdi, target,4 + ftdi->response, payload); - ftdi->recieved =0 ; + ftdi->received =0 ; ftdi->expected =4 ; ftdi->ed_found =0 ; b = ftdi->response;
@@ -1089,7 +1089,7 @@ static int ftdi_elan_respond_engine(struct usb_ftdi *ftdi) *respond->value = data; *respond->result =0 ;complete (&respond->wait_completion); - ftdi->recieved =0 ; + ftdi->received =0 ; ftdi->expected =4 ; ftdi->ed_found =0 ; b = ftdi->response;
include/scsi/osd_initiator.h +1 -1
@@ -262,7 +262,7 @@ int osd_execute_request_async(struct osd_request *or,* osd_req_decode_sense_full - Decode sense information after execution. * * @or: - osd_request to examine -* @osi - Recievs a more detailed error report information (optional). +* @osi - Receives a more detailed error report information (optional). * @silent - Do not print to dmsg (Even if enabled) * @bad_obj_list - Some commands act on multiple objects. Failed objects will * be received here (optional)
sound/soc/omap/ams-delta.c +1 -1
@@ -330,7 +330,7 @@ static int cx81801_hangup(struct tty_struct *tty)return 0 ; } -/* Line discipline .recieve_buf() */ +/* Line discipline .receive_buf() */ static void cx81801_receive (struct tty_struct *tty,const unsigned char *cp,char *fp,int count) {
Signature · 1 line
1.7.6.rc1
Re: [Trivial next 1/2] treewide: Fix recieve/receive typos
Quoted 10 lines · Joe Perches
Just spelling fixes.
Signed-off-by Joe Perches <[email protected]>--- drivers/mmc/host/vub300.c | 4 ++-- drivers/net/caif/caif_hsi.c | 2 +- drivers/net/wan/lmc/lmc_var.h | 2 +- drivers/usb/misc/ftdi-elan.c | 28 ++++++++++++++-------------- include/scsi/osd_initiator.h | 2 +- sound/soc/omap/ams-delta.c | 2 +-
I have applied, with exception for drivers/net/caif/caif_hsi.c, as this is not in Linus' tree yet (which is what I base my tree on). Could you please resend to davem?
Thanks,
Signature · 2 lines
Jiri Kosina SUSE Labs
PATCH 2/2 treewide: transciever/transceiver spelling fixes
In reply to Joe PerchesJust tyops.
Signed-off-by Joe Perches <[email protected]>
--- arch/arm/mach-pxa/include/mach/corgi.h | 2 +- arch/arm/mach-pxa/include/mach/pxa27x-udc.h | 4 ++-- arch/arm/mach-ux500/board-mop500-regulators.c | 2 +- drivers/i2c/busses/i2c-highlander.c | 2 +- drivers/net/eexpress.c | 2 +- drivers/net/irda/toim3232-sir.c | 2 +- drivers/net/natsemi.c | 2 +- drivers/tty/serial/8250_pci.c | 2 +- drivers/usb/gadget/pxa27x_udc.h | 4 ++-- drivers/usb/musb/musb_core.c | 2 +- drivers/usb/otg/isp1301_omap.c | 4 ++-- sound/pci/ice1712/ice1712.c | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-)
arch/arm/mach-pxa/include/mach/corgi.h +1 -1
@@ -34,7 +34,7 @@#define CORGI_GPIO_LCDCON_CS (19)/* LCD Control Chip Select */ #define CORGI_GPIO_MAX1111_CS (20)/* MAX1111 Chip Select */ #define CORGI_GPIO_ADC_TEMP_ON (21)/* Select battery voltage or temperature */ -#define CORGI_GPIO_IR_ON (22)/* Enable IR Transciever */ +#define CORGI_GPIO_IR_ON (22)/* Enable IR Transceiver */ #define CORGI_GPIO_ADS7846_CS (24)/* ADS7846 Chip Select */ #define CORGI_GPIO_SD_PWR (33)/* MMC/SD Power */ #define CORGI_GPIO_CHRG_ON (38)/* Enable battery Charging */
arch/arm/mach-pxa/include/mach/pxa27x-udc.h +2 -2
@@ -56,9 +56,9 @@#define UDCFNR __REG(0x40600014)/* UDC Frame Number Register */ #define UDCOTGICR __REG(0x40600018)/* UDC On-The-Go interrupt control */ #define UDCOTGICR_IESF (1 << 24)/* OTG SET_FEATURE command recvd */ -#define UDCOTGICR_IEXR (1 << 17)/* Extra Transciever Interrupt +#define UDCOTGICR_IEXR (1 << 17)/* Extra Transceiver Interrupt Rising Edge Interrupt Enable */ -#define UDCOTGICR_IEXF (1 << 16)/* Extra Transciever Interrupt +#define UDCOTGICR_IEXF (1 << 16)/* Extra Transceiver Interrupt Falling Edge Interrupt Enable */ #define UDCOTGICR_IEVV40R (1 << 9)/* OTG Vbus Valid 4.0V Rising Edge Interrupt Enable */
arch/arm/mach-ux500/board-mop500-regulators.c +1 -1
@@ -77,7 +77,7 @@ static struct regulator_consumer_supply ab8500_vtvout_consumers[] = {static struct regulator_consumer_supply ab8500_vintcore_consumers[] = {/* SoC core supply, no device */ REGULATOR_SUPPLY ("v-intcore" ,NULL ), -/* USB Transciever */ +/* USB Transceiver */ REGULATOR_SUPPLY ("vddulpivio18" ,"ab8500-usb.0" ), };
drivers/i2c/busses/i2c-highlander.c +1 -1
@@ -227,7 +227,7 @@ static int highlander_i2c_read(struct highlander_i2c_dev *dev)/* * The R0P7780LC0011RL FPGA needs a significant delay between -* data read cycles, otherwise the transciever gets confused and +* data read cycles, otherwise the transceiver gets confused and * garbage is returned when the read is subsequently aborted. * * It is not sufficient to wait for BBSY.
drivers/net/eexpress.c +1 -1
@@ -365,7 +365,7 @@ static int __init do_express_probe(struct net_device *dev) dev->irq = mca_irqmap[(pos1>>4 )&0x7 ];/* -* XXX: Transciever selection is done +* XXX: Transceiver selection is done * differently on the MCA version. * How to get it to select something * other than external/AUI is currently
drivers/net/irda/toim3232-sir.c +1 -1
@@ -78,7 +78,7 @@* Target hardware: IRWave IR320ST-2 * * The IRWave IR320ST-2 is a simple dongle based on the Vishay/Temic -* TOIM3232 SIR Endec and the Vishay/Temic TFDS4500 SIR IRDA transciever. +* TOIM3232 SIR Endec and the Vishay/Temic TFDS4500 SIR IRDA transceiver. * It uses a hex inverter and some discrete components to buffer and * line convert the RS232 down to 5V. *
drivers/net/natsemi.c +1 -1
@@ -2919,7 +2919,7 @@ static int netdev_set_ecmd(struct net_device *dev, struct ethtool_cmd *ecmd)/* * If we're ignoring the PHY then autoneg and the internal -* transciever are really not going to work so don't let the +* transceiver are really not going to work so don't let the * user select them. */ if (np->ignore_phy && (ecmd->autoneg == AUTONEG_ENABLE ||
drivers/tty/serial/8250_pci.c +1 -1
@@ -769,7 +769,7 @@ pci_ni8430_setup(struct serial_private *priv, len =pci_resource_len (priv->dev, bar); p =ioremap_nocache (base, len); -/* enable the transciever */ +/* enable the transceiver */ writeb (readb (p + offset +NI8430_PORTCON ) |NI8430_PORTCON_TXVR_ENABLE , p + offset +NI8430_PORTCON );
drivers/usb/gadget/pxa27x_udc.h +2 -2
@@ -88,9 +88,9 @@#define UDCISR_INT_MASK (UDCICR_FIFOERR | UDCICR_PKTCOMPL)#define UDCOTGICR_IESF (1 << 24)/* OTG SET_FEATURE command recvd */ -#define UDCOTGICR_IEXR (1 << 17)/* Extra Transciever Interrupt +#define UDCOTGICR_IEXR (1 << 17)/* Extra Transceiver Interrupt Rising Edge Interrupt Enable */ -#define UDCOTGICR_IEXF (1 << 16)/* Extra Transciever Interrupt +#define UDCOTGICR_IEXF (1 << 16)/* Extra Transceiver Interrupt Falling Edge Interrupt Enable */ #define UDCOTGICR_IEVV40R (1 << 9)/* OTG Vbus Valid 4.0V Rising Edge Interrupt Enable */
drivers/usb/musb/musb_core.c +1 -1
@@ -1955,7 +1955,7 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl)* - initializes musb->xceiv, usually by otg_get_transceiver() * - stops powering VBUS * -* There are various transciever configurations. Blackfin, +* There are various transceiver configurations. Blackfin, * DaVinci, TUSB60x0, and others integrate them. OMAP3 uses * external/discrete ones in various flavors (twl4030 family, * isp1504, non-OTG, etc) mostly hooking up through ULPI.
drivers/usb/otg/isp1301_omap.c +2 -2
@@ -660,7 +660,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)int ret =IRQ_NONE ;struct isp1301 *isp = _isp; -/* update ISP1301 transciever from OTG controller */ +/* update ISP1301 transceiver from OTG controller */ if (otg_irq &OPRT_CHG ) {omap_writew (OPRT_CHG ,OTG_IRQ_SRC );isp1301_defer_work (isp,WORK_UPDATE_ISP );
@@ -755,7 +755,7 @@ static irqreturn_t omap_otg_irq(int irq, void *_isp)omap_writew (A_VBUS_ERR ,OTG_IRQ_SRC ); ret =IRQ_HANDLED ; -/* switch driver; the transciever code activates it, +/* switch driver; the transceiver code activates it, * ungating the udc clock or resuming OHCI. */ }else if (otg_irq &DRIVER_SWITCH ) {
sound/pci/ice1712/ice1712.c +1 -1
@@ -87,7 +87,7 @@ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */static int enable[SNDRV_CARDS ] =SNDRV_DEFAULT_ENABLE_PNP ;/* Enable this card */ static char *model[SNDRV_CARDS ];static int omni[SNDRV_CARDS ];/* Delta44 & 66 Omni I/O support */ -static int cs8427_timeout[SNDRV_CARDS ] = {[0 ... (SNDRV_CARDS -1 )] =500 };/* CS8427 S/PDIF transciever reset timeout value in msec */ +static int cs8427_timeout[SNDRV_CARDS ] = {[0 ... (SNDRV_CARDS -1 )] =500 };/* CS8427 S/PDIF transceiver reset timeout value in msec */ static int dxr_enable[SNDRV_CARDS ];/* DXR enable for DMX6FIRE */ module_param_array (index, int,NULL ,0444 );
Signature · 1 line
1.7.6.rc1
Jiri Kosina
AppliedRe: [Trivial next 2/2] treewide: transciever/transceiver spelling fixes
Quoted 5 lines · Joe Perches
arch/arm/mach-pxa/include/mach/corgi.h | 2 +- arch/arm/mach-pxa/include/mach/pxa27x-udc.h | 4 ++-- arch/arm/mach-ux500/board-mop500-regulators.c | 2 +- drivers/i2c/busses/i2c-highlander.c | 2 +- drivers/net/eexpress.c | 2 +-
Quoted 8 lines
drivers/net/irda/toim3232-sir.c | 2 +- drivers/net/natsemi.c | 2 +- drivers/tty/serial/8250_pci.c | 2 +- drivers/usb/gadget/pxa27x_udc.h | 4 ++-- drivers/usb/musb/musb_core.c | 2 +- drivers/usb/otg/isp1301_omap.c | 4 ++-- sound/pci/ice1712/ice1712.c | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-)
Applied.
Signature · 2 lines
Jiri Kosina SUSE Labs