UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ACPI: Fix whitespace inconsistencies 

Replaces spaces with tabs where spaces have been (inconsistently) used
for indentation and removes trailing whitespaces.

Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Maximilian Luz 2020-11-05 03:06:00 +01:00 committed by Rafael J. Wysocki
parent f8394f232b
commit c6237b210d
15 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/acpi/acpi_video.c
View File

@ -578,7 +578,7 @@ acpi_video_bqc_value_to_level(struct acpi_video_device *device,
ACPI_VIDEO_FIRST_LEVEL - 1 - bqc_value; ACPI_VIDEO_FIRST_LEVEL - 1 - bqc_value;
level = device->brightness->levels[bqc_value + level = device->brightness->levels[bqc_value +
ACPI_VIDEO_FIRST_LEVEL]; ACPI_VIDEO_FIRST_LEVEL];
} else { } else {
level = bqc_value; level = bqc_value;
} }
@ -990,8 +990,8 @@ set_level:
goto out_free_levels; goto out_free_levels;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"found %d brightness levels\n", "found %d brightness levels\n",
br->count - ACPI_VIDEO_FIRST_LEVEL)); br->count - ACPI_VIDEO_FIRST_LEVEL));
return 0; return 0;
out_free_levels: out_free_levels:

2
drivers/acpi/battery.c
View File

@ -987,7 +987,7 @@ static int acpi_battery_update(struct acpi_battery *battery, bool resume)
*/ */
if ((battery->state & ACPI_BATTERY_STATE_CRITICAL) || if ((battery->state & ACPI_BATTERY_STATE_CRITICAL) ||
(test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags) && (test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags) &&
(battery->capacity_now <= battery->alarm))) (battery->capacity_now <= battery->alarm)))
acpi_pm_wakeup_event(&battery->device->dev); acpi_pm_wakeup_event(&battery->device->dev);
return result; return result;

2
drivers/acpi/event.c
View File

@ -31,7 +31,7 @@ int acpi_notifier_call_chain(struct acpi_device *dev, u32 type, u32 data)
event.type = type; event.type = type;
event.data = data; event.data = data;
return (blocking_notifier_call_chain(&acpi_chain_head, 0, (void *)&event) return (blocking_notifier_call_chain(&acpi_chain_head, 0, (void *)&event)
== NOTIFY_BAD) ? -EINVAL : 0; == NOTIFY_BAD) ? -EINVAL : 0;
} }
EXPORT_SYMBOL(acpi_notifier_call_chain); EXPORT_SYMBOL(acpi_notifier_call_chain);

2
drivers/acpi/internal.h
View File

@ -134,7 +134,7 @@ int acpi_add_power_resource(acpi_handle handle);
void acpi_power_add_remove_device(struct acpi_device *adev, bool add); void acpi_power_add_remove_device(struct acpi_device *adev, bool add);
int acpi_power_wakeup_list_init(struct list_head *list, int *system_level); int acpi_power_wakeup_list_init(struct list_head *list, int *system_level);
int acpi_device_sleep_wake(struct acpi_device *dev, int acpi_device_sleep_wake(struct acpi_device *dev,
int enable, int sleep_state, int dev_state); int enable, int sleep_state, int dev_state);
int acpi_power_get_inferred_state(struct acpi_device *device, int *state); int acpi_power_get_inferred_state(struct acpi_device *device, int *state);
int acpi_power_on_resources(struct acpi_device *device, int state); int acpi_power_on_resources(struct acpi_device *device, int state);
int acpi_power_transition(struct acpi_device *device, int state); int acpi_power_transition(struct acpi_device *device, int state);

10
drivers/acpi/nfit/core.c
View File

@ -2175,10 +2175,10 @@ static int acpi_nfit_register_dimms(struct acpi_nfit_desc *acpi_desc)
* these commands. * these commands.
*/ */
enum nfit_aux_cmds { enum nfit_aux_cmds {
NFIT_CMD_TRANSLATE_SPA = 5, NFIT_CMD_TRANSLATE_SPA = 5,
NFIT_CMD_ARS_INJECT_SET = 7, NFIT_CMD_ARS_INJECT_SET = 7,
NFIT_CMD_ARS_INJECT_CLEAR = 8, NFIT_CMD_ARS_INJECT_CLEAR = 8,
NFIT_CMD_ARS_INJECT_GET = 9, NFIT_CMD_ARS_INJECT_GET = 9,
}; };
static void acpi_nfit_init_dsms(struct acpi_nfit_desc *acpi_desc) static void acpi_nfit_init_dsms(struct acpi_nfit_desc *acpi_desc)
@ -2632,7 +2632,7 @@ static int acpi_nfit_blk_region_enable(struct nvdimm_bus *nvdimm_bus,
nfit_blk->bdw_offset = nfit_mem->bdw->offset; nfit_blk->bdw_offset = nfit_mem->bdw->offset;
mmio = &nfit_blk->mmio[BDW]; mmio = &nfit_blk->mmio[BDW];
mmio->addr.base = devm_nvdimm_memremap(dev, nfit_mem->spa_bdw->address, mmio->addr.base = devm_nvdimm_memremap(dev, nfit_mem->spa_bdw->address,
nfit_mem->spa_bdw->length, nd_blk_memremap_flags(ndbr)); nfit_mem->spa_bdw->length, nd_blk_memremap_flags(ndbr));
if (!mmio->addr.base) { if (!mmio->addr.base) {
dev_dbg(dev, "%s failed to map bdw\n", dev_dbg(dev, "%s failed to map bdw\n",
nvdimm_name(nvdimm)); nvdimm_name(nvdimm));

2
drivers/acpi/pci_irq.c
View File

@ -175,7 +175,7 @@ static int acpi_pci_irq_check_entry(acpi_handle handle, struct pci_dev *dev,
* configure the IRQ assigned to this slot|dev|pin. The 'source_index' * configure the IRQ assigned to this slot|dev|pin. The 'source_index'
* indicates which resource descriptor in the resource template (of * indicates which resource descriptor in the resource template (of
* the link device) this interrupt is allocated from. * the link device) this interrupt is allocated from.
* *
* NOTE: Don't query the Link Device for IRQ information at this time * NOTE: Don't query the Link Device for IRQ information at this time
* because Link Device enumeration may not have occurred yet * because Link Device enumeration may not have occurred yet
* (e.g. exists somewhere 'below' this _PRT entry in the ACPI * (e.g. exists somewhere 'below' this _PRT entry in the ACPI

12
drivers/acpi/pci_link.c
View File

@ -6,8 +6,8 @@
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com> * Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
* Copyright (C) 2002 Dominik Brodowski <devel@brodo.de> * Copyright (C) 2002 Dominik Brodowski <devel@brodo.de>
* *
* TBD: * TBD:
* 1. Support more than one IRQ resource entry per link device (index). * 1. Support more than one IRQ resource entry per link device (index).
* 2. Implement start/stop mechanism and use ACPI Bus Driver facilities * 2. Implement start/stop mechanism and use ACPI Bus Driver facilities
* for IRQ management (e.g. start()->_SRS). * for IRQ management (e.g. start()->_SRS).
*/ */
@ -249,8 +249,8 @@ static int acpi_pci_link_get_current(struct acpi_pci_link *link)
} }
} }
/* /*
* Query and parse _CRS to get the current IRQ assignment. * Query and parse _CRS to get the current IRQ assignment.
*/ */
status = acpi_walk_resources(link->device->handle, METHOD_NAME__CRS, status = acpi_walk_resources(link->device->handle, METHOD_NAME__CRS,
@ -396,7 +396,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
/* /*
* "acpi_irq_balance" (default in APIC mode) enables ACPI to use PIC Interrupt * "acpi_irq_balance" (default in APIC mode) enables ACPI to use PIC Interrupt
* Link Devices to move the PIRQs around to minimize sharing. * Link Devices to move the PIRQs around to minimize sharing.
* *
* "acpi_irq_nobalance" (default in PIC mode) tells ACPI not to move any PIC IRQs * "acpi_irq_nobalance" (default in PIC mode) tells ACPI not to move any PIC IRQs
* that the BIOS has already set to active. This is necessary because * that the BIOS has already set to active. This is necessary because
* ACPI has no automatic means of knowing what ISA IRQs are used. Note that * ACPI has no automatic means of knowing what ISA IRQs are used. Note that
@ -414,7 +414,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
* *
* Note that PCI IRQ routers have a list of possible IRQs, * Note that PCI IRQ routers have a list of possible IRQs,
* which may not include the IRQs this table says are available. * which may not include the IRQs this table says are available.
* *
* Since this heuristic can't tell the difference between a link * Since this heuristic can't tell the difference between a link
* that no device will attach to, vs. a link which may be shared * that no device will attach to, vs. a link which may be shared
* by multiple active devices -- it is not optimal. * by multiple active devices -- it is not optimal.

2
drivers/acpi/pci_mcfg.c
View File

@ -173,7 +173,7 @@ static int pci_mcfg_quirk_matches(struct mcfg_fixup *f, u16 segment,
{ {
if (!memcmp(f->oem_id, mcfg_oem_id, ACPI_OEM_ID_SIZE) && if (!memcmp(f->oem_id, mcfg_oem_id, ACPI_OEM_ID_SIZE) &&
!memcmp(f->oem_table_id, mcfg_oem_table_id, !memcmp(f->oem_table_id, mcfg_oem_table_id,
ACPI_OEM_TABLE_ID_SIZE) && ACPI_OEM_TABLE_ID_SIZE) &&
f->oem_revision == mcfg_oem_revision && f->oem_revision == mcfg_oem_revision &&
f->segment == segment && f->segment == segment &&
resource_contains(&f->bus_range, bus_range)) resource_contains(&f->bus_range, bus_range))

6
drivers/acpi/power.c
View File

@ -13,7 +13,7 @@
* 1. via "Device Specific (D-State) Control" * 1. via "Device Specific (D-State) Control"
* 2. via "Power Resource Control". * 2. via "Power Resource Control".
* The code below deals with ACPI Power Resources control. * The code below deals with ACPI Power Resources control.
* *
* An ACPI "power resource object" represents a software controllable power * An ACPI "power resource object" represents a software controllable power
* plane, clock plane, or other resource depended on by a device. * plane, clock plane, or other resource depended on by a device.
* *
@ -645,7 +645,7 @@ int acpi_power_wakeup_list_init(struct list_head *list, int *system_level_p)
* -ENODEV if the execution of either _DSW or _PSW has failed * -ENODEV if the execution of either _DSW or _PSW has failed
*/ */
int acpi_device_sleep_wake(struct acpi_device *dev, int acpi_device_sleep_wake(struct acpi_device *dev,
int enable, int sleep_state, int dev_state) int enable, int sleep_state, int dev_state)
{ {
union acpi_object in_arg[3]; union acpi_object in_arg[3];
struct acpi_object_list arg_list = { 3, in_arg }; struct acpi_object_list arg_list = { 3, in_arg };
@ -690,7 +690,7 @@ int acpi_device_sleep_wake(struct acpi_device *dev,
/* /*
* Prepare a wakeup device, two steps (Ref ACPI 2.0:P229): * Prepare a wakeup device, two steps (Ref ACPI 2.0:P229):
* 1. Power on the power resources required for the wakeup device * 1. Power on the power resources required for the wakeup device
* 2. Execute _DSW (Device Sleep Wake) or (deprecated in ACPI 3.0) _PSW (Power * 2. Execute _DSW (Device Sleep Wake) or (deprecated in ACPI 3.0) _PSW (Power
* State Wake) for the device, if present * State Wake) for the device, if present
*/ */

6
drivers/acpi/processor_perflib.c
View File

@ -354,7 +354,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
(u32) px->control, (u32) px->status)); (u32) px->control, (u32) px->status));
/* /*
* Check that ACPI's u64 MHz will be valid as u32 KHz in cpufreq * Check that ACPI's u64 MHz will be valid as u32 KHz in cpufreq
*/ */
if (!px->core_frequency || if (!px->core_frequency ||
((u32)(px->core_frequency * 1000) != ((u32)(px->core_frequency * 1000) !=
@ -627,7 +627,7 @@ int acpi_processor_preregister_performance(
goto err_ret; goto err_ret;
/* /*
* Now that we have _PSD data from all CPUs, lets setup P-state * Now that we have _PSD data from all CPUs, lets setup P-state
* domain info. * domain info.
*/ */
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
@ -693,7 +693,7 @@ int acpi_processor_preregister_performance(
if (match_pdomain->domain != pdomain->domain) if (match_pdomain->domain != pdomain->domain)
continue; continue;
match_pr->performance->shared_type = match_pr->performance->shared_type =
pr->performance->shared_type; pr->performance->shared_type;
cpumask_copy(match_pr->performance->shared_cpu_map, cpumask_copy(match_pr->performance->shared_cpu_map,
pr->performance->shared_cpu_map); pr->performance->shared_cpu_map);

2
drivers/acpi/sbs.c
View File

@ -366,7 +366,7 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
state_readers[i].mode, state_readers[i].mode,
ACPI_SBS_BATTERY, ACPI_SBS_BATTERY,
state_readers[i].command, state_readers[i].command,
(u8 *)battery + (u8 *)battery +
state_readers[i].offset); state_readers[i].offset);
if (result) if (result)
goto end; goto end;

2
drivers/acpi/sbshc.c
View File

@ -176,7 +176,7 @@ int acpi_smbus_write(struct acpi_smb_hc *hc, u8 protocol, u8 address,
EXPORT_SYMBOL_GPL(acpi_smbus_write); EXPORT_SYMBOL_GPL(acpi_smbus_write);
int acpi_smbus_register_callback(struct acpi_smb_hc *hc, int acpi_smbus_register_callback(struct acpi_smb_hc *hc,
smbus_alarm_callback callback, void *context) smbus_alarm_callback callback, void *context)
{ {
mutex_lock(&hc->lock); mutex_lock(&hc->lock);
hc->callback = callback; hc->callback = callback;

6
drivers/acpi/sbshc.h
View File

@ -24,9 +24,9 @@ enum acpi_sbs_device_addr {
typedef void (*smbus_alarm_callback)(void *context); typedef void (*smbus_alarm_callback)(void *context);
extern int acpi_smbus_read(struct acpi_smb_hc *hc, u8 protocol, u8 address, extern int acpi_smbus_read(struct acpi_smb_hc *hc, u8 protocol, u8 address,
u8 command, u8 * data); u8 command, u8 *data);
extern int acpi_smbus_write(struct acpi_smb_hc *hc, u8 protocol, u8 slave_address, extern int acpi_smbus_write(struct acpi_smb_hc *hc, u8 protocol, u8 slave_address,
u8 command, u8 * data, u8 length); u8 command, u8 *data, u8 length);
extern int acpi_smbus_register_callback(struct acpi_smb_hc *hc, extern int acpi_smbus_register_callback(struct acpi_smb_hc *hc,
smbus_alarm_callback callback, void *context); smbus_alarm_callback callback, void *context);
extern int acpi_smbus_unregister_callback(struct acpi_smb_hc *hc); extern int acpi_smbus_unregister_callback(struct acpi_smb_hc *hc);

16
drivers/acpi/video_detect.c
View File

@ -178,14 +178,14 @@ static const struct dmi_system_id video_detect_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201s"), DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201s"),
}, },
}, },
{ {
.callback = video_detect_force_video, .callback = video_detect_force_video,
.ident = "ThinkPad X201T", .ident = "ThinkPad X201T",
.matches = { .matches = {
DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201T"), DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201T"),
}, },
}, },
/* The native backlight controls do not work on some older machines */ /* The native backlight controls do not work on some older machines */
{ {

4
drivers/acpi/wakeup.c
View File

@ -44,7 +44,7 @@ void acpi_enable_wakeup_devices(u8 sleep_state)
if (!dev->wakeup.flags.valid if (!dev->wakeup.flags.valid
|| sleep_state > (u32) dev->wakeup.sleep_state || sleep_state > (u32) dev->wakeup.sleep_state
|| !(device_may_wakeup(&dev->dev) || !(device_may_wakeup(&dev->dev)
|| dev->wakeup.prepare_count)) || dev->wakeup.prepare_count))
continue; continue;
if (device_may_wakeup(&dev->dev)) if (device_may_wakeup(&dev->dev))
@ -69,7 +69,7 @@ void acpi_disable_wakeup_devices(u8 sleep_state)
if (!dev->wakeup.flags.valid if (!dev->wakeup.flags.valid
|| sleep_state > (u32) dev->wakeup.sleep_state || sleep_state > (u32) dev->wakeup.sleep_state
|| !(device_may_wakeup(&dev->dev) || !(device_may_wakeup(&dev->dev)
|| dev->wakeup.prepare_count)) || dev->wakeup.prepare_count))
continue; continue;
acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number, acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number,