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

ACPI / PM: Drop pm_message_t argument from device suspend callback 



None of the drivers implementing the ACPI device suspend callback
uses the pm_message_t argument of it, so this argument may be dropped
entirely from that callback.  This will simplify switching the ACPI
bus type to PM handling based on struct dev_pm_ops.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 6887a413

drivers/acpi/fan.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ MODULE_LICENSE("GPL"); 


static int acpi_fan_add(struct acpi_device *device);

static int acpi_fan_remove(struct acpi_device *device, int type);

static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state);

static int acpi_fan_suspend(struct acpi_device *device);

static int acpi_fan_resume(struct acpi_device *device);



static const struct acpi_device_id fan_device_ids[] = {
@@ -183,7 +183,7 @@ static int acpi_fan_remove(struct acpi_device *device, int type) 
	return 0;

}



static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state)

static int acpi_fan_suspend(struct acpi_device *device)

{

	if (!device)

		return -EINVAL;

drivers/acpi/processor_idle.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static void acpi_idle_bm_rld_restore(void) 
		acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, saved_bm_rld);

}



int acpi_processor_suspend(struct acpi_device * device, pm_message_t state)

int acpi_processor_suspend(struct acpi_device * device)

{

	if (acpi_idle_suspend == 1)

		return 0;

drivers/acpi/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static int acpi_device_suspend(struct device *dev, pm_message_t state) 
	struct acpi_driver *acpi_drv = acpi_dev->driver;



	if (acpi_drv && acpi_drv->ops.suspend)

		return acpi_drv->ops.suspend(acpi_dev, state);

		return acpi_drv->ops.suspend(acpi_dev);

	return 0;

}

drivers/platform/x86/hp_accel.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ static int lis3lv02d_remove(struct acpi_device *device, int type) 




#ifdef CONFIG_PM

static int lis3lv02d_suspend(struct acpi_device *device, pm_message_t state)

static int lis3lv02d_suspend(struct acpi_device *device)

{

	/* make sure the device is off when we suspend */

	lis3lv02d_poweroff(&lis3_dev);

drivers/platform/x86/sony-laptop.c

+1 −1
Original line number Diff line number Diff line
@@ -4243,7 +4243,7 @@ static int sony_pic_add(struct acpi_device *device) 
	return result;

}



static int sony_pic_suspend(struct acpi_device *device, pm_message_t state)

static int sony_pic_suspend(struct acpi_device *device)

{

	if (sony_pic_disable(device))

		return -ENXIO;