iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert a problematic patch that constified something imporperly.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE6gYDF28Li+nEiKLaHwn1ewov5lgFAlqgyYIACgkQHwn1ewov
 5lieCw/7BjbXmRtZeFrhemLCCYXhXEts/CtWY9RvrIHz8ugLUJjGrxOqdAFcR1xw
 EiXyaVVzc/Gp3qNiqTHTUB3q04A8T4aOuhRZ95T0z3MJrz3wxZkJFVepUYs2ffbO
 HbvOxXIz6lni01RmFtb/owv5w7jZcuSjyBYtepKO+e0ktW7Szq1QVD/jTVqCJOj0
 0aPQH7FFEZM8ZANobYoQ6X6zvGDob+KKrv35qZj+pQpeMhAkjQlc5FGwifNSetMq
 TCUUof6MN678v7a4P3uuSDtbYLYIsay1gM32KRNroVavyqk2D+X9xvtbQkVxRc6b
 43wRQdFi69qz8sAoKuerZvrSUo0P740zXlj3qNZVNe1HjdPhPdXnP/z5Ylp2QWRX
 AImtqHd57iMUMz981RhdAIZ2y9P248B9hCxP40xNMImPcJAWdCJlTvLhl1tRg0ta
 sivKuREXOvYMmvEWnbYpj3hJYmfd6R6EQ4xKlexYf35QASMZMQcYm+8+5t5qZhde
 Ew+uhyIR8IlaJgvBrcwevFL3KJMI8OSpjSrNJfBg6rf/vRo3e4Vb1xnciChOWx0p
 Zvwb+nU5WBY/8CnUtCztCz5RxUJ4+IWzK282b9j8BrwrSMEfdMiRq1sgZefirbgT
 T1xpbLtq8VcykTCwBMc0BfexbyvCkekD09MIlHShqrWrobVvbPM=
 =L80Q
 -----END PGP SIGNATURE-----

Merge tag 'chrome-platform-4.16-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform

Pull chrome platform fix from Benson Leung:
 "Revert a problematic patch that constified something imporperly"

* tag 'chrome-platform-4.16-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform:
  Revert "platform/chrome: chromeos_laptop: make chromeos_laptop const"
This commit is contained in:
Linus Torvalds 2018-03-08 10:00:47 -08:00
commit 98577c6aa2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/platform/chrome/chromeos_laptop.c
View File

@ -423,7 +423,7 @@ static int chromeos_laptop_probe(struct platform_device *pdev)
return ret; return ret;
} }
static const struct chromeos_laptop samsung_series_5_550 = { static struct chromeos_laptop samsung_series_5_550 = {
.i2c_peripherals = { .i2c_peripherals = {
/* Touchpad. */ /* Touchpad. */
{ .add = setup_cyapa_tp, I2C_ADAPTER_SMBUS }, { .add = setup_cyapa_tp, I2C_ADAPTER_SMBUS },
@ -432,14 +432,14 @@ static const struct chromeos_laptop samsung_series_5_550 = {
}, },
}; };
static const struct chromeos_laptop samsung_series_5 = { static struct chromeos_laptop samsung_series_5 = {
.i2c_peripherals = { .i2c_peripherals = {
/* Light Sensor. */ /* Light Sensor. */
{ .add = setup_tsl2583_als, I2C_ADAPTER_SMBUS }, { .add = setup_tsl2583_als, I2C_ADAPTER_SMBUS },
}, },
}; };
static const struct chromeos_laptop chromebook_pixel = { static struct chromeos_laptop chromebook_pixel = {
.i2c_peripherals = { .i2c_peripherals = {
/* Touch Screen. */ /* Touch Screen. */
{ .add = setup_atmel_1664s_ts, I2C_ADAPTER_PANEL }, { .add = setup_atmel_1664s_ts, I2C_ADAPTER_PANEL },
@ -450,14 +450,14 @@ static const struct chromeos_laptop chromebook_pixel = {
}, },
}; };
static const struct chromeos_laptop hp_chromebook_14 = { static struct chromeos_laptop hp_chromebook_14 = {
.i2c_peripherals = { .i2c_peripherals = {
/* Touchpad. */ /* Touchpad. */
{ .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 }, { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 },
}, },
}; };
static const struct chromeos_laptop dell_chromebook_11 = { static struct chromeos_laptop dell_chromebook_11 = {
.i2c_peripherals = { .i2c_peripherals = {
/* Touchpad. */ /* Touchpad. */
{ .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 }, { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 },
@ -466,28 +466,28 @@ static const struct chromeos_laptop dell_chromebook_11 = {
}, },
}; };
static const struct chromeos_laptop toshiba_cb35 = { static struct chromeos_laptop toshiba_cb35 = {
.i2c_peripherals = { .i2c_peripherals = {
/* Touchpad. */ /* Touchpad. */
{ .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 }, { .add = setup_cyapa_tp, I2C_ADAPTER_DESIGNWARE_0 },
}, },
}; };
static const struct chromeos_laptop acer_c7_chromebook = { static struct chromeos_laptop acer_c7_chromebook = {
.i2c_peripherals = { .i2c_peripherals = {
/* Touchpad. */ /* Touchpad. */
{ .add = setup_cyapa_tp, I2C_ADAPTER_SMBUS }, { .add = setup_cyapa_tp, I2C_ADAPTER_SMBUS },
}, },
}; };
static const struct chromeos_laptop acer_ac700 = { static struct chromeos_laptop acer_ac700 = {
.i2c_peripherals = { .i2c_peripherals = {
/* Light Sensor. */ /* Light Sensor. */
{ .add = setup_tsl2563_als, I2C_ADAPTER_SMBUS }, { .add = setup_tsl2563_als, I2C_ADAPTER_SMBUS },
}, },
}; };
static const struct chromeos_laptop acer_c720 = { static struct chromeos_laptop acer_c720 = {
.i2c_peripherals = { .i2c_peripherals = {
/* Touchscreen. */ /* Touchscreen. */
{ .add = setup_atmel_1664s_ts, I2C_ADAPTER_DESIGNWARE_1 }, { .add = setup_atmel_1664s_ts, I2C_ADAPTER_DESIGNWARE_1 },
@ -500,14 +500,14 @@ static const struct chromeos_laptop acer_c720 = {
}, },
}; };
static const struct chromeos_laptop hp_pavilion_14_chromebook = { static struct chromeos_laptop hp_pavilion_14_chromebook = {
.i2c_peripherals = { .i2c_peripherals = {
/* Touchpad. */ /* Touchpad. */
{ .add = setup_cyapa_tp, I2C_ADAPTER_SMBUS }, { .add = setup_cyapa_tp, I2C_ADAPTER_SMBUS },
}, },
}; };
static const struct chromeos_laptop cr48 = { static struct chromeos_laptop cr48 = {
.i2c_peripherals = { .i2c_peripherals = {
/* Light Sensor. */ /* Light Sensor. */
{ .add = setup_tsl2563_als, I2C_ADAPTER_SMBUS }, { .add = setup_tsl2563_als, I2C_ADAPTER_SMBUS },