* [PATCH] drivers/acpi/video.c: Fix spelling and grammar mistakes
@ 2007-02-20 15:38 Julius Volz
2007-03-10 2:37 ` Len Brown
0 siblings, 1 reply; 2+ messages in thread
From: Julius Volz @ 2007-02-20 15:38 UTC (permalink / raw)
To: linux-acpi; +Cc: trivial
Hi,
this should apply against
kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
Description:
This patch corrects some of the most obvious spelling and grammar
mistakes in drivers/acpi/video.c (comments and printk output).
Signed-off-by: Julius Volz <juliusrv@gmail.com>
---
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index bf525cc..1dd1936 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -102,9 +102,9 @@ struct acpi_video_bus_cap {
struct acpi_video_device_attrib {
u32 display_index:4; /* A zero-based instance of the Display */
- u32 display_port_attachment:4; /*This field differenates displays type */
+ u32 display_port_attachment:4; /*This field differentiates the display type */
u32 display_type:4; /*Describe the specific type in use */
- u32 vendor_specific:4; /*Chipset Vendor Specifi */
+ u32 vendor_specific:4; /*Chipset Vendor Specific */
u32 bios_can_detect:1; /*BIOS can detect the device */
u32 depend_on_vga:1; /*Non-VGA output device whose power is related to
the VGA device. */
@@ -480,16 +480,16 @@ acpi_video_bus_POST_options(struct acpi_video_bus *video,
* 0. The system BIOS should NOT automatically switch(toggle)
* the active display output.
* 1. The system BIOS should automatically switch (toggle) the
- * active display output. No swich event.
+ * active display output. No switch event.
* 2. The _DGS value should be locked.
* 3. The system BIOS should not automatically switch (toggle) the
* active display output, but instead generate the display switch
* event notify code.
* lcd_flag :
* 0. The system BIOS should automatically control the brightness level
- * of the LCD, when the power changes from AC to DC
+ * of the LCD when the power changes from AC to DC
* 1. The system BIOS should NOT automatically control the brightness
- * level of the LCD, when the power changes from AC to DC.
+ * level of the LCD when the power changes from AC to DC.
* Return Value:
* -1 wrong arg.
*/
@@ -521,7 +521,7 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
* Return Value:
* None
*
- * Find out all required AML method defined under the output
+ * Find out all required AML methods defined under the output
* device.
*/
@@ -645,7 +645,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
* Return Value:
* None
*
- * Find out all required AML method defined under the video bus device.
+ * Find out all required AML methods defined under the video bus device.
*/
static void acpi_video_bus_find_cap(struct acpi_video_bus *video)
@@ -690,19 +690,19 @@ static int acpi_video_bus_check(struct acpi_video_bus *video)
* to check well known required nodes.
*/
- /* Does this device able to support video switching ? */
+ /* Does this device support video switching? */
if (video->cap._DOS) {
video->flags.multihead = 1;
status = 0;
}
- /* Does this device able to retrieve a retrieve a video ROM ? */
+ /* Does this device support retrieving a video ROM? */
if (video->cap._ROM) {
video->flags.rom = 1;
status = 0;
}
- /* Does this device able to configure which video device to POST ? */
+ /* Does this device support configuring which video device to POST? */
if (video->cap._GPD && video->cap._SPD && video->cap._VPO) {
video->flags.post = 1;
status = 0;
@@ -869,7 +869,7 @@ acpi_video_device_write_brightness(struct file *file,
if (level > 100)
return -EFAULT;
- /* validate though the list of available levels */
+ /* validate through the list of available levels */
for (i = 0; i < dev->brightness->count; i++)
if (level == dev->brightness->levels[i]) {
if (ACPI_SUCCESS
@@ -1074,10 +1074,10 @@ static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)
printk(KERN_WARNING PREFIX
"The motherboard VGA device is not listed as a possible POST device.\n");
printk(KERN_WARNING PREFIX
- "This indicate a BIOS bug. Please contact the manufacturer.\n");
+ "This indicates a BIOS bug. Please contact the manufacturer.\n");
}
printk("%lx\n", options);
- seq_printf(seq, "can POST: <intgrated video>");
+ seq_printf(seq, "can POST: <integrated video>");
if (options & 2)
seq_printf(seq, " <PCI video>");
if (options & 4)
@@ -1111,7 +1111,7 @@ static int acpi_video_bus_POST_seq_show(struct seq_file *seq, void *offset)
seq_printf(seq, "<not supported>\n");
goto end;
}
- seq_printf(seq, "device posted is <%s>\n", device_decode[id & 3]);
+ seq_printf(seq, "device POSTed is <%s>\n", device_decode[id & 3]);
end:
return 0;
@@ -1165,7 +1165,7 @@ acpi_video_bus_write_POST(struct file *file,
if (opt > 3)
return -EFAULT;
- /* just in case an OEM 'forget' the motherboard... */
+ /* just in case an OEM 'forgot' the motherboard... */
options |= 1;
if (options & (1ul << opt)) {
@@ -1536,13 +1536,13 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
/*
* Arg:
* video : video bus device
- * event : Nontify Event
+ * event : notify event
*
* Return:
* < 0 : error
*
* 1. Find out the current active output device.
- * 2. Identify the next output device to switch
+ * 2. Identify the next output device to switch to.
* 3. call _DSS to do actual switch.
*/
@@ -1735,12 +1735,12 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
device = video->device;
switch (event) {
- case ACPI_VIDEO_NOTIFY_SWITCH: /* User request that a switch occur,
+ case ACPI_VIDEO_NOTIFY_SWITCH: /* User requested a switch,
* most likely via hotkey. */
acpi_bus_generate_event(device, event, 0);
break;
- case ACPI_VIDEO_NOTIFY_PROBE: /* User plug or remove a video
+ case ACPI_VIDEO_NOTIFY_PROBE: /* User plugged in or removed a video
* connector. */
acpi_video_device_enumerate(video);
acpi_video_device_rebind(video);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drivers/acpi/video.c: Fix spelling and grammar mistakes
2007-02-20 15:38 [PATCH] drivers/acpi/video.c: Fix spelling and grammar mistakes Julius Volz
@ 2007-03-10 2:37 ` Len Brown
0 siblings, 0 replies; 2+ messages in thread
From: Len Brown @ 2007-03-10 2:37 UTC (permalink / raw)
To: Julius Volz; +Cc: linux-acpi, trivial
Applied.
thanks,
-Len
On Tuesday 20 February 2007 10:38, Julius Volz wrote:
> Hi,
>
> this should apply against
> kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
>
> Description:
> This patch corrects some of the most obvious spelling and grammar
> mistakes in drivers/acpi/video.c (comments and printk output).
>
> Signed-off-by: Julius Volz <juliusrv@gmail.com>
>
> ---
>
> diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
> index bf525cc..1dd1936 100644
> --- a/drivers/acpi/video.c
> +++ b/drivers/acpi/video.c
> @@ -102,9 +102,9 @@ struct acpi_video_bus_cap {
>
> struct acpi_video_device_attrib {
> u32 display_index:4; /* A zero-based instance of the Display */
> - u32 display_port_attachment:4; /*This field differenates displays type */
> + u32 display_port_attachment:4; /*This field differentiates the display type */
> u32 display_type:4; /*Describe the specific type in use */
> - u32 vendor_specific:4; /*Chipset Vendor Specifi */
> + u32 vendor_specific:4; /*Chipset Vendor Specific */
> u32 bios_can_detect:1; /*BIOS can detect the device */
> u32 depend_on_vga:1; /*Non-VGA output device whose power is related to
> the VGA device. */
> @@ -480,16 +480,16 @@ acpi_video_bus_POST_options(struct acpi_video_bus *video,
> * 0. The system BIOS should NOT automatically switch(toggle)
> * the active display output.
> * 1. The system BIOS should automatically switch (toggle) the
> - * active display output. No swich event.
> + * active display output. No switch event.
> * 2. The _DGS value should be locked.
> * 3. The system BIOS should not automatically switch (toggle) the
> * active display output, but instead generate the display switch
> * event notify code.
> * lcd_flag :
> * 0. The system BIOS should automatically control the brightness level
> - * of the LCD, when the power changes from AC to DC
> + * of the LCD when the power changes from AC to DC
> * 1. The system BIOS should NOT automatically control the brightness
> - * level of the LCD, when the power changes from AC to DC.
> + * level of the LCD when the power changes from AC to DC.
> * Return Value:
> * -1 wrong arg.
> */
> @@ -521,7 +521,7 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
> * Return Value:
> * None
> *
> - * Find out all required AML method defined under the output
> + * Find out all required AML methods defined under the output
> * device.
> */
>
> @@ -645,7 +645,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
> * Return Value:
> * None
> *
> - * Find out all required AML method defined under the video bus device.
> + * Find out all required AML methods defined under the video bus device.
> */
>
> static void acpi_video_bus_find_cap(struct acpi_video_bus *video)
> @@ -690,19 +690,19 @@ static int acpi_video_bus_check(struct acpi_video_bus *video)
> * to check well known required nodes.
> */
>
> - /* Does this device able to support video switching ? */
> + /* Does this device support video switching? */
> if (video->cap._DOS) {
> video->flags.multihead = 1;
> status = 0;
> }
>
> - /* Does this device able to retrieve a retrieve a video ROM ? */
> + /* Does this device support retrieving a video ROM? */
> if (video->cap._ROM) {
> video->flags.rom = 1;
> status = 0;
> }
>
> - /* Does this device able to configure which video device to POST ? */
> + /* Does this device support configuring which video device to POST? */
> if (video->cap._GPD && video->cap._SPD && video->cap._VPO) {
> video->flags.post = 1;
> status = 0;
> @@ -869,7 +869,7 @@ acpi_video_device_write_brightness(struct file *file,
> if (level > 100)
> return -EFAULT;
>
> - /* validate though the list of available levels */
> + /* validate through the list of available levels */
> for (i = 0; i < dev->brightness->count; i++)
> if (level == dev->brightness->levels[i]) {
> if (ACPI_SUCCESS
> @@ -1074,10 +1074,10 @@ static int acpi_video_bus_POST_info_seq_show(struct seq_file *seq, void *offset)
> printk(KERN_WARNING PREFIX
> "The motherboard VGA device is not listed as a possible POST device.\n");
> printk(KERN_WARNING PREFIX
> - "This indicate a BIOS bug. Please contact the manufacturer.\n");
> + "This indicates a BIOS bug. Please contact the manufacturer.\n");
> }
> printk("%lx\n", options);
> - seq_printf(seq, "can POST: <intgrated video>");
> + seq_printf(seq, "can POST: <integrated video>");
> if (options & 2)
> seq_printf(seq, " <PCI video>");
> if (options & 4)
> @@ -1111,7 +1111,7 @@ static int acpi_video_bus_POST_seq_show(struct seq_file *seq, void *offset)
> seq_printf(seq, "<not supported>\n");
> goto end;
> }
> - seq_printf(seq, "device posted is <%s>\n", device_decode[id & 3]);
> + seq_printf(seq, "device POSTed is <%s>\n", device_decode[id & 3]);
>
> end:
> return 0;
> @@ -1165,7 +1165,7 @@ acpi_video_bus_write_POST(struct file *file,
> if (opt > 3)
> return -EFAULT;
>
> - /* just in case an OEM 'forget' the motherboard... */
> + /* just in case an OEM 'forgot' the motherboard... */
> options |= 1;
>
> if (options & (1ul << opt)) {
> @@ -1536,13 +1536,13 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
> /*
> * Arg:
> * video : video bus device
> - * event : Nontify Event
> + * event : notify event
> *
> * Return:
> * < 0 : error
> *
> * 1. Find out the current active output device.
> - * 2. Identify the next output device to switch
> + * 2. Identify the next output device to switch to.
> * 3. call _DSS to do actual switch.
> */
>
> @@ -1735,12 +1735,12 @@ static void acpi_video_bus_notify(acpi_handle handle, u32 event, void *data)
> device = video->device;
>
> switch (event) {
> - case ACPI_VIDEO_NOTIFY_SWITCH: /* User request that a switch occur,
> + case ACPI_VIDEO_NOTIFY_SWITCH: /* User requested a switch,
> * most likely via hotkey. */
> acpi_bus_generate_event(device, event, 0);
> break;
>
> - case ACPI_VIDEO_NOTIFY_PROBE: /* User plug or remove a video
> + case ACPI_VIDEO_NOTIFY_PROBE: /* User plugged in or removed a video
> * connector. */
> acpi_video_device_enumerate(video);
> acpi_video_device_rebind(video);
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-03-10 2:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-02-20 15:38 [PATCH] drivers/acpi/video.c: Fix spelling and grammar mistakes Julius Volz
2007-03-10 2:37 ` Len Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).