Skip to content

Commit

Permalink
ACPI / video: trivial costmetic cleanups
Browse files Browse the repository at this point in the history 
Fix whitespace and comments in several places in
drivers/acpi/video.c.

[rjw: Changelog]
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Felipe Contreras authored and Rafael J. Wysocki committed Aug 3, 2013
1 parent 5ae90d8 commit 21fcb34
Showing 1 changed file with 61 additions and 53 deletions.
114 changes: 61 additions & 53 deletions drivers/acpi/video.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* video.c - ACPI Video Driver ($Revision:$)
* video.c - ACPI Video Driver
*
* Copyright (C) 2004 Luming Yu <luming.yu@intel.com>
* Copyright (C) 2004 Bruno Ducrot <ducrot@poupinou.org>
Expand Down Expand Up @@ -118,26 +118,26 @@ struct acpi_video_bus_flags {
};

struct acpi_video_bus_cap {
u8 _DOS:1; /*Enable/Disable output switching */
u8 _DOD:1; /*Enumerate all devices attached to display adapter */
u8 _ROM:1; /*Get ROM Data */
u8 _GPD:1; /*Get POST Device */
u8 _SPD:1; /*Set POST Device */
u8 _VPO:1; /*Video POST Options */
u8 _DOS:1; /* Enable/Disable output switching */
u8 _DOD:1; /* Enumerate all devices attached to display adapter */
u8 _ROM:1; /* Get ROM Data */
u8 _GPD:1; /* Get POST Device */
u8 _SPD:1; /* Set POST Device */
u8 _VPO:1; /* Video POST Options */
u8 reserved:2;
};

struct acpi_video_device_attrib {
u32 display_index:4; /* A zero-based instance of the Display */
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 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
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 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. */
u32 pipe_id:3; /*For VGA multiple-head devices. */
u32 reserved:10; /*Must be 0 */
u32 device_id_scheme:1; /*Device ID Scheme */
u32 pipe_id:3; /* For VGA multiple-head devices. */
u32 reserved:10; /* Must be 0 */
u32 device_id_scheme:1; /* Device ID Scheme */
};

struct acpi_video_enumerated_device {
Expand Down Expand Up @@ -174,17 +174,17 @@ struct acpi_video_device_flags {
};

struct acpi_video_device_cap {
u8 _ADR:1; /*Return the unique ID */
u8 _BCL:1; /*Query list of brightness control levels supported */
u8 _BCM:1; /*Set the brightness level */
u8 _ADR:1; /* Return the unique ID */
u8 _BCL:1; /* Query list of brightness control levels supported */
u8 _BCM:1; /* Set the brightness level */
u8 _BQC:1; /* Get current brightness level */
u8 _BCQ:1; /* Some buggy BIOS uses _BCQ instead of _BQC */
u8 _DDC:1; /*Return the EDID for this device */
u8 _DDC:1; /* Return the EDID for this device */
};

struct acpi_video_brightness_flags {
u8 _BCL_no_ac_battery_levels:1; /* no AC/Battery levels in _BCL */
u8 _BCL_reversed:1; /* _BCL package is in a reversed order*/
u8 _BCL_reversed:1; /* _BCL package is in a reversed order */
u8 _BCL_use_index:1; /* levels in _BCL are index values */
u8 _BCM_use_index:1; /* input of _BCM is an index value */
u8 _BQC_use_index:1; /* _BQC returns an index value */
Expand Down Expand Up @@ -231,7 +231,7 @@ static int acpi_video_get_next_level(struct acpi_video_device *device,
static int acpi_video_switch_brightness(struct acpi_video_device *device,
int event);

/*backlight device sysfs support*/
/* backlight device sysfs support */
static int acpi_video_get_brightness(struct backlight_device *bd)
{
unsigned long long cur_level;
Expand All @@ -243,8 +243,10 @@ static int acpi_video_get_brightness(struct backlight_device *bd)
return -EINVAL;
for (i = 2; i < vd->brightness->count; i++) {
if (vd->brightness->levels[i] == cur_level)
/* The first two entries are special - see page 575
of the ACPI spec 3.0 */
/*
* The first two entries are special - see page 575
* of the ACPI spec 3.0
*/
return i-2;
}
return 0;
Expand Down Expand Up @@ -316,9 +318,11 @@ static const struct thermal_cooling_device_ops video_cooling_ops = {
.set_cur_state = video_set_cur_state,
};

/* --------------------------------------------------------------------------
Video Management
-------------------------------------------------------------------------- */
/*
* --------------------------------------------------------------------------
* Video Management
* --------------------------------------------------------------------------
*/

static int
acpi_video_device_lcd_query_levels(struct acpi_video_device *device,
Expand Down Expand Up @@ -556,7 +560,8 @@ acpi_video_device_lcd_get_level_current(struct acpi_video_device *device,
buf));
device->cap._BQC = device->cap._BCQ = 0;
} else {
/* Fixme:
/*
* Fixme:
* should we return an error or ignore this failure?
* dev->brightness->curr is a cached value which stores
* the correct current backlight level in most cases.
Expand Down Expand Up @@ -615,8 +620,8 @@ acpi_video_device_EDID(struct acpi_video_device *device,

/*
* Arg:
* video : video bus device pointer
* bios_flag :
* video : video bus device pointer
* bios_flag :
* 0. The system BIOS should NOT automatically switch(toggle)
* the active display output.
* 1. The system BIOS should automatically switch (toggle) the
Expand All @@ -628,9 +633,9 @@ acpi_video_device_EDID(struct acpi_video_device *device,
* lcd_flag :
* 0. The system BIOS should automatically control the brightness level
* of the LCD when the power changes from AC to DC
* 1. The system BIOS should NOT automatically control the brightness
* 1. The system BIOS should NOT automatically control the brightness
* level of the LCD when the power changes from AC to DC.
* Return Value:
* Return Value:
* -EINVAL wrong arg.
*/

Expand Down Expand Up @@ -717,8 +722,8 @@ static int acpi_video_bqc_quirk(struct acpi_video_device *device,


/*
* Arg:
* device : video output device (LCD, CRT, ..)
* Arg:
* device : video output device (LCD, CRT, ..)
*
* Return Value:
* Maximum brightness level
Expand Down Expand Up @@ -877,7 +882,7 @@ acpi_video_init_brightness(struct acpi_video_device *device)
* device : video output device (LCD, CRT, ..)
*
* Return Value:
* None
* None
*
* Find out all required AML methods defined under the output
* device.
Expand Down Expand Up @@ -988,11 +993,11 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
}

/*
* Arg:
* device : video output device (VGA)
* Arg:
* device : video output device (VGA)
*
* Return Value:
* None
* None
*
* Find out all required AML methods defined under the video bus device.
*/
Expand Down Expand Up @@ -1039,7 +1044,8 @@ static int acpi_video_bus_check(struct acpi_video_bus *video)
return -ENODEV;
pci_dev_put(dev);

/* Since there is no HID, CID and so on for VGA driver, we have
/*
* Since there is no HID, CID and so on for VGA driver, we have
* to check well known required nodes.
*/

Expand Down Expand Up @@ -1069,9 +1075,11 @@ static int acpi_video_bus_check(struct acpi_video_bus *video)
return status;
}

/* --------------------------------------------------------------------------
Driver Interface
-------------------------------------------------------------------------- */
/*
* --------------------------------------------------------------------------
* Driver Interface
* --------------------------------------------------------------------------
*/

/* device interface */
static struct acpi_video_device_attrib*
Expand Down Expand Up @@ -1192,12 +1200,12 @@ acpi_video_bus_get_one_device(struct acpi_device *device,

/*
* Arg:
* video : video bus device
* video : video bus device
*
* Return:
* none
*
* Enumerate the video device list of the video bus,
* none
*
* Enumerate the video device list of the video bus,
* bind the ids with the corresponding video devices
* under the video bus.
*/
Expand All @@ -1216,13 +1224,13 @@ static void acpi_video_device_rebind(struct acpi_video_bus *video)

/*
* Arg:
* video : video bus device
* device : video output device under the video
* bus
* video : video bus device
* device : video output device under the video
* bus
*
* Return:
* none
*
* none
*
* Bind the ids with the corresponding video devices
* under the video bus.
*/
Expand All @@ -1245,11 +1253,11 @@ acpi_video_device_bind(struct acpi_video_bus *video,

/*
* Arg:
* video : video bus device
* video : video bus device
*
* Return:
* < 0 : error
*
* < 0 : error
*
* Call _DOD to enumerate all devices attached to display adapter
*
*/
Expand Down

0 comments on commit 21fcb34

Please sign in to comment.