These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / input / misc / drv2667.c

diff --git a/kernel/drivers/input/misc/drv2667.c b/kernel/drivers/input/misc/drv2667.c
index fc0fddf..d5ba748 100644 (file)
--- a/kernel/drivers/input/misc/drv2667.c
+++ b/kernel/drivers/input/misc/drv2667.c
@@ -116,7 +116,7 @@ struct drv2667_data {
        u32 frequency;
 };
 
-static struct reg_default drv2667_reg_defs[] = {
+static const struct reg_default drv2667_reg_defs[] = {
        { DRV2667_STATUS, 0x02 },
        { DRV2667_CTRL_1, 0x28 },
        { DRV2667_CTRL_2, 0x40 },
@@ -262,14 +262,14 @@ static void drv2667_close(struct input_dev *input)
                        "Failed to enter standby mode: %d\n", error);
 }
 
-static const struct reg_default drv2667_init_regs[] = {
+static const struct reg_sequence drv2667_init_regs[] = {
        { DRV2667_CTRL_2, 0 },
        { DRV2667_CTRL_1, DRV2667_25_VPP_GAIN },
        { DRV2667_WV_SEQ_0, 1 },
        { DRV2667_WV_SEQ_1, 0 }
 };
 
-static const struct reg_default drv2667_page1_init[] = {
+static const struct reg_sequence drv2667_page1_init[] = {
        { DRV2667_RAM_HDR_SZ, 0x05 },
        { DRV2667_RAM_START_HI, 0x80 },
        { DRV2667_RAM_START_LO, 0x06 },
@@ -484,7 +484,6 @@ static struct i2c_driver drv2667_driver = {
        .probe          = drv2667_probe,
        .driver         = {
                .name   = "drv2667-haptics",
-               .owner  = THIS_MODULE,
                .of_match_table = of_match_ptr(drv2667_of_match),
                .pm     = &drv2667_pm_ops,
        },