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

Merge branches 'acpi-ac', 'acpi-soc' and 'acpi-assorted' 

* acpi-ac:
  ACPI / AC: constify DMI system id table

* acpi-soc:
  ACPI / LPSS: constify device descriptors

* acpi-assorted:
  ACPI / HED: constify ACPI device ids
parents feabe392 44f610cd b2687cd7 69cda6e0

drivers/acpi/ac.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static int thinkpad_e530_quirk(const struct dmi_system_id *d) 
	return 0;

}



static struct dmi_system_id ac_dmi_table[] = {

static const struct dmi_system_id ac_dmi_table[] = {

	{

	.callback = thinkpad_e530_quirk,

	.ident = "thinkpad e530",

drivers/acpi/acpi_lpss.c

+11 −11
Original line number Diff line number Diff line
@@ -129,50 +129,50 @@ static void byt_i2c_setup(struct lpss_private_data *pdata) 
	writel(0, pdata->mmio_base + LPSS_I2C_ENABLE);

}



static struct lpss_device_desc lpt_dev_desc = {

static const struct lpss_device_desc lpt_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR,

	.prv_offset = 0x800,

};



static struct lpss_device_desc lpt_i2c_dev_desc = {

static const struct lpss_device_desc lpt_i2c_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_LTR,

	.prv_offset = 0x800,

};



static struct lpss_device_desc lpt_uart_dev_desc = {

static const struct lpss_device_desc lpt_uart_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR,

	.clk_con_id = "baudclk",

	.prv_offset = 0x800,

	.setup = lpss_uart_setup,

};



static struct lpss_device_desc lpt_sdio_dev_desc = {

static const struct lpss_device_desc lpt_sdio_dev_desc = {

	.flags = LPSS_LTR,

	.prv_offset = 0x1000,

	.prv_size_override = 0x1018,

};



static struct lpss_device_desc byt_pwm_dev_desc = {

static const struct lpss_device_desc byt_pwm_dev_desc = {

	.flags = LPSS_SAVE_CTX,

};



static struct lpss_device_desc byt_uart_dev_desc = {

static const struct lpss_device_desc byt_uart_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX,

	.clk_con_id = "baudclk",

	.prv_offset = 0x800,

	.setup = lpss_uart_setup,

};



static struct lpss_device_desc byt_spi_dev_desc = {

static const struct lpss_device_desc byt_spi_dev_desc = {

	.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX,

	.prv_offset = 0x400,

};



static struct lpss_device_desc byt_sdio_dev_desc = {

static const struct lpss_device_desc byt_sdio_dev_desc = {

	.flags = LPSS_CLK,

};



static struct lpss_device_desc byt_i2c_dev_desc = {

static const struct lpss_device_desc byt_i2c_dev_desc = {

	.flags = LPSS_CLK | LPSS_SAVE_CTX,

	.prv_offset = 0x800,

	.setup = byt_i2c_setup,
@@ -323,14 +323,14 @@ static int register_device_clock(struct acpi_device *adev, 
static int acpi_lpss_create_device(struct acpi_device *adev,

				   const struct acpi_device_id *id)

{

	struct lpss_device_desc *dev_desc;

	const struct lpss_device_desc *dev_desc;

	struct lpss_private_data *pdata;

	struct resource_entry *rentry;

	struct list_head resource_list;

	struct platform_device *pdev;

	int ret;



	dev_desc = (struct lpss_device_desc *)id->driver_data;

	dev_desc = (const struct lpss_device_desc *)id->driver_data;

	if (!dev_desc) {

		pdev = acpi_create_platform_device(adev);

		return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1;

drivers/acpi/hed.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/acpi.h>

#include <acpi/hed.h>



static struct acpi_device_id acpi_hed_ids[] = {

static const struct acpi_device_id acpi_hed_ids[] = {

	{"PNP0C33", 0},

	{"", 0},

};