spelling fix in various files: preferred -> preferred
Subsystems (10)
PATCH 1/1 spelling fix in various files: preferred -> preferred
Spelling fix: prefered -> preferred
Documentation/i2c/busses/i2c-parport-light +1 -1
@@ -4,7 +4,7 @@ This driver is a light version of i2c-parport. It doesn't depend on the parport driver, and uses direct I/O access instead. This might be -prefered on embedded systems where wasting memory for the clean but heavy +preferred on embedded systems where wasting memory for the clean but heavy parport handling is not an option. The drawback is a reduced portability and the impossibility to daisy-chain other parallel port devices.
arch/m68knommu/platform/coldfire/head.S +1 -1
@@ -19,7 +19,7 @@ /* * If we don't have a fixed memory size, then lets build in code - * to auto detect the DRAM size. Obviously this is the prefered + * to auto detect the DRAM size. Obviously this is the preferred * method, and should work for most boards. It won't work for those * that do not have their RAM starting at address 0, and it only * works on SDRAM (not boards fitted with SRAM).
arch/s390/kernel/time.c +1 -1
@@ -1038,7 +1038,7 @@ eacr =etr_handle_update (&aib, eacr);/* -* Select ports to enable. The prefered synchronization mode is PPS. +* Select ports to enable. The preferred synchronization mode is PPS. * If a port can be enabled depends on a number of things: * 1) The port needs to be online and uptodate. A port is not * disabled just because it is not uptodate, but it is only
drivers/media/video/cx25840/cx25840-core.c +1 -1
@@ -245,7 +245,7 @@cx25840_write (client,0x918 ,0xa0 );cx25840_write (client,0x919 ,0x01 ); -/* stereo prefered */ +/* stereo preferred */ cx25840_write (client,0x809 ,0x04 );/* AC97 shift */ cx25840_write (client,0x8cf ,0x0f );
drivers/net/enc28j60_hw.h +1 -1
@@ -303,7 +303,7 @@/* maximum ethernet frame length */ #define MAX_FRAMELEN 1518 -/* Prefered half duplex: LEDA: Link status LEDB: Rx/Tx activity */ +/* Preferred half duplex: LEDA: Link status LEDB: Rx/Tx activity */ #define ENC28J60_LAMPS_MODE 0x3476#endif
drivers/net/sk98lin/skrlmt.c +1 -1
@@ -1627,7 +1627,7 @@ PortFound =SK_FALSE ; pAC->Rlmt.CheckSwitch =SK_FALSE ; -#if 0 /* RW 2001/10/18 - active port becomes always prefered one */ +#if 0 /* RW 2001/10/18 - active port becomes always preferred one */ if (pAC->Rlmt.Net[NetIdx].Preference ==0xFFFFFFFF ) {/* Automatic */ /* disable auto-fail back */ PrefPort = Active;
drivers/net/tokenring/madgemc.c +1 -1
@@ -459,7 +459,7 @@ }/* -* Set the card to the prefered ring speed. +* Set the card to the preferred ring speed. * * Unlike newer cards, the MC16/32 have their speed selection * circuit connected to the Madge ASICs and not to the TMS380
include/acpi/actbl.h +2 -2
@@ -260,9 +260,9 @@#define ACPI_FADT_APIC_PHYSICAL (1<<19)/* 19: All local x_aPICs must use physical dest mode (ACPI 3.0) */ /* -* FADT Prefered Power Management Profiles +* FADT Preferred Power Management Profiles */ -enum acpi_prefered_pm_profiles { +enum acpi_preferred_pm_profiles {PM_UNSPECIFIED =0 ,PM_DESKTOP =1 ,PM_MOBILE =2 ,
include/asm-blackfin/cplbinit.h +1 -1
@@ -52,7 +52,7 @@struct cplb_desc {u32 start;/* start address */ u32 end;/* end address */ -u32 psize;/* prefered size if any otherwise 1MB or 4MB*/ +u32 psize;/* preferred size if any otherwise 1MB or 4MB*/ u16 attr;/* attributes */ u16 i_conf;/* I-CPLB DATA */ u16 d_conf;/* D-CPLB DATA */
include/asm-ia64/sn/bte.h +1 -1
@@ -216,7 +216,7 @@bte_copy (0 , dest, len, ((mode) |BTE_ZERO_FILL ), notification)/* -* The following is the prefered way of calling bte_unaligned_copy +* The following is the preferred way of calling bte_unaligned_copy * If the copy is fully cache line aligned, then bte_copy is * used instead. Since bte_copy is inlined, this saves a call * stack. NOTE: bte_copy is called synchronously and does block
include/linux/prefetch.h +1 -1
@@ -29,7 +29,7 @@prefetchw(x) - prefetches the cacheline at "x" for write spin_lock_prefetch(x) - prefetches the spinlock *x for taking - there is also PREFETCH_STRIDE which is the architecure-prefered +there is also PREFETCH_STRIDE which is the architecure-preferred "lookahead" size for prefetching streamed operations. */
include/net/iw_handler.h +1 -1
@@ -129,7 +129,7 @@* * Functions prototype uses union iwreq_data * ----------------------------------------- -* Some would have prefered functions defined this way : +* Some would have preferred functions defined this way : * static int mydriver_ioctl_setrate(struct net_device *dev, * long rate, int auto) * 1) The kernel code doesn't "validate" the content of iwreq_data, and
sound/pci/ice1712/ice1712.c +2 -2
@@ -2712,7 +2712,7 @@return err; }if (c->mpu401_1_name) -/* Prefered name available in card_info */ +/* Preferred name available in card_info */ snprintf (ice->rmidi[0 ]->name,sizeof (ice->rmidi[0 ]->name),"%s %d" , c->mpu401_1_name, card->number);
@@ -2729,7 +2729,7 @@return err; }if (c->mpu401_2_name) -/* Prefered name available in card_info */ +/* Preferred name available in card_info */ snprintf(ice->rmidi[1]->name, sizeof(ice->rmidi[1]->name), "%s %d", c->mpu401_2_name,
Signature · 1 line
:wq
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 9 lines · Jesper Juhl
Quoted 4 lines · Benoit Boissinot
Spelling fix: prefered -> preferred
Signed-off-by Benoit Boissinot <[email protected]>This patch doesn't apply cleanly to mainline any more. Please re-submit if you still want it applied.
done below
Quoted 4 lines
It would be better to split this by subsystem and submit a few patches instead of one huge patch. That makes it easier to merge, both via maintainers and, if that fails, via trivial.
I don't think it is really huge:
Documentation/i2c/busses/i2c-parport-light | 2 +- arch/m68knommu/platform/coldfire/head.S | 2 +- arch/s390/kernel/time.c | 2 +- drivers/media/video/cx25840/cx25840-core.c | 2 +- drivers/net/enc28j60_hw.h | 2 +- drivers/net/sk98lin/skrlmt.c | 2 +- drivers/net/tokenring/madgemc.c | 2 +- include/acpi/actbl.h | 4 ++-- include/asm-blackfin/cplbinit.h | 2 +- include/asm-ia64/sn/bte.h | 2 +- include/linux/prefetch.h | 2 +- include/net/iw_handler.h | 2 +- sound/pci/ice1712/ice1712.c | 4 ++-- sound/ppc/snd_ps3_reg.h | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-)
And if I should split it in 14 patches, I'd prefer to drop it, it would consume too much time.
I've removed the change to acpi, since it was renaming an enum, and although it is safe for the kernel (not exported in userspace), upstream might not like it if the header is shared with some other library.
Now all the changes are in comments.
regards,
Benoit
Documentation/i2c/busses/i2c-parport-light +1 -1
@@ -4,7 +4,7 @@ Author: Jean Delvare <[email protected]> This driver is a light version of i2c-parport. It doesn't depend on the parport driver, and uses direct I/O access instead. This might be -prefered on embedded systems where wasting memory for the clean but heavy +preferred on embedded systems where wasting memory for the clean but heavy parport handling is not an option. The drawback is a reduced portability and the impossibility to daisy-chain other parallel port devices.
arch/m68knommu/platform/coldfire/head.S +1 -1
@@ -19,7 +19,7 @@ /* * If we don't have a fixed memory size, then lets build in code - * to auto detect the DRAM size. Obviously this is the prefered + * to auto detect the DRAM size. Obviously this is the preferred * method, and should work for most boards. It won't work for those * that do not have their RAM starting at address 0, and it only * works on SDRAM (not boards fitted with SRAM).
arch/s390/kernel/time.c +1 -1
@@ -1038,7 +1038,7 @@ static void etr_work_fn(struct work_struct *work) eacr =etr_handle_update (&aib, eacr);/* -* Select ports to enable. The prefered synchronization mode is PPS. +* Select ports to enable. The preferred synchronization mode is PPS. * If a port can be enabled depends on a number of things: * 1) The port needs to be online and uptodate. A port is not * disabled just because it is not uptodate, but it is only
drivers/media/video/cx25840/cx25840-core.c +1 -1
@@ -245,7 +245,7 @@ static void cx25840_initialize(struct i2c_client *client)cx25840_write (client,0x918 ,0xa0 );cx25840_write (client,0x919 ,0x01 ); -/* stereo prefered */ +/* stereo preferred */ cx25840_write (client,0x809 ,0x04 );/* AC97 shift */ cx25840_write (client,0x8cf ,0x0f );
drivers/net/enc28j60_hw.h +1 -1
@@ -303,7 +303,7 @@/* maximum ethernet frame length */ #define MAX_FRAMELEN 1518 -/* Prefered half duplex: LEDA: Link status LEDB: Rx/Tx activity */ +/* Preferred half duplex: LEDA: Link status LEDB: Rx/Tx activity */ #define ENC28J60_LAMPS_MODE 0x3476#endif
drivers/net/sk98lin/skrlmt.c +1 -1
@@ -1627,7 +1627,7 @@ SK_U32 NetIdx) /* Net index */ PortFound =SK_FALSE ; pAC->Rlmt.CheckSwitch =SK_FALSE ; -#if 0 /* RW 2001/10/18 - active port becomes always prefered one */ +#if 0 /* RW 2001/10/18 - active port becomes always preferred one */ if (pAC->Rlmt.Net[NetIdx].Preference ==0xFFFFFFFF ) {/* Automatic */ /* disable auto-fail back */ PrefPort = Active;
drivers/net/tokenring/madgemc.c +1 -1
@@ -459,7 +459,7 @@ static irqreturn_t madgemc_interrupt(int irq, void *dev_id) }/* -* Set the card to the prefered ring speed. +* Set the card to the preferred ring speed. * * Unlike newer cards, the MC16/32 have their speed selection * circuit connected to the Madge ASICs and not to the TMS380
include/asm-blackfin/cplbinit.h +1 -1
@@ -52,7 +52,7 @@ enumstruct cplb_desc {u32 start;/* start address */ u32 end;/* end address */ -u32 psize;/* prefered size if any otherwise 1MB or 4MB*/ +u32 psize;/* preferred size if any otherwise 1MB or 4MB*/ u16 attr;/* attributes */ u16 i_conf;/* I-CPLB DATA */ u16 d_conf;/* D-CPLB DATA */
include/asm-ia64/sn/bte.h +1 -1
@@ -216,7 +216,7 @@ extern void bte_error_handler(unsigned long);bte_copy (0 , dest, len, ((mode) |BTE_ZERO_FILL ), notification)/* -* The following is the prefered way of calling bte_unaligned_copy +* The following is the preferred way of calling bte_unaligned_copy * If the copy is fully cache line aligned, then bte_copy is * used instead. Since bte_copy is inlined, this saves a call * stack. NOTE: bte_copy is called synchronously and does block
include/linux/prefetch.h +1 -1
@@ -29,7 +29,7 @@prefetchw(x) - prefetches the cacheline at "x" for write spin_lock_prefetch(x) - prefetches the spinlock *x for taking - there is also PREFETCH_STRIDE which is the architecure-prefered +there is also PREFETCH_STRIDE which is the architecure-preferred "lookahead" size for prefetching streamed operations. */
include/net/iw_handler.h +1 -1
@@ -129,7 +129,7 @@* * Functions prototype uses union iwreq_data * ----------------------------------------- -* Some would have prefered functions defined this way : +* Some would have preferred functions defined this way : * static int mydriver_ioctl_setrate(struct net_device *dev, * long rate, int auto) * 1) The kernel code doesn't "validate" the content of iwreq_data, and
sound/pci/ice1712/ice1712.c +2 -2
@@ -2712,7 +2712,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,return err; }if (c->mpu401_1_name) -/* Prefered name available in card_info */ +/* Preferred name available in card_info */ snprintf (ice->rmidi[0 ]->name,sizeof (ice->rmidi[0 ]->name),"%s %d" , c->mpu401_1_name, card->number);
@@ -2729,7 +2729,7 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,return err; }if (c->mpu401_2_name) -/* Prefered name available in card_info */ +/* Preferred name available in card_info */ snprintf(ice->rmidi[1]->name, sizeof(ice->rmidi[1]->name), "%s %d", c->mpu401_2_name,
sound/ppc/snd_ps3_reg.h +1 -1
@@ -125,7 +125,7 @@transfers. Any interrupts associated with the canceled transfers will occur as if the transfer had finished. Since this bit is designed to recover from DMA related issues -which are caused by unpredictable situations, it is prefered to wait +which are caused by unpredictable situations, it is preferred to wait for normal DMA transfer end without using this bit. */ #define PS3_AUDIO_CONFIG_CLEAR (1 << 8)/* RWIVF */
Signature · 1 line
:wq
Quoted 4 lines · Benoit Boissinot
Quoted 3 lines · Jesper Juhl
Quoted 1 line · Benoit Boissinot
Spelling fix: prefered -> preferred
Do you run a spellchecker on the subjects of your emails? ;-)
With kind regards,
Geert Uytterhoeven
Software Architect
Sony Network and Software Technology Center Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium
Phone: +32 (0)2 700 8453 Fax: +32 (0)2 700 8622 E-mail: [email protected] Internet: http://www.sony-europe.com/
Sony Network and Software Technology Center Europe
A division of Sony Service Centre (Europe) N.V. Registered office: Technologielaan 7 · B-1840 Londerzeel · Belgium VAT BE 0413.825.160 · RPR Brussels
Fortis Bank Zaventem · BIC GEBABEBB08A · IBAN BE39001382358619