Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert "platform/chrome: chromeos_laptop: make chromeos_laptop const"

This reverts commit a376cd91606365609d8fbd57247618bd51da1fc6 because
chromeos_laptop instances should not be marked as "const" (at this
time), since i2c_peripheral is being modified (we change "state" and
"tries") when we instantiate devices.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Benson Leung <bleung@chromium.org>

authored by

Dmitry Torokhov and committed by
Benson Leung
fc88bbda 661e50bc

+11 -11
+11 -11
drivers/platform/chrome/chromeos_laptop.c
··· 423 423 return ret; 424 424 } 425 425 426 - static const struct chromeos_laptop samsung_series_5_550 = { 426 + static struct chromeos_laptop samsung_series_5_550 = { 427 427 .i2c_peripherals = { 428 428 /* Touchpad. */ 429 429 { .add = setup_cyapa_tp, I2C_ADAPTER_SMBUS }, ··· 432 432 }, 433 433 }; 434 434 435 - static const struct chromeos_laptop samsung_series_5 = { 435 + static struct chromeos_laptop samsung_series_5 = { 436 436 .i2c_peripherals = { 437 437 /* Light Sensor. */ 438 438 { .add = setup_tsl2583_als, I2C_ADAPTER_SMBUS }, 439 439 }, 440 440 }; 441 441 442 - static const struct chromeos_laptop chromebook_pixel = { 442 + static struct chromeos_laptop chromebook_pixel = { 443 443 .i2c_peripherals = { 444 444 /* Touch Screen. */ 445 445 { .add = setup_atmel_1664s_ts, I2C_ADAPTER_PANEL }, ··· 450 450 }, 451 451 }; 452 452 453 - static const struct chromeos_laptop hp_chromebook_14 = { 453 + static struct chromeos_laptop hp_chromebook_14 = { 454 454 .i2c_peripherals = { 455 455 /* Touchpad. */ 456 456 { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 }, 457 457 }, 458 458 }; 459 459 460 - static const struct chromeos_laptop dell_chromebook_11 = { 460 + static struct chromeos_laptop dell_chromebook_11 = { 461 461 .i2c_peripherals = { 462 462 /* Touchpad. */ 463 463 { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 }, ··· 466 466 }, 467 467 }; 468 468 469 - static const struct chromeos_laptop toshiba_cb35 = { 469 + static struct chromeos_laptop toshiba_cb35 = { 470 470 .i2c_peripherals = { 471 471 /* Touchpad. */ 472 472 { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 }, 473 473 }, 474 474 }; 475 475 476 - static const struct chromeos_laptop acer_c7_chromebook = { 476 + static struct chromeos_laptop acer_c7_chromebook = { 477 477 .i2c_peripherals = { 478 478 /* Touchpad. */ 479 479 { .add = setup_cyapa_tp, I2C_ADAPTER_SMBUS }, 480 480 }, 481 481 }; 482 482 483 - static const struct chromeos_laptop acer_ac700 = { 483 + static struct chromeos_laptop acer_ac700 = { 484 484 .i2c_peripherals = { 485 485 /* Light Sensor. */ 486 486 { .add = setup_tsl2563_als, I2C_ADAPTER_SMBUS }, 487 487 }, 488 488 }; 489 489 490 - static const struct chromeos_laptop acer_c720 = { 490 + static struct chromeos_laptop acer_c720 = { 491 491 .i2c_peripherals = { 492 492 /* Touchscreen. */ 493 493 { .add = setup_atmel_1664s_ts, I2C_ADAPTER_DESIGNWARE_1 }, ··· 500 500 }, 501 501 }; 502 502 503 - static const struct chromeos_laptop hp_pavilion_14_chromebook = { 503 + static struct chromeos_laptop hp_pavilion_14_chromebook = { 504 504 .i2c_peripherals = { 505 505 /* Touchpad. */ 506 506 { .add = setup_cyapa_tp, I2C_ADAPTER_SMBUS }, 507 507 }, 508 508 }; 509 509 510 - static const struct chromeos_laptop cr48 = { 510 + static struct chromeos_laptop cr48 = { 511 511 .i2c_peripherals = { 512 512 /* Light Sensor. */ 513 513 { .add = setup_tsl2563_als, I2C_ADAPTER_SMBUS },