ACPI / LPSS: constify device descriptors
The device descriptors are never written to -- even pointed to as 'const' from struct lpss_private_data. Make them r/o for real. Signed-off-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
0f57d86787
commit
b2687cd7d5
1 changed files with 11 additions and 11 deletions
|
@ -129,50 +129,50 @@ static void byt_i2c_setup(struct lpss_private_data *pdata)
|
||||||
writel(0, pdata->mmio_base + LPSS_I2C_ENABLE);
|
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,
|
.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR,
|
||||||
.prv_offset = 0x800,
|
.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,
|
.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_LTR,
|
||||||
.prv_offset = 0x800,
|
.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,
|
.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_LTR,
|
||||||
.clk_con_id = "baudclk",
|
.clk_con_id = "baudclk",
|
||||||
.prv_offset = 0x800,
|
.prv_offset = 0x800,
|
||||||
.setup = lpss_uart_setup,
|
.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,
|
.flags = LPSS_LTR,
|
||||||
.prv_offset = 0x1000,
|
.prv_offset = 0x1000,
|
||||||
.prv_size_override = 0x1018,
|
.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,
|
.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,
|
.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX,
|
||||||
.clk_con_id = "baudclk",
|
.clk_con_id = "baudclk",
|
||||||
.prv_offset = 0x800,
|
.prv_offset = 0x800,
|
||||||
.setup = lpss_uart_setup,
|
.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,
|
.flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_CLK_DIVIDER | LPSS_SAVE_CTX,
|
||||||
.prv_offset = 0x400,
|
.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,
|
.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,
|
.flags = LPSS_CLK | LPSS_SAVE_CTX,
|
||||||
.prv_offset = 0x800,
|
.prv_offset = 0x800,
|
||||||
.setup = byt_i2c_setup,
|
.setup = byt_i2c_setup,
|
||||||
|
@ -323,14 +323,14 @@ out:
|
||||||
static int acpi_lpss_create_device(struct acpi_device *adev,
|
static int acpi_lpss_create_device(struct acpi_device *adev,
|
||||||
const struct acpi_device_id *id)
|
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 lpss_private_data *pdata;
|
||||||
struct resource_entry *rentry;
|
struct resource_entry *rentry;
|
||||||
struct list_head resource_list;
|
struct list_head resource_list;
|
||||||
struct platform_device *pdev;
|
struct platform_device *pdev;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
dev_desc = (struct lpss_device_desc *)id->driver_data;
|
dev_desc = (const struct lpss_device_desc *)id->driver_data;
|
||||||
if (!dev_desc) {
|
if (!dev_desc) {
|
||||||
pdev = acpi_create_platform_device(adev);
|
pdev = acpi_create_platform_device(adev);
|
||||||
return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1;
|
return IS_ERR_OR_NULL(pdev) ? PTR_ERR(pdev) : 1;
|
||||||
|
|
Loading…
Reference in a new issue