diff options
-rw-r--r-- | Documentation/CodingStyle | 4 | ||||
-rw-r--r-- | drivers/ide/ide-atapi.c | 2 | ||||
-rw-r--r-- | drivers/isdn/mISDN/dsp_core.c | 2 | ||||
-rw-r--r-- | drivers/net/ipg.h | 2 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_fc.c | 2 | ||||
-rw-r--r-- | drivers/scsi/dpt/osd_util.h | 2 | ||||
-rw-r--r-- | drivers/usb/serial/io_ti.c | 2 | ||||
-rw-r--r-- | sound/pci/vx222/vx222_ops.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle index 72968cd5eaf3..8bb37237ebd2 100644 --- a/Documentation/CodingStyle +++ b/Documentation/CodingStyle | |||
@@ -698,8 +698,8 @@ very often is not. Abundant use of the inline keyword leads to a much bigger | |||
698 | kernel, which in turn slows the system as a whole down, due to a bigger | 698 | kernel, which in turn slows the system as a whole down, due to a bigger |
699 | icache footprint for the CPU and simply because there is less memory | 699 | icache footprint for the CPU and simply because there is less memory |
700 | available for the pagecache. Just think about it; a pagecache miss causes a | 700 | available for the pagecache. Just think about it; a pagecache miss causes a |
701 | disk seek, which easily takes 5 miliseconds. There are a LOT of cpu cycles | 701 | disk seek, which easily takes 5 milliseconds. There are a LOT of cpu cycles |
702 | that can go into these 5 miliseconds. | 702 | that can go into these 5 milliseconds. |
703 | 703 | ||
704 | A reasonable rule of thumb is to not put inline at functions that have more | 704 | A reasonable rule of thumb is to not put inline at functions that have more |
705 | than 3 lines of code in them. An exception to this rule are the cases where | 705 | than 3 lines of code in them. An exception to this rule are the cases where |
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index 757e5956b132..ae1cae38a078 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c | |||
@@ -577,7 +577,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) | |||
577 | 577 | ||
578 | /* | 578 | /* |
579 | * If necessary schedule the packet transfer to occur 'timeout' | 579 | * If necessary schedule the packet transfer to occur 'timeout' |
580 | * miliseconds later in ide_delayed_transfer_pc() after the | 580 | * milliseconds later in ide_delayed_transfer_pc() after the |
581 | * device says it's ready for a packet. | 581 | * device says it's ready for a packet. |
582 | */ | 582 | */ |
583 | if (drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) { | 583 | if (drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) { |
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c index 3083338716b2..47dbfe298b43 100644 --- a/drivers/isdn/mISDN/dsp_core.c +++ b/drivers/isdn/mISDN/dsp_core.c | |||
@@ -502,7 +502,7 @@ tone_off: | |||
502 | break; | 502 | break; |
503 | } | 503 | } |
504 | dsp->cmx_delay = (*((int *)data)) << 3; | 504 | dsp->cmx_delay = (*((int *)data)) << 3; |
505 | /* miliseconds to samples */ | 505 | /* milliseconds to samples */ |
506 | if (dsp->cmx_delay >= (CMX_BUFF_HALF>>1)) | 506 | if (dsp->cmx_delay >= (CMX_BUFF_HALF>>1)) |
507 | /* clip to half of maximum usable buffer | 507 | /* clip to half of maximum usable buffer |
508 | (half of half buffer) */ | 508 | (half of half buffer) */ |
diff --git a/drivers/net/ipg.h b/drivers/net/ipg.h index dd9318f19497..dfc2541bb556 100644 --- a/drivers/net/ipg.h +++ b/drivers/net/ipg.h | |||
@@ -514,7 +514,7 @@ enum ipg_regs { | |||
514 | #define IPG_DMALIST_ALIGN_PAD 0x07 | 514 | #define IPG_DMALIST_ALIGN_PAD 0x07 |
515 | #define IPG_MULTICAST_HASHTABLE_SIZE 0x40 | 515 | #define IPG_MULTICAST_HASHTABLE_SIZE 0x40 |
516 | 516 | ||
517 | /* Number of miliseconds to wait after issuing a software reset. | 517 | /* Number of milliseconds to wait after issuing a software reset. |
518 | * 0x05 <= IPG_AC_RESETWAIT to account for proper 10Mbps operation. | 518 | * 0x05 <= IPG_AC_RESETWAIT to account for proper 10Mbps operation. |
519 | */ | 519 | */ |
520 | #define IPG_AC_RESETWAIT 0x05 | 520 | #define IPG_AC_RESETWAIT 0x05 |
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index 19ae0842047c..18fd975412d3 100644 --- a/drivers/s390/scsi/zfcp_fc.c +++ b/drivers/s390/scsi/zfcp_fc.c | |||
@@ -116,7 +116,7 @@ static void zfcp_wka_port_put(struct zfcp_wka_port *wka_port) | |||
116 | { | 116 | { |
117 | if (atomic_dec_return(&wka_port->refcount) != 0) | 117 | if (atomic_dec_return(&wka_port->refcount) != 0) |
118 | return; | 118 | return; |
119 | /* wait 10 miliseconds, other reqs might pop in */ | 119 | /* wait 10 milliseconds, other reqs might pop in */ |
120 | schedule_delayed_work(&wka_port->work, HZ / 100); | 120 | schedule_delayed_work(&wka_port->work, HZ / 100); |
121 | } | 121 | } |
122 | 122 | ||
diff --git a/drivers/scsi/dpt/osd_util.h b/drivers/scsi/dpt/osd_util.h index 4b56c0436ba2..b2613c2eaac7 100644 --- a/drivers/scsi/dpt/osd_util.h +++ b/drivers/scsi/dpt/osd_util.h | |||
@@ -342,7 +342,7 @@ uLONG osdGetThreadID(void); | |||
342 | /* wakes up the specifed thread */ | 342 | /* wakes up the specifed thread */ |
343 | void osdWakeThread(uLONG); | 343 | void osdWakeThread(uLONG); |
344 | 344 | ||
345 | /* osd sleep for x miliseconds */ | 345 | /* osd sleep for x milliseconds */ |
346 | void osdSleep(uLONG); | 346 | void osdSleep(uLONG); |
347 | 347 | ||
348 | #define DPT_THREAD_PRIORITY_LOWEST 0x00 | 348 | #define DPT_THREAD_PRIORITY_LOWEST 0x00 |
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index eabf20eeb370..db964db42d3c 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
@@ -102,7 +102,7 @@ struct edgeport_port { | |||
102 | __u8 shadow_mcr; | 102 | __u8 shadow_mcr; |
103 | __u8 shadow_lsr; | 103 | __u8 shadow_lsr; |
104 | __u8 lsr_mask; | 104 | __u8 lsr_mask; |
105 | __u32 ump_read_timeout; /* Number of miliseconds the UMP will | 105 | __u32 ump_read_timeout; /* Number of milliseconds the UMP will |
106 | wait without data before completing | 106 | wait without data before completing |
107 | a read short */ | 107 | a read short */ |
108 | int baud_rate; | 108 | int baud_rate; |
diff --git a/sound/pci/vx222/vx222_ops.c b/sound/pci/vx222/vx222_ops.c index c0efe4491116..6416d3f0c7be 100644 --- a/sound/pci/vx222/vx222_ops.c +++ b/sound/pci/vx222/vx222_ops.c | |||
@@ -367,7 +367,7 @@ static int vx2_load_xilinx_binary(struct vx_core *chip, const struct firmware *x | |||
367 | unsigned int port; | 367 | unsigned int port; |
368 | const unsigned char *image; | 368 | const unsigned char *image; |
369 | 369 | ||
370 | /* XILINX reset (wait at least 1 milisecond between reset on and off). */ | 370 | /* XILINX reset (wait at least 1 millisecond between reset on and off). */ |
371 | vx_outl(chip, CNTRL, VX_CNTRL_REGISTER_VALUE | VX_XILINX_RESET_MASK); | 371 | vx_outl(chip, CNTRL, VX_CNTRL_REGISTER_VALUE | VX_XILINX_RESET_MASK); |
372 | vx_inl(chip, CNTRL); | 372 | vx_inl(chip, CNTRL); |
373 | msleep(10); | 373 | msleep(10); |