Commit b6237f61 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-misc' 

* acpi-misc:
  ACPI: dock: fix some coding style issues
  ACPI: sysfs: fix some coding style issues
  ACPI: PM: add a missed blank line after declarations
  ACPI: custom_method: fix a coding style issue
  ACPI: CPPC: fix some coding style issues
  ACPI: button: fix some coding style issues
  ACPI: battery: fix some coding style issues
  ACPI: acpi_pad: add a missed blank line after declarations
  ACPI: LPSS: add a missed blank line after declarations
  ACPI: ipmi: remove useless return statement for void function
  ACPI: processor: fix some coding style issues
  ACPI: APD: fix a block comment align issue
  ACPI: AC: fix some coding style issues
  ACPI: fix various typos in comments
parents aad659e4 6ee4bdc2

drivers/acpi/ac.c

+9 −21
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 *  acpi_ac.c - ACPI AC Adapter Driver ($Revision: 27 $)

 *  acpi_ac.c - ACPI AC Adapter Driver (Revision: 27)

 *

 *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>

 *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -85,10 +85,7 @@ struct acpi_ac { 


#define to_acpi_ac(x) power_supply_get_drvdata(x)



/* --------------------------------------------------------------------------

                               AC Adapter Management

   -------------------------------------------------------------------------- */



/* AC Adapter Management */

static int acpi_ac_get_state(struct acpi_ac *ac)

{

	acpi_status status = AE_OK;
@@ -109,9 +106,7 @@ static int acpi_ac_get_state(struct acpi_ac *ac) 
	return 0;

}



/* --------------------------------------------------------------------------

                            sysfs I/F

   -------------------------------------------------------------------------- */

/* sysfs I/F */

static int get_ac_property(struct power_supply *psy,

			   enum power_supply_property psp,

			   union power_supply_propval *val)
@@ -138,10 +133,7 @@ static enum power_supply_property ac_props[] = { 
	POWER_SUPPLY_PROP_ONLINE,

};



/* --------------------------------------------------------------------------

                                   Driver Model

   -------------------------------------------------------------------------- */



/* Driver Model */

static void acpi_ac_notify(struct acpi_device *device, u32 event)

{

	struct acpi_ac *ac = acpi_driver_data(device);
@@ -174,8 +166,6 @@ static void acpi_ac_notify(struct acpi_device *device, u32 event) 
		acpi_notifier_call_chain(device, event, (u32) ac->state);

		kobject_uevent(&ac->charger->dev.kobj, KOBJ_CHANGE);

	}



	return;

}



static int acpi_ac_battery_notify(struct notifier_block *nb,
@@ -187,7 +177,7 @@ static int acpi_ac_battery_notify(struct notifier_block *nb, 
	/*

	 * On HP Pavilion dv6-6179er AC status notifications aren't triggered

	 * when adapter is plugged/unplugged. However, battery status

	 * notifcations are triggered when battery starts charging or

	 * notifications are triggered when battery starts charging or

	 * discharging. Re-reading AC status triggers lost AC notifications,

	 * if AC status has changed.

	 */
@@ -282,9 +272,8 @@ static int acpi_ac_add(struct acpi_device *device) 
	ac->battery_nb.notifier_call = acpi_ac_battery_notify;

	register_acpi_notifier(&ac->battery_nb);

end:

	if (result) {

	if (result)

		kfree(ac);

	}



	return result;

}
@@ -293,7 +282,7 @@ static int acpi_ac_add(struct acpi_device *device) 
static int acpi_ac_resume(struct device *dev)

{

	struct acpi_ac *ac;

	unsigned old_state;

	unsigned int old_state;



	if (!dev)

		return -EINVAL;
@@ -352,9 +341,8 @@ static int __init acpi_ac_init(void) 
	}



	result = acpi_bus_register_driver(&acpi_ac_driver);

	if (result < 0) {

	if (result < 0)

		return -ENODEV;

	}



	return 0;

}

drivers/acpi/acpi_apd.c

+4 −4
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static const struct apd_device_desc hip08_spi_desc = { 


#endif



/**

/*

 * Create platform device during acpi scan attach handle.

 * Return value > 0 on success of creating device.

 */

drivers/acpi/acpi_ipmi.c

+0 −1
Original line number Diff line number Diff line
@@ -478,7 +478,6 @@ static void ipmi_register_bmc(int iface, struct device *dev) 
	ipmi_dev_release(ipmi_device);

err_ref:

	put_device(smi_data.dev);

	return;

}



static void ipmi_bmc_gone(int iface)

drivers/acpi/acpi_lpss.c

+2 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = { 
static int is_memory(struct acpi_resource *res, void *not_used)

{

	struct resource r;



	return !acpi_dev_resource_memory(res, &r);

}
@@ -1200,6 +1201,7 @@ static int acpi_lpss_poweroff_noirq(struct device *dev) 
	if (pdata->dev_desc->resume_from_noirq) {

		/* This is analogous to the acpi_lpss_suspend_noirq() case. */

		int ret = acpi_lpss_do_poweroff_late(dev);



		if (ret)

			return ret;

	}

drivers/acpi/acpi_pad.c

+4 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ static void round_robin_cpu(unsigned int tsk_index) 
static void exit_round_robin(unsigned int tsk_index)

{

	struct cpumask *pad_busy_cpus = to_cpumask(pad_busy_cpus_bits);



	cpumask_clear_cpu(tsk_in_cpu[tsk_index], pad_busy_cpus);

	tsk_in_cpu[tsk_index] = -1;

}
@@ -265,6 +266,7 @@ static ssize_t rrtime_store(struct device *dev, 
	struct device_attribute *attr, const char *buf, size_t count)

{

	unsigned long num;



	if (kstrtoul(buf, 0, &num))

		return -EINVAL;

	if (num < 1 || num >= 100)
@@ -286,6 +288,7 @@ static ssize_t idlepct_store(struct device *dev, 
	struct device_attribute *attr, const char *buf, size_t count)

{

	unsigned long num;



	if (kstrtoul(buf, 0, &num))

		return -EINVAL;

	if (num < 1 || num >= 100)
@@ -307,6 +310,7 @@ static ssize_t idlecpus_store(struct device *dev, 
	struct device_attribute *attr, const char *buf, size_t count)

{

	unsigned long num;



	if (kstrtoul(buf, 0, &num))

		return -EINVAL;

	mutex_lock(&isolated_cpus_lock);