Skip to content

Commit 45882a8

Browse files
acpibobrafaeljw
authored andcommitted
ACPICA: Removed some tabs and // comments
ACPICA commit 0914618b553d6f3366e568409cebf2656891ca69 Automated cleanup; No functional changes. Link: acpica/acpica@0914618b Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 487ea80 commit 45882a8

3 files changed

Lines changed: 34 additions & 34 deletions

File tree

include/acpi/actbl1.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -379,15 +379,15 @@ struct acpi_cedt_cfmws_target_element {
379379

380380
/* Values for Interleave Arithmetic field above */
381381

382-
#define ACPI_CEDT_CFMWS_ARITHMETIC_MODULO (0)
382+
#define ACPI_CEDT_CFMWS_ARITHMETIC_MODULO (0)
383383

384384
/* Values for Restrictions field above */
385385

386-
#define ACPI_CEDT_CFMWS_RESTRICT_TYPE2 (1)
387-
#define ACPI_CEDT_CFMWS_RESTRICT_TYPE3 (1<<1)
388-
#define ACPI_CEDT_CFMWS_RESTRICT_VOLATILE (1<<2)
389-
#define ACPI_CEDT_CFMWS_RESTRICT_PMEM (1<<3)
390-
#define ACPI_CEDT_CFMWS_RESTRICT_FIXED (1<<4)
386+
#define ACPI_CEDT_CFMWS_RESTRICT_TYPE2 (1)
387+
#define ACPI_CEDT_CFMWS_RESTRICT_TYPE3 (1<<1)
388+
#define ACPI_CEDT_CFMWS_RESTRICT_VOLATILE (1<<2)
389+
#define ACPI_CEDT_CFMWS_RESTRICT_PMEM (1<<3)
390+
#define ACPI_CEDT_CFMWS_RESTRICT_FIXED (1<<4)
391391

392392
/*******************************************************************************
393393
*

include/acpi/actbl2.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -978,8 +978,8 @@ struct acpi_madt_multiproc_wakeup {
978978
u64 base_address;
979979
};
980980

981-
#define ACPI_MULTIPROC_WAKEUP_MB_OS_SIZE 2032
982-
#define ACPI_MULTIPROC_WAKEUP_MB_FIRMWARE_SIZE 2048
981+
#define ACPI_MULTIPROC_WAKEUP_MB_OS_SIZE 2032
982+
#define ACPI_MULTIPROC_WAKEUP_MB_FIRMWARE_SIZE 2048
983983

984984
struct acpi_madt_multiproc_wakeup_mailbox {
985985
u16 command;
@@ -1597,7 +1597,7 @@ struct acpi_nhlt_mic_device_specific_config {
15971597

15981598
/* Values for array_type_ext above */
15991599

1600-
#define ACPI_NHLT_ARRAY_TYPE_RESERVED 0x09 // 9 and below are reserved
1600+
#define ACPI_NHLT_ARRAY_TYPE_RESERVED 0x09 /* 9 and below are reserved */
16011601
#define ACPI_NHLT_SMALL_LINEAR_2ELEMENT 0x0A
16021602
#define ACPI_NHLT_BIG_LINEAR_2ELEMENT 0x0B
16031603
#define ACPI_NHLT_FIRST_GEOMETRY_LINEAR_4ELEMENT 0x0C
@@ -1617,17 +1617,17 @@ struct acpi_nhlt_vendor_mic_count {
16171617
struct acpi_nhlt_vendor_mic_config {
16181618
u8 type;
16191619
u8 panel;
1620-
u16 speaker_position_distance; // mm
1621-
u16 horizontal_offset; // mm
1622-
u16 vertical_offset; // mm
1623-
u8 frequency_low_band; // 5*hz
1624-
u8 frequency_high_band; // 500*hz
1625-
u16 direction_angle; // -180 - + 180
1626-
u16 elevation_angle; // -180 - + 180
1627-
u16 work_vertical_angle_begin; // -180 - + 180 with 2 deg step
1628-
u16 work_vertical_angle_end; // -180 - + 180 with 2 deg step
1629-
u16 work_horizontal_angle_begin; // -180 - + 180 with 2 deg step
1630-
u16 work_horizontal_angle_end; // -180 - + 180 with 2 deg step
1620+
u16 speaker_position_distance; /* mm */
1621+
u16 horizontal_offset; /* mm */
1622+
u16 vertical_offset; /* mm */
1623+
u8 frequency_low_band; /* 5*Hz */
1624+
u8 frequency_high_band; /* 500*Hz */
1625+
u16 direction_angle; /* -180 - + 180 */
1626+
u16 elevation_angle; /* -180 - + 180 */
1627+
u16 work_vertical_angle_begin; /* -180 - + 180 with 2 deg step */
1628+
u16 work_vertical_angle_end; /* -180 - + 180 with 2 deg step */
1629+
u16 work_horizontal_angle_begin; /* -180 - + 180 with 2 deg step */
1630+
u16 work_horizontal_angle_end; /* -180 - + 180 with 2 deg step */
16311631
};
16321632

16331633
/* Values for Type field above */
@@ -1638,9 +1638,9 @@ struct acpi_nhlt_vendor_mic_config {
16381638
#define ACPI_NHLT_MIC_SUPER_CARDIOID 3
16391639
#define ACPI_NHLT_MIC_HYPER_CARDIOID 4
16401640
#define ACPI_NHLT_MIC_8_SHAPED 5
1641-
#define ACPI_NHLT_MIC_RESERVED6 6 // 6 is reserved
1641+
#define ACPI_NHLT_MIC_RESERVED6 6 /* 6 is reserved */
16421642
#define ACPI_NHLT_MIC_VENDOR_DEFINED 7
1643-
#define ACPI_NHLT_MIC_RESERVED 8 // 8 and above are reserved
1643+
#define ACPI_NHLT_MIC_RESERVED 8 /* 8 and above are reserved */
16441644

16451645
/* Values for Panel field above */
16461646

@@ -1650,12 +1650,12 @@ struct acpi_nhlt_vendor_mic_config {
16501650
#define ACPI_NHLT_MIC_POSITION_RIGHT 3
16511651
#define ACPI_NHLT_MIC_POSITION_FRONT 4
16521652
#define ACPI_NHLT_MIC_POSITION_BACK 5
1653-
#define ACPI_NHLT_MIC_POSITION_RESERVED 6 // 6 and above are reserved
1653+
#define ACPI_NHLT_MIC_POSITION_RESERVED 6 /* 6 and above are reserved */
16541654

16551655
struct acpi_nhlt_vendor_mic_device_specific_config {
16561656
struct acpi_nhlt_mic_device_specific_config mic_array_device_config;
16571657
u8 number_of_microphones;
1658-
struct acpi_nhlt_vendor_mic_config mic_config[]; // indexed by number_of_microphones
1658+
struct acpi_nhlt_vendor_mic_config mic_config[]; /* Indexed by number_of_microphones */
16591659
};
16601660

16611661
/* Microphone SNR and Sensitivity extension */
@@ -1668,8 +1668,8 @@ struct acpi_nhlt_mic_snr_sensitivity_extension {
16681668
/* Render device with feedback */
16691669

16701670
struct acpi_nhlt_render_feedback_device_specific_config {
1671-
u8 feedback_virtual_slot; // render slot in case of capture
1672-
u16 feedback_channels; // informative only
1671+
u8 feedback_virtual_slot; /* Render slot in case of capture */
1672+
u16 feedback_channels; /* Informative only */
16731673
u16 feedback_valid_bits_per_sample;
16741674
};
16751675

include/acpi/actypes.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -539,14 +539,14 @@ typedef u64 acpi_integer;
539539
* Can be used with access_width of struct acpi_generic_address and access_size of
540540
* struct acpi_resource_generic_register.
541541
*/
542-
#define ACPI_ACCESS_BIT_SHIFT 2
543-
#define ACPI_ACCESS_BYTE_SHIFT -1
544-
#define ACPI_ACCESS_BIT_MAX (31 - ACPI_ACCESS_BIT_SHIFT)
545-
#define ACPI_ACCESS_BYTE_MAX (31 - ACPI_ACCESS_BYTE_SHIFT)
546-
#define ACPI_ACCESS_BIT_DEFAULT (8 - ACPI_ACCESS_BIT_SHIFT)
547-
#define ACPI_ACCESS_BYTE_DEFAULT (8 - ACPI_ACCESS_BYTE_SHIFT)
548-
#define ACPI_ACCESS_BIT_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BIT_SHIFT))
549-
#define ACPI_ACCESS_BYTE_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BYTE_SHIFT))
542+
#define ACPI_ACCESS_BIT_SHIFT 2
543+
#define ACPI_ACCESS_BYTE_SHIFT -1
544+
#define ACPI_ACCESS_BIT_MAX (31 - ACPI_ACCESS_BIT_SHIFT)
545+
#define ACPI_ACCESS_BYTE_MAX (31 - ACPI_ACCESS_BYTE_SHIFT)
546+
#define ACPI_ACCESS_BIT_DEFAULT (8 - ACPI_ACCESS_BIT_SHIFT)
547+
#define ACPI_ACCESS_BYTE_DEFAULT (8 - ACPI_ACCESS_BYTE_SHIFT)
548+
#define ACPI_ACCESS_BIT_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BIT_SHIFT))
549+
#define ACPI_ACCESS_BYTE_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BYTE_SHIFT))
550550

551551
/*******************************************************************************
552552
*

0 commit comments

Comments
 (0)