diff options
18 files changed, 249 insertions, 484 deletions
diff --git a/KERNEL_VERSION b/KERNEL_VERSION index 7af26b9ba2c03..480d692a63fa6 100644 --- a/KERNEL_VERSION +++ b/KERNEL_VERSION @@ -1 +1 @@ -4.14.73 +4.14.75 diff --git a/patches/0130-iio-adc-drop-assign-iio_info.driver_module-and-iio_t.patch b/patches/0130-iio-adc-drop-assign-iio_info.driver_module-and-iio_t.patch index 6b85867c32b83..7aea943c47415 100644 --- a/patches/0130-iio-adc-drop-assign-iio_info.driver_module-and-iio_t.patch +++ b/patches/0130-iio-adc-drop-assign-iio_info.driver_module-and-iio_t.patch @@ -14,86 +14,84 @@ Reviewed-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/iio/adc/ad7266.c | 1 - - drivers/iio/adc/ad7291.c | 1 - - drivers/iio/adc/ad7298.c | 1 - - drivers/iio/adc/ad7476.c | 1 - - drivers/iio/adc/ad7766.c | 2 -- - drivers/iio/adc/ad7791.c | 2 -- - drivers/iio/adc/ad7793.c | 2 -- - drivers/iio/adc/ad7887.c | 1 - - drivers/iio/adc/ad7923.c | 1 - - drivers/iio/adc/ad799x.c | 3 --- - drivers/iio/adc/ad_sigma_delta.c | 1 - - drivers/iio/adc/aspeed_adc.c | 1 - - drivers/iio/adc/at91-sama5d2_adc.c | 2 -- - drivers/iio/adc/at91_adc.c | 2 -- - drivers/iio/adc/axp20x_adc.c | 2 -- - drivers/iio/adc/axp288_adc.c | 1 - - drivers/iio/adc/bcm_iproc_adc.c | 1 - - drivers/iio/adc/berlin2-adc.c | 1 - - drivers/iio/adc/cc10001_adc.c | 1 - - drivers/iio/adc/cpcap-adc.c | 1 - - drivers/iio/adc/da9150-gpadc.c | 1 - - drivers/iio/adc/dln2-adc.c | 6 ------ - drivers/iio/adc/envelope-detector.c | 1 - - drivers/iio/adc/exynos_adc.c | 1 - - drivers/iio/adc/hi8435.c | 1 - - drivers/iio/adc/hx711.c | 1 - - drivers/iio/adc/imx7d_adc.c | 1 - - drivers/iio/adc/ina2xx-adc.c | 2 -- - drivers/iio/adc/lp8788_adc.c | 1 - - drivers/iio/adc/lpc18xx_adc.c | 1 - - drivers/iio/adc/lpc32xx_adc.c | 1 - - drivers/iio/adc/ltc2471.c | 1 - - drivers/iio/adc/ltc2485.c | 1 - - drivers/iio/adc/ltc2497.c | 1 - - drivers/iio/adc/max1027.c | 2 -- - drivers/iio/adc/max11100.c | 1 - - drivers/iio/adc/max1118.c | 1 - - drivers/iio/adc/max1363.c | 2 -- - drivers/iio/adc/max9611.c | 1 - - drivers/iio/adc/mcp320x.c | 1 - - drivers/iio/adc/mcp3422.c | 1 - - drivers/iio/adc/men_z188_adc.c | 1 - - drivers/iio/adc/meson_saradc.c | 1 - - drivers/iio/adc/mt6577_auxadc.c | 1 - - drivers/iio/adc/mxs-lradc-adc.c | 2 -- - drivers/iio/adc/nau7802.c | 1 - - drivers/iio/adc/palmas_gpadc.c | 1 - - drivers/iio/adc/qcom-pm8xxx-xoadc.c | 1 - - drivers/iio/adc/qcom-spmi-iadc.c | 1 - - drivers/iio/adc/qcom-spmi-vadc.c | 1 - - drivers/iio/adc/rcar-gyroadc.c | 1 - - drivers/iio/adc/rockchip_saradc.c | 1 - - drivers/iio/adc/spear_adc.c | 1 - - drivers/iio/adc/stm32-adc.c | 1 - - drivers/iio/adc/stx104.c | 1 - - drivers/iio/adc/sun4i-gpadc-iio.c | 1 - - drivers/iio/adc/ti-adc081c.c | 1 - - drivers/iio/adc/ti-adc0832.c | 1 - - drivers/iio/adc/ti-adc084s021.c | 1 - - drivers/iio/adc/ti-adc108s102.c | 1 - - drivers/iio/adc/ti-adc12138.c | 1 - - drivers/iio/adc/ti-adc128s052.c | 1 - - drivers/iio/adc/ti-adc161s626.c | 1 - - drivers/iio/adc/ti-ads1015.c | 2 -- - drivers/iio/adc/ti-ads7950.c | 1 - - drivers/iio/adc/ti-ads8688.c | 1 - - drivers/iio/adc/ti-tlc4541.c | 1 - - drivers/iio/adc/ti_am335x_adc.c | 1 - - drivers/iio/adc/twl4030-madc.c | 1 - - drivers/iio/adc/twl6030-gpadc.c | 1 - - drivers/iio/adc/vf610_adc.c | 1 - - drivers/iio/adc/viperboard_adc.c | 1 - - drivers/iio/adc/xilinx-xadc-core.c | 2 -- + drivers/iio/adc/ad7266.c | 1 - + drivers/iio/adc/ad7291.c | 1 - + drivers/iio/adc/ad7298.c | 1 - + drivers/iio/adc/ad7476.c | 1 - + drivers/iio/adc/ad7766.c | 2 -- + drivers/iio/adc/ad7791.c | 2 -- + drivers/iio/adc/ad7793.c | 2 -- + drivers/iio/adc/ad7887.c | 1 - + drivers/iio/adc/ad7923.c | 1 - + drivers/iio/adc/ad799x.c | 3 --- + drivers/iio/adc/ad_sigma_delta.c | 1 - + drivers/iio/adc/aspeed_adc.c | 1 - + drivers/iio/adc/at91-sama5d2_adc.c | 2 -- + drivers/iio/adc/at91_adc.c | 2 -- + drivers/iio/adc/axp20x_adc.c | 2 -- + drivers/iio/adc/axp288_adc.c | 1 - + drivers/iio/adc/bcm_iproc_adc.c | 1 - + drivers/iio/adc/berlin2-adc.c | 1 - + drivers/iio/adc/cc10001_adc.c | 1 - + drivers/iio/adc/cpcap-adc.c | 1 - + drivers/iio/adc/da9150-gpadc.c | 1 - + drivers/iio/adc/dln2-adc.c | 6 ------ + drivers/iio/adc/envelope-detector.c | 1 - + drivers/iio/adc/exynos_adc.c | 1 - + drivers/iio/adc/hi8435.c | 1 - + drivers/iio/adc/hx711.c | 1 - + drivers/iio/adc/imx7d_adc.c | 1 - + drivers/iio/adc/ina2xx-adc.c | 2 -- + drivers/iio/adc/lp8788_adc.c | 1 - + drivers/iio/adc/lpc18xx_adc.c | 1 - + drivers/iio/adc/lpc32xx_adc.c | 1 - + drivers/iio/adc/ltc2471.c | 1 - + drivers/iio/adc/ltc2485.c | 1 - + drivers/iio/adc/ltc2497.c | 1 - + drivers/iio/adc/max1027.c | 2 -- + drivers/iio/adc/max11100.c | 1 - + drivers/iio/adc/max1118.c | 1 - + drivers/iio/adc/max1363.c | 2 -- + drivers/iio/adc/max9611.c | 1 - + drivers/iio/adc/mcp320x.c | 1 - + drivers/iio/adc/mcp3422.c | 1 - + drivers/iio/adc/men_z188_adc.c | 1 - + drivers/iio/adc/meson_saradc.c | 1 - + drivers/iio/adc/mt6577_auxadc.c | 1 - + drivers/iio/adc/mxs-lradc-adc.c | 2 -- + drivers/iio/adc/nau7802.c | 1 - + drivers/iio/adc/palmas_gpadc.c | 1 - + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 1 - + drivers/iio/adc/qcom-spmi-iadc.c | 1 - + drivers/iio/adc/qcom-spmi-vadc.c | 1 - + drivers/iio/adc/rcar-gyroadc.c | 1 - + drivers/iio/adc/rockchip_saradc.c | 1 - + drivers/iio/adc/spear_adc.c | 1 - + drivers/iio/adc/stm32-adc.c | 1 - + drivers/iio/adc/stx104.c | 1 - + drivers/iio/adc/sun4i-gpadc-iio.c | 1 - + drivers/iio/adc/ti-adc081c.c | 1 - + drivers/iio/adc/ti-adc0832.c | 1 - + drivers/iio/adc/ti-adc084s021.c | 1 - + drivers/iio/adc/ti-adc108s102.c | 1 - + drivers/iio/adc/ti-adc12138.c | 1 - + drivers/iio/adc/ti-adc128s052.c | 1 - + drivers/iio/adc/ti-adc161s626.c | 1 - + drivers/iio/adc/ti-ads1015.c | 2 -- + drivers/iio/adc/ti-ads7950.c | 1 - + drivers/iio/adc/ti-ads8688.c | 1 - + drivers/iio/adc/ti-tlc4541.c | 1 - + drivers/iio/adc/ti_am335x_adc.c | 1 - + drivers/iio/adc/twl4030-madc.c | 1 - + drivers/iio/adc/twl6030-gpadc.c | 1 - + drivers/iio/adc/vf610_adc.c | 1 - + drivers/iio/adc/viperboard_adc.c | 1 - + drivers/iio/adc/xilinx-xadc-core.c | 2 -- 73 files changed, 92 deletions(-) -diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c -index b8d5cfd57ec4..605eb5e7e829 100644 --- a/drivers/iio/adc/ad7266.c +++ b/drivers/iio/adc/ad7266.c -@@ -280,7 +280,6 @@ static AD7266_DECLARE_DIFF_CHANNELS_FIXED(u, 'u'); +@@ -280,7 +280,6 @@ static AD7266_DECLARE_DIFF_CHANNELS_FIXE static const struct iio_info ad7266_info = { .read_raw = &ad7266_read_raw, .update_scan_mode = &ad7266_update_scan_mode, @@ -101,11 +99,9 @@ index b8d5cfd57ec4..605eb5e7e829 100644 }; static const unsigned long ad7266_available_scan_masks[] = { -diff --git a/drivers/iio/adc/ad7291.c b/drivers/iio/adc/ad7291.c -index 1d90b02732bb..a862b5d8fb4b 100644 --- a/drivers/iio/adc/ad7291.c +++ b/drivers/iio/adc/ad7291.c -@@ -461,7 +461,6 @@ static const struct iio_info ad7291_info = { +@@ -461,7 +461,6 @@ static const struct iio_info ad7291_info .write_event_config = &ad7291_write_event_config, .read_event_value = &ad7291_read_event_value, .write_event_value = &ad7291_write_event_value, @@ -113,11 +109,9 @@ index 1d90b02732bb..a862b5d8fb4b 100644 }; static int ad7291_probe(struct i2c_client *client, -diff --git a/drivers/iio/adc/ad7298.c b/drivers/iio/adc/ad7298.c -index e399bf04c73a..2b20c6c8ec7f 100644 --- a/drivers/iio/adc/ad7298.c +++ b/drivers/iio/adc/ad7298.c -@@ -280,7 +280,6 @@ static int ad7298_read_raw(struct iio_dev *indio_dev, +@@ -280,7 +280,6 @@ static int ad7298_read_raw(struct iio_de static const struct iio_info ad7298_info = { .read_raw = &ad7298_read_raw, .update_scan_mode = ad7298_update_scan_mode, @@ -125,11 +119,9 @@ index e399bf04c73a..2b20c6c8ec7f 100644 }; static int ad7298_probe(struct spi_device *spi) -diff --git a/drivers/iio/adc/ad7476.c b/drivers/iio/adc/ad7476.c -index b7ecf9aab90f..b7706bf10ffe 100644 --- a/drivers/iio/adc/ad7476.c +++ b/drivers/iio/adc/ad7476.c -@@ -195,7 +195,6 @@ static const struct ad7476_chip_info ad7476_chip_info_tbl[] = { +@@ -195,7 +195,6 @@ static const struct ad7476_chip_info ad7 }; static const struct iio_info ad7476_info = { @@ -137,11 +129,9 @@ index b7ecf9aab90f..b7706bf10ffe 100644 .read_raw = &ad7476_read_raw, }; -diff --git a/drivers/iio/adc/ad7766.c b/drivers/iio/adc/ad7766.c -index ce45037295d8..3ae14fc8c649 100644 --- a/drivers/iio/adc/ad7766.c +++ b/drivers/iio/adc/ad7766.c -@@ -185,7 +185,6 @@ static const struct iio_buffer_setup_ops ad7766_buffer_setup_ops = { +@@ -185,7 +185,6 @@ static const struct iio_buffer_setup_ops }; static const struct iio_info ad7766_info = { @@ -149,7 +139,7 @@ index ce45037295d8..3ae14fc8c649 100644 .read_raw = &ad7766_read_raw, }; -@@ -208,7 +207,6 @@ static int ad7766_set_trigger_state(struct iio_trigger *trig, bool enable) +@@ -208,7 +207,6 @@ static int ad7766_set_trigger_state(stru } static const struct iio_trigger_ops ad7766_trigger_ops = { @@ -157,11 +147,9 @@ index ce45037295d8..3ae14fc8c649 100644 .set_trigger_state = ad7766_set_trigger_state, .validate_device = iio_trigger_validate_own_device, }; -diff --git a/drivers/iio/adc/ad7791.c b/drivers/iio/adc/ad7791.c -index 677f812f372a..03a5f7d6cb0c 100644 --- a/drivers/iio/adc/ad7791.c +++ b/drivers/iio/adc/ad7791.c -@@ -259,13 +259,11 @@ static const struct iio_info ad7791_info = { +@@ -259,13 +259,11 @@ static const struct iio_info ad7791_info .read_raw = &ad7791_read_raw, .attrs = &ad7791_attribute_group, .validate_trigger = ad_sd_validate_trigger, @@ -175,11 +163,9 @@ index 677f812f372a..03a5f7d6cb0c 100644 }; static int ad7791_setup(struct ad7791_state *st, -diff --git a/drivers/iio/adc/ad7793.c b/drivers/iio/adc/ad7793.c -index 07246a6037e3..d4bbe5b53318 100644 --- a/drivers/iio/adc/ad7793.c +++ b/drivers/iio/adc/ad7793.c -@@ -536,7 +536,6 @@ static const struct iio_info ad7793_info = { +@@ -536,7 +536,6 @@ static const struct iio_info ad7793_info .write_raw_get_fmt = &ad7793_write_raw_get_fmt, .attrs = &ad7793_attribute_group, .validate_trigger = ad_sd_validate_trigger, @@ -187,7 +173,7 @@ index 07246a6037e3..d4bbe5b53318 100644 }; static const struct iio_info ad7797_info = { -@@ -545,7 +544,6 @@ static const struct iio_info ad7797_info = { +@@ -545,7 +544,6 @@ static const struct iio_info ad7797_info .write_raw_get_fmt = &ad7793_write_raw_get_fmt, .attrs = &ad7793_attribute_group, .validate_trigger = ad_sd_validate_trigger, @@ -195,11 +181,9 @@ index 07246a6037e3..d4bbe5b53318 100644 }; #define DECLARE_AD7793_CHANNELS(_name, _b, _sb, _s) \ -diff --git a/drivers/iio/adc/ad7887.c b/drivers/iio/adc/ad7887.c -index 7a483bfbd70c..205c0f1761aa 100644 --- a/drivers/iio/adc/ad7887.c +++ b/drivers/iio/adc/ad7887.c -@@ -229,7 +229,6 @@ static const struct ad7887_chip_info ad7887_chip_info_tbl[] = { +@@ -229,7 +229,6 @@ static const struct ad7887_chip_info ad7 static const struct iio_info ad7887_info = { .read_raw = &ad7887_read_raw, @@ -207,11 +191,9 @@ index 7a483bfbd70c..205c0f1761aa 100644 }; static int ad7887_probe(struct spi_device *spi) -diff --git a/drivers/iio/adc/ad7923.c b/drivers/iio/adc/ad7923.c -index 77a675e11ebb..ffb7e089969c 100644 --- a/drivers/iio/adc/ad7923.c +++ b/drivers/iio/adc/ad7923.c -@@ -262,7 +262,6 @@ static int ad7923_read_raw(struct iio_dev *indio_dev, +@@ -262,7 +262,6 @@ static int ad7923_read_raw(struct iio_de static const struct iio_info ad7923_info = { .read_raw = &ad7923_read_raw, .update_scan_mode = ad7923_update_scan_mode, @@ -219,11 +201,9 @@ index 77a675e11ebb..ffb7e089969c 100644 }; static int ad7923_probe(struct spi_device *spi) -diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c -index 22426ae4af97..e1da67d5ee22 100644 --- a/drivers/iio/adc/ad799x.c +++ b/drivers/iio/adc/ad799x.c -@@ -526,13 +526,11 @@ static const struct attribute_group ad799x_event_attrs_group = { +@@ -526,13 +526,11 @@ static const struct attribute_group ad79 static const struct iio_info ad7991_info = { .read_raw = &ad799x_read_raw, @@ -237,7 +217,7 @@ index 22426ae4af97..e1da67d5ee22 100644 .update_scan_mode = ad799x_update_scan_mode, }; -@@ -543,7 +541,6 @@ static const struct iio_info ad7993_4_7_8_irq_info = { +@@ -543,7 +541,6 @@ static const struct iio_info ad7993_4_7_ .write_event_config = &ad799x_write_event_config, .read_event_value = &ad799x_read_event_value, .write_event_value = &ad799x_write_event_value, @@ -245,11 +225,9 @@ index 22426ae4af97..e1da67d5ee22 100644 .update_scan_mode = ad799x_update_scan_mode, }; -diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c -index 22c4c17cd996..cf1b048b0665 100644 --- a/drivers/iio/adc/ad_sigma_delta.c +++ b/drivers/iio/adc/ad_sigma_delta.c -@@ -463,7 +463,6 @@ int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig) +@@ -463,7 +463,6 @@ int ad_sd_validate_trigger(struct iio_de EXPORT_SYMBOL_GPL(ad_sd_validate_trigger); static const struct iio_trigger_ops ad_sd_trigger_ops = { @@ -257,11 +235,9 @@ index 22c4c17cd996..cf1b048b0665 100644 }; static int ad_sd_probe_trigger(struct iio_dev *indio_dev) -diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c -index c02b23d675cb..8a958d5f1905 100644 --- a/drivers/iio/adc/aspeed_adc.c +++ b/drivers/iio/adc/aspeed_adc.c -@@ -165,7 +165,6 @@ static int aspeed_adc_reg_access(struct iio_dev *indio_dev, +@@ -165,7 +165,6 @@ static int aspeed_adc_reg_access(struct } static const struct iio_info aspeed_adc_iio_info = { @@ -269,11 +245,9 @@ index c02b23d675cb..8a958d5f1905 100644 .read_raw = aspeed_adc_read_raw, .write_raw = aspeed_adc_write_raw, .debugfs_reg_access = aspeed_adc_reg_access, -diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c -index a70ef7fec95f..755a493c2a2c 100644 --- a/drivers/iio/adc/at91-sama5d2_adc.c +++ b/drivers/iio/adc/at91-sama5d2_adc.c -@@ -348,7 +348,6 @@ static int at91_adc_reenable_trigger(struct iio_trigger *trig) +@@ -348,7 +348,6 @@ static int at91_adc_reenable_trigger(str } static const struct iio_trigger_ops at91_adc_trigger_ops = { @@ -281,7 +255,7 @@ index a70ef7fec95f..755a493c2a2c 100644 .set_trigger_state = &at91_adc_configure_trigger, .try_reenable = &at91_adc_reenable_trigger, }; -@@ -584,7 +583,6 @@ static int at91_adc_write_raw(struct iio_dev *indio_dev, +@@ -584,7 +583,6 @@ static int at91_adc_write_raw(struct iio static const struct iio_info at91_adc_info = { .read_raw = &at91_adc_read_raw, .write_raw = &at91_adc_write_raw, @@ -289,11 +263,9 @@ index a70ef7fec95f..755a493c2a2c 100644 }; static void at91_adc_hw_init(struct at91_adc_state *st) -diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c -index 15109728cae7..3836d4222a3e 100644 --- a/drivers/iio/adc/at91_adc.c +++ b/drivers/iio/adc/at91_adc.c -@@ -594,7 +594,6 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state) +@@ -594,7 +594,6 @@ static int at91_adc_configure_trigger(st } static const struct iio_trigger_ops at91_adc_trigger_ops = { @@ -301,7 +273,7 @@ index 15109728cae7..3836d4222a3e 100644 .set_trigger_state = &at91_adc_configure_trigger, }; -@@ -976,7 +975,6 @@ static int at91_adc_probe_pdata(struct at91_adc_state *st, +@@ -976,7 +975,6 @@ static int at91_adc_probe_pdata(struct a } static const struct iio_info at91_adc_info = { @@ -309,11 +281,9 @@ index 15109728cae7..3836d4222a3e 100644 .read_raw = &at91_adc_read_raw, }; -diff --git a/drivers/iio/adc/axp20x_adc.c b/drivers/iio/adc/axp20x_adc.c -index 11e177180ea0..a30a97245e91 100644 --- a/drivers/iio/adc/axp20x_adc.c +++ b/drivers/iio/adc/axp20x_adc.c -@@ -464,12 +464,10 @@ static int axp20x_write_raw(struct iio_dev *indio_dev, +@@ -464,12 +464,10 @@ static int axp20x_write_raw(struct iio_d static const struct iio_info axp20x_adc_iio_info = { .read_raw = axp20x_read_raw, .write_raw = axp20x_write_raw, @@ -326,11 +296,9 @@ index 11e177180ea0..a30a97245e91 100644 }; static int axp20x_adc_rate(int rate) -diff --git a/drivers/iio/adc/axp288_adc.c b/drivers/iio/adc/axp288_adc.c -index 462a99c13e7a..60c9e853dd81 100644 --- a/drivers/iio/adc/axp288_adc.c +++ b/drivers/iio/adc/axp288_adc.c -@@ -183,7 +183,6 @@ static int axp288_adc_set_state(struct regmap *regmap) +@@ -183,7 +183,6 @@ static int axp288_adc_set_state(struct r static const struct iio_info axp288_adc_iio_info = { .read_raw = &axp288_adc_read_raw, @@ -338,11 +306,9 @@ index 462a99c13e7a..60c9e853dd81 100644 }; static int axp288_adc_probe(struct platform_device *pdev) -diff --git a/drivers/iio/adc/bcm_iproc_adc.c b/drivers/iio/adc/bcm_iproc_adc.c -index 7f4f9c4150e3..7af59a4bbd8d 100644 --- a/drivers/iio/adc/bcm_iproc_adc.c +++ b/drivers/iio/adc/bcm_iproc_adc.c -@@ -492,7 +492,6 @@ static int iproc_adc_read_raw(struct iio_dev *indio_dev, +@@ -492,7 +492,6 @@ static int iproc_adc_read_raw(struct iio static const struct iio_info iproc_adc_iio_info = { .read_raw = &iproc_adc_read_raw, @@ -350,11 +316,9 @@ index 7f4f9c4150e3..7af59a4bbd8d 100644 }; #define IPROC_ADC_CHANNEL(_index, _id) { \ -diff --git a/drivers/iio/adc/berlin2-adc.c b/drivers/iio/adc/berlin2-adc.c -index 71c806ecc722..72d8fa94ab31 100644 --- a/drivers/iio/adc/berlin2-adc.c +++ b/drivers/iio/adc/berlin2-adc.c -@@ -277,7 +277,6 @@ static irqreturn_t berlin2_adc_tsen_irq(int irq, void *private) +@@ -277,7 +277,6 @@ static irqreturn_t berlin2_adc_tsen_irq( } static const struct iio_info berlin2_adc_info = { @@ -362,11 +326,9 @@ index 71c806ecc722..72d8fa94ab31 100644 .read_raw = berlin2_adc_read_raw, }; -diff --git a/drivers/iio/adc/cc10001_adc.c b/drivers/iio/adc/cc10001_adc.c -index 91636c0ba5b5..707d8b24b072 100644 --- a/drivers/iio/adc/cc10001_adc.c +++ b/drivers/iio/adc/cc10001_adc.c -@@ -262,7 +262,6 @@ static int cc10001_update_scan_mode(struct iio_dev *indio_dev, +@@ -262,7 +262,6 @@ static int cc10001_update_scan_mode(stru } static const struct iio_info cc10001_adc_info = { @@ -374,11 +336,9 @@ index 91636c0ba5b5..707d8b24b072 100644 .read_raw = &cc10001_adc_read_raw, .update_scan_mode = &cc10001_update_scan_mode, }; -diff --git a/drivers/iio/adc/cpcap-adc.c b/drivers/iio/adc/cpcap-adc.c -index f153e02686a0..9ad60421d360 100644 --- a/drivers/iio/adc/cpcap-adc.c +++ b/drivers/iio/adc/cpcap-adc.c -@@ -932,7 +932,6 @@ static int cpcap_adc_read(struct iio_dev *indio_dev, +@@ -932,7 +932,6 @@ err_unlock: static const struct iio_info cpcap_adc_info = { .read_raw = &cpcap_adc_read, @@ -386,11 +346,9 @@ index f153e02686a0..9ad60421d360 100644 }; /* -diff --git a/drivers/iio/adc/da9150-gpadc.c b/drivers/iio/adc/da9150-gpadc.c -index 3445107e10b7..0a5d9ce79164 100644 --- a/drivers/iio/adc/da9150-gpadc.c +++ b/drivers/iio/adc/da9150-gpadc.c -@@ -249,7 +249,6 @@ static int da9150_gpadc_read_raw(struct iio_dev *indio_dev, +@@ -249,7 +249,6 @@ static int da9150_gpadc_read_raw(struct static const struct iio_info da9150_gpadc_info = { .read_raw = &da9150_gpadc_read_raw, @@ -398,11 +356,9 @@ index 3445107e10b7..0a5d9ce79164 100644 }; #define DA9150_GPADC_CHANNEL(_id, _hw_id, _type, chan_info, \ -diff --git a/drivers/iio/adc/dln2-adc.c b/drivers/iio/adc/dln2-adc.c -index ab8d6aed5085..c64c6675cae6 100644 --- a/drivers/iio/adc/dln2-adc.c +++ b/drivers/iio/adc/dln2-adc.c -@@ -479,7 +479,6 @@ static const struct iio_info dln2_adc_info = { +@@ -479,7 +479,6 @@ static const struct iio_info dln2_adc_in .read_raw = dln2_adc_read_raw, .write_raw = dln2_adc_write_raw, .update_scan_mode = dln2_update_scan_mode, @@ -410,7 +366,7 @@ index ab8d6aed5085..c64c6675cae6 100644 }; static irqreturn_t dln2_adc_trigger_h(int irq, void *p) -@@ -604,10 +603,6 @@ static void dln2_adc_event(struct platform_device *pdev, u16 echo, +@@ -604,10 +603,6 @@ static void dln2_adc_event(struct platfo iio_trigger_poll(dln2->trig); } @@ -421,7 +377,7 @@ index ab8d6aed5085..c64c6675cae6 100644 static int dln2_adc_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -665,7 +660,6 @@ static int dln2_adc_probe(struct platform_device *pdev) +@@ -665,7 +660,6 @@ static int dln2_adc_probe(struct platfor dev_err(dev, "failed to allocate trigger\n"); return -ENOMEM; } @@ -429,11 +385,9 @@ index ab8d6aed5085..c64c6675cae6 100644 iio_trigger_set_drvdata(dln2->trig, dln2); devm_iio_trigger_register(dev, dln2->trig); iio_trigger_set_immutable(indio_dev, dln2->trig); -diff --git a/drivers/iio/adc/envelope-detector.c b/drivers/iio/adc/envelope-detector.c -index fef15c0d7c9c..4ebda8ab54fe 100644 --- a/drivers/iio/adc/envelope-detector.c +++ b/drivers/iio/adc/envelope-detector.c -@@ -322,7 +322,6 @@ static const struct iio_chan_spec envelope_detector_iio_channel = { +@@ -322,7 +322,6 @@ static const struct iio_chan_spec envelo static const struct iio_info envelope_detector_info = { .read_raw = &envelope_detector_read_raw, @@ -441,11 +395,9 @@ index fef15c0d7c9c..4ebda8ab54fe 100644 }; static int envelope_detector_probe(struct platform_device *pdev) -diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c -index 6c5a7be9f8c1..f10443f92e4c 100644 --- a/drivers/iio/adc/exynos_adc.c +++ b/drivers/iio/adc/exynos_adc.c -@@ -657,7 +657,6 @@ static int exynos_adc_reg_access(struct iio_dev *indio_dev, +@@ -657,7 +657,6 @@ static int exynos_adc_reg_access(struct static const struct iio_info exynos_adc_iio_info = { .read_raw = &exynos_read_raw, .debugfs_reg_access = &exynos_adc_reg_access, @@ -453,11 +405,9 @@ index 6c5a7be9f8c1..f10443f92e4c 100644 }; #define ADC_CHANNEL(_index, _id) { \ -diff --git a/drivers/iio/adc/hi8435.c b/drivers/iio/adc/hi8435.c -index adf7dc712937..6f6c9a348158 100644 --- a/drivers/iio/adc/hi8435.c +++ b/drivers/iio/adc/hi8435.c -@@ -408,7 +408,6 @@ static const struct iio_chan_spec hi8435_channels[] = { +@@ -408,7 +408,6 @@ static const struct iio_chan_spec hi8435 }; static const struct iio_info hi8435_info = { @@ -465,11 +415,9 @@ index adf7dc712937..6f6c9a348158 100644 .read_raw = hi8435_read_raw, .read_event_config = hi8435_read_event_config, .write_event_config = hi8435_write_event_config, -diff --git a/drivers/iio/adc/hx711.c b/drivers/iio/adc/hx711.c -index 27005d84ed73..d10b9f13d557 100644 --- a/drivers/iio/adc/hx711.c +++ b/drivers/iio/adc/hx711.c -@@ -374,7 +374,6 @@ static const struct attribute_group hx711_attribute_group = { +@@ -374,7 +374,6 @@ static const struct attribute_group hx71 }; static const struct iio_info hx711_iio_info = { @@ -477,11 +425,9 @@ index 27005d84ed73..d10b9f13d557 100644 .read_raw = hx711_read_raw, .write_raw = hx711_write_raw, .write_raw_get_fmt = hx711_write_raw_get_fmt, -diff --git a/drivers/iio/adc/imx7d_adc.c b/drivers/iio/adc/imx7d_adc.c -index 254b29a68b9d..cfab31162845 100644 --- a/drivers/iio/adc/imx7d_adc.c +++ b/drivers/iio/adc/imx7d_adc.c -@@ -412,7 +412,6 @@ static int imx7d_adc_reg_access(struct iio_dev *indio_dev, +@@ -412,7 +412,6 @@ static int imx7d_adc_reg_access(struct i } static const struct iio_info imx7d_adc_iio_info = { @@ -489,11 +435,9 @@ index 254b29a68b9d..cfab31162845 100644 .read_raw = &imx7d_adc_read_raw, .debugfs_reg_access = &imx7d_adc_reg_access, }; -diff --git a/drivers/iio/adc/ina2xx-adc.c b/drivers/iio/adc/ina2xx-adc.c -index 59f99b3a180d..3976da23ec3f 100644 --- a/drivers/iio/adc/ina2xx-adc.c +++ b/drivers/iio/adc/ina2xx-adc.c -@@ -786,7 +786,6 @@ static const struct attribute_group ina226_attribute_group = { +@@ -795,7 +795,6 @@ static const struct attribute_group ina2 }; static const struct iio_info ina219_info = { @@ -501,7 +445,7 @@ index 59f99b3a180d..3976da23ec3f 100644 .attrs = &ina219_attribute_group, .read_raw = ina2xx_read_raw, .write_raw = ina2xx_write_raw, -@@ -794,7 +793,6 @@ static const struct iio_info ina219_info = { +@@ -803,7 +802,6 @@ static const struct iio_info ina219_info }; static const struct iio_info ina226_info = { @@ -509,11 +453,9 @@ index 59f99b3a180d..3976da23ec3f 100644 .attrs = &ina226_attribute_group, .read_raw = ina2xx_read_raw, .write_raw = ina2xx_write_raw, -diff --git a/drivers/iio/adc/lp8788_adc.c b/drivers/iio/adc/lp8788_adc.c -index 152cfc8e1c7b..3bc4df916420 100644 --- a/drivers/iio/adc/lp8788_adc.c +++ b/drivers/iio/adc/lp8788_adc.c -@@ -125,7 +125,6 @@ static int lp8788_adc_read_raw(struct iio_dev *indio_dev, +@@ -125,7 +125,6 @@ static int lp8788_adc_read_raw(struct ii static const struct iio_info lp8788_adc_info = { .read_raw = &lp8788_adc_read_raw, @@ -521,11 +463,9 @@ index 152cfc8e1c7b..3bc4df916420 100644 }; #define LP8788_CHAN(_id, _type) { \ -diff --git a/drivers/iio/adc/lpc18xx_adc.c b/drivers/iio/adc/lpc18xx_adc.c -index 3ef18f4b27f0..041dc4a3f66c 100644 --- a/drivers/iio/adc/lpc18xx_adc.c +++ b/drivers/iio/adc/lpc18xx_adc.c -@@ -116,7 +116,6 @@ static int lpc18xx_adc_read_raw(struct iio_dev *indio_dev, +@@ -116,7 +116,6 @@ static int lpc18xx_adc_read_raw(struct i static const struct iio_info lpc18xx_adc_info = { .read_raw = lpc18xx_adc_read_raw, @@ -533,11 +473,9 @@ index 3ef18f4b27f0..041dc4a3f66c 100644 }; static int lpc18xx_adc_probe(struct platform_device *pdev) -diff --git a/drivers/iio/adc/lpc32xx_adc.c b/drivers/iio/adc/lpc32xx_adc.c -index 6a5b9a9bc662..20b36690fa4f 100644 --- a/drivers/iio/adc/lpc32xx_adc.c +++ b/drivers/iio/adc/lpc32xx_adc.c -@@ -104,7 +104,6 @@ static int lpc32xx_read_raw(struct iio_dev *indio_dev, +@@ -104,7 +104,6 @@ static int lpc32xx_read_raw(struct iio_d static const struct iio_info lpc32xx_adc_iio_info = { .read_raw = &lpc32xx_read_raw, @@ -545,11 +483,9 @@ index 6a5b9a9bc662..20b36690fa4f 100644 }; #define LPC32XX_ADC_CHANNEL(_index) { \ -diff --git a/drivers/iio/adc/ltc2471.c b/drivers/iio/adc/ltc2471.c -index 29b7ed60cdb0..b88102b751cf 100644 --- a/drivers/iio/adc/ltc2471.c +++ b/drivers/iio/adc/ltc2471.c -@@ -98,7 +98,6 @@ static const struct iio_chan_spec ltc2473_channel[] = { +@@ -98,7 +98,6 @@ static const struct iio_chan_spec ltc247 static const struct iio_info ltc2471_info = { .read_raw = ltc2471_read_raw, @@ -557,11 +493,9 @@ index 29b7ed60cdb0..b88102b751cf 100644 }; static int ltc2471_i2c_probe(struct i2c_client *client, -diff --git a/drivers/iio/adc/ltc2485.c b/drivers/iio/adc/ltc2485.c -index eab91f12454a..b24c14037fd4 100644 --- a/drivers/iio/adc/ltc2485.c +++ b/drivers/iio/adc/ltc2485.c -@@ -90,7 +90,6 @@ static const struct iio_chan_spec ltc2485_channel[] = { +@@ -90,7 +90,6 @@ static const struct iio_chan_spec ltc248 static const struct iio_info ltc2485_info = { .read_raw = ltc2485_read_raw, @@ -569,11 +503,9 @@ index eab91f12454a..b24c14037fd4 100644 }; static int ltc2485_probe(struct i2c_client *client, -diff --git a/drivers/iio/adc/ltc2497.c b/drivers/iio/adc/ltc2497.c -index 5bf8011dcde9..f1f7cdf66fbd 100644 --- a/drivers/iio/adc/ltc2497.c +++ b/drivers/iio/adc/ltc2497.c -@@ -186,7 +186,6 @@ static const struct iio_chan_spec ltc2497_channel[] = { +@@ -186,7 +186,6 @@ static const struct iio_chan_spec ltc249 static const struct iio_info ltc2497_info = { .read_raw = ltc2497_read_raw, @@ -581,11 +513,9 @@ index 5bf8011dcde9..f1f7cdf66fbd 100644 }; static int ltc2497_probe(struct i2c_client *client, -diff --git a/drivers/iio/adc/max1027.c b/drivers/iio/adc/max1027.c -index ebc715927e63..375da6491499 100644 --- a/drivers/iio/adc/max1027.c +++ b/drivers/iio/adc/max1027.c -@@ -381,13 +381,11 @@ static irqreturn_t max1027_trigger_handler(int irq, void *private) +@@ -381,13 +381,11 @@ static irqreturn_t max1027_trigger_handl } static const struct iio_trigger_ops max1027_trigger_ops = { @@ -599,11 +529,9 @@ index ebc715927e63..375da6491499 100644 .read_raw = &max1027_read_raw, .validate_trigger = &max1027_validate_trigger, .debugfs_reg_access = &max1027_debugfs_reg_access, -diff --git a/drivers/iio/adc/max11100.c b/drivers/iio/adc/max11100.c -index 1180bcc22ff1..af59ab2e650c 100644 --- a/drivers/iio/adc/max11100.c +++ b/drivers/iio/adc/max11100.c -@@ -100,7 +100,6 @@ static int max11100_read_raw(struct iio_dev *indio_dev, +@@ -100,7 +100,6 @@ static int max11100_read_raw(struct iio_ } static const struct iio_info max11100_info = { @@ -611,11 +539,9 @@ index 1180bcc22ff1..af59ab2e650c 100644 .read_raw = max11100_read_raw, }; -diff --git a/drivers/iio/adc/max1118.c b/drivers/iio/adc/max1118.c -index 2e9648a078c4..49db9e9ae625 100644 --- a/drivers/iio/adc/max1118.c +++ b/drivers/iio/adc/max1118.c -@@ -155,7 +155,6 @@ static int max1118_read_raw(struct iio_dev *indio_dev, +@@ -155,7 +155,6 @@ static int max1118_read_raw(struct iio_d static const struct iio_info max1118_info = { .read_raw = max1118_read_raw, @@ -623,11 +549,9 @@ index 2e9648a078c4..49db9e9ae625 100644 }; static irqreturn_t max1118_trigger_handler(int irq, void *p) -diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c -index 80eada4886b3..7f1848dac9bf 100644 --- a/drivers/iio/adc/max1363.c +++ b/drivers/iio/adc/max1363.c -@@ -1029,7 +1029,6 @@ static int max1363_update_scan_mode(struct iio_dev *indio_dev, +@@ -1029,7 +1029,6 @@ static int max1363_update_scan_mode(stru static const struct iio_info max1238_info = { .read_raw = &max1363_read_raw, @@ -635,7 +559,7 @@ index 80eada4886b3..7f1848dac9bf 100644 .update_scan_mode = &max1363_update_scan_mode, }; -@@ -1040,7 +1039,6 @@ static const struct iio_info max1363_info = { +@@ -1040,7 +1039,6 @@ static const struct iio_info max1363_inf .write_event_config = &max1363_write_event_config, .read_raw = &max1363_read_raw, .update_scan_mode = &max1363_update_scan_mode, @@ -643,11 +567,9 @@ index 80eada4886b3..7f1848dac9bf 100644 .event_attrs = &max1363_event_attribute_group, }; -diff --git a/drivers/iio/adc/max9611.c b/drivers/iio/adc/max9611.c -index b1dd17cbce58..9edfbabf4e4d 100644 --- a/drivers/iio/adc/max9611.c +++ b/drivers/iio/adc/max9611.c -@@ -460,7 +460,6 @@ static const struct attribute_group max9611_attribute_group = { +@@ -460,7 +460,6 @@ static const struct attribute_group max9 }; static const struct iio_info indio_info = { @@ -655,11 +577,9 @@ index b1dd17cbce58..9edfbabf4e4d 100644 .read_raw = max9611_read_raw, .attrs = &max9611_attribute_group, }; -diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c -index 071dd23a33d9..49e80b959089 100644 --- a/drivers/iio/adc/mcp320x.c +++ b/drivers/iio/adc/mcp320x.c -@@ -248,7 +248,6 @@ static const struct iio_chan_spec mcp3208_channels[] = { +@@ -248,7 +248,6 @@ static const struct iio_chan_spec mcp320 static const struct iio_info mcp320x_info = { .read_raw = mcp320x_read_raw, @@ -667,11 +587,9 @@ index 071dd23a33d9..49e80b959089 100644 }; static const struct mcp320x_chip_info mcp320x_chip_infos[] = { -diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c -index 63de705086ed..819f26011500 100644 --- a/drivers/iio/adc/mcp3422.c +++ b/drivers/iio/adc/mcp3422.c -@@ -327,7 +327,6 @@ static const struct iio_info mcp3422_info = { +@@ -327,7 +327,6 @@ static const struct iio_info mcp3422_inf .write_raw = mcp3422_write_raw, .write_raw_get_fmt = mcp3422_write_raw_get_fmt, .attrs = &mcp3422_attribute_group, @@ -679,11 +597,9 @@ index 63de705086ed..819f26011500 100644 }; static int mcp3422_probe(struct i2c_client *client, -diff --git a/drivers/iio/adc/men_z188_adc.c b/drivers/iio/adc/men_z188_adc.c -index 8f3606de4eaf..c80261748d8f 100644 --- a/drivers/iio/adc/men_z188_adc.c +++ b/drivers/iio/adc/men_z188_adc.c -@@ -80,7 +80,6 @@ static int z188_iio_read_raw(struct iio_dev *iio_dev, +@@ -80,7 +80,6 @@ static int z188_iio_read_raw(struct iio_ static const struct iio_info z188_adc_info = { .read_raw = &z188_iio_read_raw, @@ -691,11 +607,9 @@ index 8f3606de4eaf..c80261748d8f 100644 }; static void men_z188_config_channels(void __iomem *addr) -diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c -index 11484cb38b84..0d237fd69769 100644 --- a/drivers/iio/adc/meson_saradc.c +++ b/drivers/iio/adc/meson_saradc.c -@@ -864,7 +864,6 @@ static int meson_sar_adc_calib(struct iio_dev *indio_dev) +@@ -864,7 +864,6 @@ out: static const struct iio_info meson_sar_adc_iio_info = { .read_raw = meson_sar_adc_iio_info_read_raw, @@ -703,11 +617,9 @@ index 11484cb38b84..0d237fd69769 100644 }; static const struct meson_sar_adc_data meson_sar_adc_meson8_data = { -diff --git a/drivers/iio/adc/mt6577_auxadc.c b/drivers/iio/adc/mt6577_auxadc.c -index 414cf44bf19d..a2a23958c2a2 100644 --- a/drivers/iio/adc/mt6577_auxadc.c +++ b/drivers/iio/adc/mt6577_auxadc.c -@@ -180,7 +180,6 @@ static int mt6577_auxadc_read_raw(struct iio_dev *indio_dev, +@@ -180,7 +180,6 @@ static int mt6577_auxadc_read_raw(struct } static const struct iio_info mt6577_auxadc_info = { @@ -715,11 +627,9 @@ index 414cf44bf19d..a2a23958c2a2 100644 .read_raw = &mt6577_auxadc_read_raw, }; -diff --git a/drivers/iio/adc/mxs-lradc-adc.c b/drivers/iio/adc/mxs-lradc-adc.c -index d32b34638c2f..c627513d9f0f 100644 --- a/drivers/iio/adc/mxs-lradc-adc.c +++ b/drivers/iio/adc/mxs-lradc-adc.c -@@ -382,7 +382,6 @@ static const struct attribute_group mxs_lradc_adc_attribute_group = { +@@ -382,7 +382,6 @@ static const struct attribute_group mxs_ }; static const struct iio_info mxs_lradc_adc_iio_info = { @@ -727,7 +637,7 @@ index d32b34638c2f..c627513d9f0f 100644 .read_raw = mxs_lradc_adc_read_raw, .write_raw = mxs_lradc_adc_write_raw, .write_raw_get_fmt = mxs_lradc_adc_write_raw_get_fmt, -@@ -455,7 +454,6 @@ static int mxs_lradc_adc_configure_trigger(struct iio_trigger *trig, bool state) +@@ -455,7 +454,6 @@ static int mxs_lradc_adc_configure_trigg } static const struct iio_trigger_ops mxs_lradc_adc_trigger_ops = { @@ -735,11 +645,9 @@ index d32b34638c2f..c627513d9f0f 100644 .set_trigger_state = &mxs_lradc_adc_configure_trigger, }; -diff --git a/drivers/iio/adc/nau7802.c b/drivers/iio/adc/nau7802.c -index 08f446695f97..8997e74a8847 100644 --- a/drivers/iio/adc/nau7802.c +++ b/drivers/iio/adc/nau7802.c -@@ -402,7 +402,6 @@ static int nau7802_write_raw_get_fmt(struct iio_dev *indio_dev, +@@ -402,7 +402,6 @@ static int nau7802_write_raw_get_fmt(str } static const struct iio_info nau7802_info = { @@ -747,11 +655,9 @@ index 08f446695f97..8997e74a8847 100644 .read_raw = &nau7802_read_raw, .write_raw = &nau7802_write_raw, .write_raw_get_fmt = nau7802_write_raw_get_fmt, -diff --git a/drivers/iio/adc/palmas_gpadc.c b/drivers/iio/adc/palmas_gpadc.c -index 7d61b566e148..69b9affeef1e 100644 --- a/drivers/iio/adc/palmas_gpadc.c +++ b/drivers/iio/adc/palmas_gpadc.c -@@ -430,7 +430,6 @@ static int palmas_gpadc_read_raw(struct iio_dev *indio_dev, +@@ -430,7 +430,6 @@ out: static const struct iio_info palmas_gpadc_iio_info = { .read_raw = palmas_gpadc_read_raw, @@ -759,11 +665,9 @@ index 7d61b566e148..69b9affeef1e 100644 }; #define PALMAS_ADC_CHAN_IIO(chan, _type, chan_info) \ -diff --git a/drivers/iio/adc/qcom-pm8xxx-xoadc.c b/drivers/iio/adc/qcom-pm8xxx-xoadc.c -index cea8f1fb444a..b093ecddf1a8 100644 --- a/drivers/iio/adc/qcom-pm8xxx-xoadc.c +++ b/drivers/iio/adc/qcom-pm8xxx-xoadc.c -@@ -728,7 +728,6 @@ static int pm8xxx_of_xlate(struct iio_dev *indio_dev, +@@ -728,7 +728,6 @@ static int pm8xxx_of_xlate(struct iio_de } static const struct iio_info pm8xxx_xoadc_info = { @@ -771,11 +675,9 @@ index cea8f1fb444a..b093ecddf1a8 100644 .of_xlate = pm8xxx_of_xlate, .read_raw = pm8xxx_read_raw, }; -diff --git a/drivers/iio/adc/qcom-spmi-iadc.c b/drivers/iio/adc/qcom-spmi-iadc.c -index fabd24edc2a1..3f062cd61aba 100644 --- a/drivers/iio/adc/qcom-spmi-iadc.c +++ b/drivers/iio/adc/qcom-spmi-iadc.c -@@ -356,7 +356,6 @@ static int iadc_read_raw(struct iio_dev *indio_dev, +@@ -356,7 +356,6 @@ static int iadc_read_raw(struct iio_dev static const struct iio_info iadc_info = { .read_raw = iadc_read_raw, @@ -783,11 +685,9 @@ index fabd24edc2a1..3f062cd61aba 100644 }; static irqreturn_t iadc_isr(int irq, void *dev_id) -diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c -index 9e600bfd1765..3680e0d47412 100644 --- a/drivers/iio/adc/qcom-spmi-vadc.c +++ b/drivers/iio/adc/qcom-spmi-vadc.c -@@ -506,7 +506,6 @@ static int vadc_of_xlate(struct iio_dev *indio_dev, +@@ -506,7 +506,6 @@ static int vadc_of_xlate(struct iio_dev static const struct iio_info vadc_info = { .read_raw = vadc_read_raw, .of_xlate = vadc_of_xlate, @@ -795,11 +695,9 @@ index 9e600bfd1765..3680e0d47412 100644 }; struct vadc_channels { -diff --git a/drivers/iio/adc/rcar-gyroadc.c b/drivers/iio/adc/rcar-gyroadc.c -index 27a318164619..2cb5397ceeea 100644 --- a/drivers/iio/adc/rcar-gyroadc.c +++ b/drivers/iio/adc/rcar-gyroadc.c -@@ -277,7 +277,6 @@ static int rcar_gyroadc_reg_access(struct iio_dev *indio_dev, +@@ -277,7 +277,6 @@ static int rcar_gyroadc_reg_access(struc } static const struct iio_info rcar_gyroadc_iio_info = { @@ -807,11 +705,9 @@ index 27a318164619..2cb5397ceeea 100644 .read_raw = rcar_gyroadc_read_raw, .debugfs_reg_access = rcar_gyroadc_reg_access, }; -diff --git a/drivers/iio/adc/rockchip_saradc.c b/drivers/iio/adc/rockchip_saradc.c -index 5f612d694b33..1f98566d5b3c 100644 --- a/drivers/iio/adc/rockchip_saradc.c +++ b/drivers/iio/adc/rockchip_saradc.c -@@ -125,7 +125,6 @@ static irqreturn_t rockchip_saradc_isr(int irq, void *dev_id) +@@ -125,7 +125,6 @@ static irqreturn_t rockchip_saradc_isr(i static const struct iio_info rockchip_saradc_iio_info = { .read_raw = rockchip_saradc_read_raw, @@ -819,11 +715,9 @@ index 5f612d694b33..1f98566d5b3c 100644 }; #define ADC_CHANNEL(_index, _id) { \ -diff --git a/drivers/iio/adc/spear_adc.c b/drivers/iio/adc/spear_adc.c -index 5dd61f6a57b9..b1da2c46107c 100644 --- a/drivers/iio/adc/spear_adc.c +++ b/drivers/iio/adc/spear_adc.c -@@ -254,7 +254,6 @@ static int spear_adc_configure(struct spear_adc_state *st) +@@ -254,7 +254,6 @@ static int spear_adc_configure(struct sp static const struct iio_info spear_adc_info = { .read_raw = &spear_adc_read_raw, .write_raw = &spear_adc_write_raw, @@ -831,11 +725,9 @@ index 5dd61f6a57b9..b1da2c46107c 100644 }; static int spear_adc_probe(struct platform_device *pdev) -diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c -index 04be8bd951be..2c9903d3396d 100644 --- a/drivers/iio/adc/stm32-adc.c +++ b/drivers/iio/adc/stm32-adc.c -@@ -1387,7 +1387,6 @@ static const struct iio_info stm32_adc_iio_info = { +@@ -1387,7 +1387,6 @@ static const struct iio_info stm32_adc_i .update_scan_mode = stm32_adc_update_scan_mode, .debugfs_reg_access = stm32_adc_debugfs_reg_access, .of_xlate = stm32_adc_of_xlate, @@ -843,11 +735,9 @@ index 04be8bd951be..2c9903d3396d 100644 }; static unsigned int stm32_adc_dma_residue(struct stm32_adc *adc) -diff --git a/drivers/iio/adc/stx104.c b/drivers/iio/adc/stx104.c -index 2da741d27540..17b021f33180 100644 --- a/drivers/iio/adc/stx104.c +++ b/drivers/iio/adc/stx104.c -@@ -172,7 +172,6 @@ static int stx104_write_raw(struct iio_dev *indio_dev, +@@ -172,7 +172,6 @@ static int stx104_write_raw(struct iio_d } static const struct iio_info stx104_info = { @@ -855,11 +745,9 @@ index 2da741d27540..17b021f33180 100644 .read_raw = stx104_read_raw, .write_raw = stx104_write_raw }; -diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c -index 137f577d9432..a146160d9966 100644 --- a/drivers/iio/adc/sun4i-gpadc-iio.c +++ b/drivers/iio/adc/sun4i-gpadc-iio.c -@@ -352,7 +352,6 @@ static int sun4i_gpadc_read_raw(struct iio_dev *indio_dev, +@@ -352,7 +352,6 @@ static int sun4i_gpadc_read_raw(struct i static const struct iio_info sun4i_gpadc_iio_info = { .read_raw = sun4i_gpadc_read_raw, @@ -867,11 +755,9 @@ index 137f577d9432..a146160d9966 100644 }; static irqreturn_t sun4i_gpadc_temp_data_irq_handler(int irq, void *dev_id) -diff --git a/drivers/iio/adc/ti-adc081c.c b/drivers/iio/adc/ti-adc081c.c -index 319172cf7da8..405e3779c0c5 100644 --- a/drivers/iio/adc/ti-adc081c.c +++ b/drivers/iio/adc/ti-adc081c.c -@@ -124,7 +124,6 @@ static struct adcxx1c_model adcxx1c_models[] = { +@@ -124,7 +124,6 @@ static struct adcxx1c_model adcxx1c_mode static const struct iio_info adc081c_info = { .read_raw = adc081c_read_raw, @@ -879,11 +765,9 @@ index 319172cf7da8..405e3779c0c5 100644 }; static irqreturn_t adc081c_trigger_handler(int irq, void *p) -diff --git a/drivers/iio/adc/ti-adc0832.c b/drivers/iio/adc/ti-adc0832.c -index e952e94a14af..188dae705bf7 100644 --- a/drivers/iio/adc/ti-adc0832.c +++ b/drivers/iio/adc/ti-adc0832.c -@@ -195,7 +195,6 @@ static int adc0832_read_raw(struct iio_dev *iio, +@@ -195,7 +195,6 @@ static int adc0832_read_raw(struct iio_d static const struct iio_info adc0832_info = { .read_raw = adc0832_read_raw, @@ -891,11 +775,9 @@ index e952e94a14af..188dae705bf7 100644 }; static irqreturn_t adc0832_trigger_handler(int irq, void *p) -diff --git a/drivers/iio/adc/ti-adc084s021.c b/drivers/iio/adc/ti-adc084s021.c -index a355121c11a4..25504640e126 100644 --- a/drivers/iio/adc/ti-adc084s021.c +++ b/drivers/iio/adc/ti-adc084s021.c -@@ -186,7 +186,6 @@ static int adc084s021_buffer_postdisable(struct iio_dev *indio_dev) +@@ -186,7 +186,6 @@ static int adc084s021_buffer_postdisable static const struct iio_info adc084s021_info = { .read_raw = adc084s021_read_raw, @@ -903,11 +785,9 @@ index a355121c11a4..25504640e126 100644 }; static const struct iio_buffer_setup_ops adc084s021_buffer_setup_ops = { -diff --git a/drivers/iio/adc/ti-adc108s102.c b/drivers/iio/adc/ti-adc108s102.c -index de4e5ac98c6e..841203edaac5 100644 --- a/drivers/iio/adc/ti-adc108s102.c +++ b/drivers/iio/adc/ti-adc108s102.c -@@ -220,7 +220,6 @@ static int adc108s102_read_raw(struct iio_dev *indio_dev, +@@ -220,7 +220,6 @@ static int adc108s102_read_raw(struct ii static const struct iio_info adc108s102_info = { .read_raw = &adc108s102_read_raw, .update_scan_mode = &adc108s102_update_scan_mode, @@ -915,11 +795,9 @@ index de4e5ac98c6e..841203edaac5 100644 }; static int adc108s102_probe(struct spi_device *spi) -diff --git a/drivers/iio/adc/ti-adc12138.c b/drivers/iio/adc/ti-adc12138.c -index 072f03bfe6a0..bf890244789a 100644 --- a/drivers/iio/adc/ti-adc12138.c +++ b/drivers/iio/adc/ti-adc12138.c -@@ -277,7 +277,6 @@ static int adc12138_read_raw(struct iio_dev *iio, +@@ -277,7 +277,6 @@ static int adc12138_read_raw(struct iio_ static const struct iio_info adc12138_info = { .read_raw = adc12138_read_raw, @@ -927,11 +805,9 @@ index 072f03bfe6a0..bf890244789a 100644 }; static int adc12138_init(struct adc12138 *adc) -diff --git a/drivers/iio/adc/ti-adc128s052.c b/drivers/iio/adc/ti-adc128s052.c -index 89dfbd31be5c..7cf39b3e2416 100644 --- a/drivers/iio/adc/ti-adc128s052.c +++ b/drivers/iio/adc/ti-adc128s052.c -@@ -130,7 +130,6 @@ static const struct adc128_configuration adc128_config[] = { +@@ -130,7 +130,6 @@ static const struct adc128_configuration static const struct iio_info adc128_info = { .read_raw = adc128_read_raw, @@ -939,11 +815,9 @@ index 89dfbd31be5c..7cf39b3e2416 100644 }; static int adc128_probe(struct spi_device *spi) -diff --git a/drivers/iio/adc/ti-adc161s626.c b/drivers/iio/adc/ti-adc161s626.c -index 4836a0d7aef5..10fa7677ac4b 100644 --- a/drivers/iio/adc/ti-adc161s626.c +++ b/drivers/iio/adc/ti-adc161s626.c -@@ -173,7 +173,6 @@ static int ti_adc_read_raw(struct iio_dev *indio_dev, +@@ -173,7 +173,6 @@ static int ti_adc_read_raw(struct iio_de } static const struct iio_info ti_adc_info = { @@ -951,11 +825,9 @@ index 4836a0d7aef5..10fa7677ac4b 100644 .read_raw = ti_adc_read_raw, }; -diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c -index 9ac2fb032df6..344b768a5c49 100644 --- a/drivers/iio/adc/ti-ads1015.c +++ b/drivers/iio/adc/ti-ads1015.c -@@ -822,7 +822,6 @@ static const struct attribute_group ads1115_attribute_group = { +@@ -822,7 +822,6 @@ static const struct attribute_group ads1 }; static const struct iio_info ads1015_info = { @@ -963,7 +835,7 @@ index 9ac2fb032df6..344b768a5c49 100644 .read_raw = ads1015_read_raw, .write_raw = ads1015_write_raw, .read_event_value = ads1015_read_event, -@@ -833,7 +832,6 @@ static const struct iio_info ads1015_info = { +@@ -833,7 +832,6 @@ static const struct iio_info ads1015_inf }; static const struct iio_info ads1115_info = { @@ -971,11 +843,9 @@ index 9ac2fb032df6..344b768a5c49 100644 .read_raw = ads1015_read_raw, .write_raw = ads1015_write_raw, .read_event_value = ads1015_read_event, -diff --git a/drivers/iio/adc/ti-ads7950.c b/drivers/iio/adc/ti-ads7950.c -index a376190914ad..0225c1b333ab 100644 --- a/drivers/iio/adc/ti-ads7950.c +++ b/drivers/iio/adc/ti-ads7950.c -@@ -372,7 +372,6 @@ static int ti_ads7950_read_raw(struct iio_dev *indio_dev, +@@ -372,7 +372,6 @@ static int ti_ads7950_read_raw(struct ii static const struct iio_info ti_ads7950_info = { .read_raw = &ti_ads7950_read_raw, .update_scan_mode = ti_ads7950_update_scan_mode, @@ -983,11 +853,9 @@ index a376190914ad..0225c1b333ab 100644 }; static int ti_ads7950_probe(struct spi_device *spi) -diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c -index 4a163496d9e4..ff4756352ac1 100644 --- a/drivers/iio/adc/ti-ads8688.c +++ b/drivers/iio/adc/ti-ads8688.c -@@ -369,7 +369,6 @@ static const struct iio_info ads8688_info = { +@@ -369,7 +369,6 @@ static const struct iio_info ads8688_inf .write_raw = &ads8688_write_raw, .write_raw_get_fmt = &ads8688_write_raw_get_fmt, .attrs = &ads8688_attribute_group, @@ -995,11 +863,9 @@ index 4a163496d9e4..ff4756352ac1 100644 }; static const struct ads8688_chip_info ads8688_chip_info_tbl[] = { -diff --git a/drivers/iio/adc/ti-tlc4541.c b/drivers/iio/adc/ti-tlc4541.c -index 78d91a069ea4..2290024c89fc 100644 --- a/drivers/iio/adc/ti-tlc4541.c +++ b/drivers/iio/adc/ti-tlc4541.c -@@ -157,7 +157,6 @@ static int tlc4541_read_raw(struct iio_dev *indio_dev, +@@ -157,7 +157,6 @@ static int tlc4541_read_raw(struct iio_d static const struct iio_info tlc4541_info = { .read_raw = &tlc4541_read_raw, @@ -1007,11 +873,9 @@ index 78d91a069ea4..2290024c89fc 100644 }; static int tlc4541_probe(struct spi_device *spi) -diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c -index 6cbed7eb118a..b3e573cc6f5f 100644 --- a/drivers/iio/adc/ti_am335x_adc.c +++ b/drivers/iio/adc/ti_am335x_adc.c -@@ -533,7 +533,6 @@ static int tiadc_read_raw(struct iio_dev *indio_dev, +@@ -533,7 +533,6 @@ err_unlock: static const struct iio_info tiadc_info = { .read_raw = &tiadc_read_raw, @@ -1019,11 +883,9 @@ index 6cbed7eb118a..b3e573cc6f5f 100644 }; static int tiadc_request_dma(struct platform_device *pdev, -diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c -index e3cfb91bffc6..8c019bb6625f 100644 --- a/drivers/iio/adc/twl4030-madc.c +++ b/drivers/iio/adc/twl4030-madc.c -@@ -212,7 +212,6 @@ static int twl4030_madc_read(struct iio_dev *iio_dev, +@@ -212,7 +212,6 @@ static int twl4030_madc_read(struct iio_ static const struct iio_info twl4030_madc_iio_info = { .read_raw = &twl4030_madc_read, @@ -1031,11 +893,9 @@ index e3cfb91bffc6..8c019bb6625f 100644 }; #define TWL4030_ADC_CHANNEL(_channel, _type, _name) { \ -diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c -index bc0e60b9da45..dc83f8f6c3d3 100644 --- a/drivers/iio/adc/twl6030-gpadc.c +++ b/drivers/iio/adc/twl6030-gpadc.c -@@ -843,7 +843,6 @@ static const struct iio_chan_spec twl6032_gpadc_iio_channels[] = { +@@ -843,7 +843,6 @@ static const struct iio_chan_spec twl603 static const struct iio_info twl6030_gpadc_iio_info = { .read_raw = &twl6030_gpadc_read_raw, @@ -1043,11 +903,9 @@ index bc0e60b9da45..dc83f8f6c3d3 100644 }; static const struct twl6030_gpadc_platform_data twl6030_pdata = { -diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c -index c168e0db329a..bbcb7a4d7edf 100644 --- a/drivers/iio/adc/vf610_adc.c +++ b/drivers/iio/adc/vf610_adc.c -@@ -799,7 +799,6 @@ static int vf610_adc_reg_access(struct iio_dev *indio_dev, +@@ -799,7 +799,6 @@ static int vf610_adc_reg_access(struct i } static const struct iio_info vf610_adc_iio_info = { @@ -1055,11 +913,9 @@ index c168e0db329a..bbcb7a4d7edf 100644 .read_raw = &vf610_read_raw, .write_raw = &vf610_write_raw, .debugfs_reg_access = &vf610_adc_reg_access, -diff --git a/drivers/iio/adc/viperboard_adc.c b/drivers/iio/adc/viperboard_adc.c -index 3be2e35721cc..53eb5a4136fe 100644 --- a/drivers/iio/adc/viperboard_adc.c +++ b/drivers/iio/adc/viperboard_adc.c -@@ -107,7 +107,6 @@ static int vprbrd_iio_read_raw(struct iio_dev *iio_dev, +@@ -107,7 +107,6 @@ error: static const struct iio_info vprbrd_adc_iio_info = { .read_raw = &vprbrd_iio_read_raw, @@ -1067,11 +923,9 @@ index 3be2e35721cc..53eb5a4136fe 100644 }; static int vprbrd_adc_probe(struct platform_device *pdev) -diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c -index 4a60497a1f19..d4f21d1be6c8 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c -@@ -675,7 +675,6 @@ static int xadc_trigger_set_state(struct iio_trigger *trigger, bool state) +@@ -675,7 +675,6 @@ err_out: } static const struct iio_trigger_ops xadc_trigger_ops = { @@ -1079,7 +933,7 @@ index 4a60497a1f19..d4f21d1be6c8 100644 .set_trigger_state = &xadc_trigger_set_state, }; -@@ -1028,7 +1027,6 @@ static const struct iio_info xadc_info = { +@@ -1028,7 +1027,6 @@ static const struct iio_info xadc_info = .read_event_value = &xadc_read_event_value, .write_event_value = &xadc_write_event_value, .update_scan_mode = &xadc_update_scan_mode, @@ -1087,6 +941,3 @@ index 4a60497a1f19..d4f21d1be6c8 100644 }; static const struct of_device_id xadc_of_match_table[] = { --- -2.19.0 - diff --git a/patches/0161-spi-rspi-Use-of_device_get_match_data-helper.patch b/patches/0161-spi-rspi-Use-of_device_get_match_data-helper.patch index 91eef02994f9b..a8c96eb9f422e 100644 --- a/patches/0161-spi-rspi-Use-of_device_get_match_data-helper.patch +++ b/patches/0161-spi-rspi-Use-of_device_get_match_data-helper.patch @@ -11,14 +11,12 @@ Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/spi/spi-rspi.c | 6 ++---- + drivers/spi/spi-rspi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c -index 2a10b3f94ff7..2ce875764ca6 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c -@@ -1221,7 +1221,6 @@ static int rspi_probe(struct platform_device *pdev) +@@ -1223,7 +1223,6 @@ static int rspi_probe(struct platform_de struct spi_master *master; struct rspi_data *rspi; int ret; @@ -26,7 +24,7 @@ index 2a10b3f94ff7..2ce875764ca6 100644 const struct rspi_plat_data *rspi_pd; const struct spi_ops *ops; -@@ -1229,9 +1228,8 @@ static int rspi_probe(struct platform_device *pdev) +@@ -1231,9 +1230,8 @@ static int rspi_probe(struct platform_de if (master == NULL) return -ENOMEM; @@ -38,6 +36,3 @@ index 2a10b3f94ff7..2ce875764ca6 100644 ret = rspi_parse_dt(&pdev->dev, master); if (ret) goto error1; --- -2.19.0 - diff --git a/patches/0184-spi-sh-msiof-Add-compatible-strings-for-r8a774-35.patch b/patches/0184-spi-sh-msiof-Add-compatible-strings-for-r8a774-35.patch index 67e0eb3d93fd2..f2116b41946ff 100644 --- a/patches/0184-spi-sh-msiof-Add-compatible-strings-for-r8a774-35.patch +++ b/patches/0184-spi-sh-msiof-Add-compatible-strings-for-r8a774-35.patch @@ -10,14 +10,12 @@ Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/spi/spi-sh-msiof.c | 2 ++ + drivers/spi/spi-sh-msiof.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c -index 0fea18ab970e..aa34f5ef53f7 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c -@@ -1047,6 +1047,8 @@ static const struct sh_msiof_chipdata rcar_gen3_data = { +@@ -1048,6 +1048,8 @@ static const struct sh_msiof_chipdata rc static const struct of_device_id sh_msiof_match[] = { { .compatible = "renesas,sh-mobile-msiof", .data = &sh_data }, @@ -26,6 +24,3 @@ index 0fea18ab970e..aa34f5ef53f7 100644 { .compatible = "renesas,msiof-r8a7790", .data = &rcar_gen2_data }, { .compatible = "renesas,msiof-r8a7791", .data = &rcar_gen2_data }, { .compatible = "renesas,msiof-r8a7792", .data = &rcar_gen2_data }, --- -2.19.0 - diff --git a/patches/0186-spi-sh-msiof-Use-of_device_get_match_data-helper.patch b/patches/0186-spi-sh-msiof-Use-of_device_get_match_data-helper.patch index db948783f681c..b904a5c8a8f35 100644 --- a/patches/0186-spi-sh-msiof-Use-of_device_get_match_data-helper.patch +++ b/patches/0186-spi-sh-msiof-Use-of_device_get_match_data-helper.patch @@ -12,14 +12,12 @@ Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/spi/spi-sh-msiof.c | 6 ++---- + drivers/spi/spi-sh-msiof.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c -index aa34f5ef53f7..a6e0c9cee35d 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c -@@ -1237,15 +1237,13 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) +@@ -1238,15 +1238,13 @@ static int sh_msiof_spi_probe(struct pla struct resource *r; struct spi_master *master; const struct sh_msiof_chipdata *chipdata; @@ -37,6 +35,3 @@ index aa34f5ef53f7..a6e0c9cee35d 100644 info = sh_msiof_spi_parse_dt(&pdev->dev); } else { chipdata = (const void *)pdev->id_entry->driver_data; --- -2.19.0 - diff --git a/patches/0187-spi-sh-msiof-remove-redundant-pointer-dev.patch b/patches/0187-spi-sh-msiof-remove-redundant-pointer-dev.patch index 673eb6fa97e32..36709c1d72611 100644 --- a/patches/0187-spi-sh-msiof-remove-redundant-pointer-dev.patch +++ b/patches/0187-spi-sh-msiof-remove-redundant-pointer-dev.patch @@ -15,14 +15,12 @@ Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/spi/spi-sh-msiof.c | 2 -- + drivers/spi/spi-sh-msiof.c | 2 -- 1 file changed, 2 deletions(-) -diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c -index a6e0c9cee35d..e607e224bb7c 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c -@@ -1216,12 +1216,10 @@ static int sh_msiof_request_dma(struct sh_msiof_spi_priv *p) +@@ -1217,12 +1217,10 @@ free_tx_chan: static void sh_msiof_release_dma(struct sh_msiof_spi_priv *p) { struct spi_master *master = p->master; @@ -35,6 +33,3 @@ index a6e0c9cee35d..e607e224bb7c 100644 dma_unmap_single(master->dma_rx->device->dev, p->rx_dma_addr, PAGE_SIZE, DMA_FROM_DEVICE); dma_unmap_single(master->dma_tx->device->dev, p->tx_dma_addr, --- -2.19.0 - diff --git a/patches/0224-serial-sh-sci-Support-for-variable-HSCIF-hardware-RX.patch b/patches/0224-serial-sh-sci-Support-for-variable-HSCIF-hardware-RX.patch index 61d44362eb3d0..c17642ac989cd 100644 --- a/patches/0224-serial-sh-sci-Support-for-variable-HSCIF-hardware-RX.patch +++ b/patches/0224-serial-sh-sci-Support-for-variable-HSCIF-hardware-RX.patch @@ -16,12 +16,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/tty/serial/sh-sci.c | 52 ++++++++++++++++++++++++++----------- - drivers/tty/serial/sh-sci.h | 3 +++ + drivers/tty/serial/sh-sci.c | 52 +++++++++++++++++++++++++++++++------------- + drivers/tty/serial/sh-sci.h | 3 ++ 2 files changed, 40 insertions(+), 15 deletions(-) -diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c -index 5d33bc1a0e09..6c9f99e67c13 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -149,6 +149,7 @@ struct sci_port { @@ -32,7 +30,7 @@ index 5d33bc1a0e09..6c9f99e67c13 100644 bool has_rtscts; bool autorts; -@@ -1106,8 +1107,14 @@ static ssize_t rx_fifo_timeout_show(struct device *dev, +@@ -1106,8 +1107,14 @@ static ssize_t rx_fifo_timeout_show(stru { struct uart_port *port = dev_get_drvdata(dev); struct sci_port *sci = to_sci_port(port); @@ -48,7 +46,7 @@ index 5d33bc1a0e09..6c9f99e67c13 100644 } static ssize_t rx_fifo_timeout_store(struct device *dev, -@@ -1123,11 +1130,19 @@ static ssize_t rx_fifo_timeout_store(struct device *dev, +@@ -1123,11 +1130,19 @@ static ssize_t rx_fifo_timeout_store(str ret = kstrtol(buf, 0, &r); if (ret) return ret; @@ -73,7 +71,7 @@ index 5d33bc1a0e09..6c9f99e67c13 100644 return count; } -@@ -2044,9 +2059,13 @@ static void sci_shutdown(struct uart_port *port) +@@ -2044,9 +2059,13 @@ static void sci_shutdown(struct uart_por spin_lock_irqsave(&port->lock, flags); sci_stop_rx(port); sci_stop_tx(port); @@ -89,7 +87,7 @@ index 5d33bc1a0e09..6c9f99e67c13 100644 spin_unlock_irqrestore(&port->lock, flags); #ifdef CONFIG_SERIAL_SH_SCI_DMA -@@ -2193,7 +2212,7 @@ static void sci_reset(struct uart_port *port) +@@ -2195,7 +2214,7 @@ static void sci_reset(struct uart_port * unsigned int status; struct sci_port *s = to_sci_port(port); @@ -98,7 +96,7 @@ index 5d33bc1a0e09..6c9f99e67c13 100644 reg = sci_getreg(port, SCFCR); if (reg->size) -@@ -2363,7 +2382,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2365,7 +2384,7 @@ done: dev_dbg(port->dev, "SCR 0x%x SMR 0x%x BRR %u CKS 0x%x DL %u SRR %u\n", scr_val, smr_val, brr, sccks, dl, srr); @@ -107,7 +105,7 @@ index 5d33bc1a0e09..6c9f99e67c13 100644 serial_port_out(port, SCSMR, smr_val); serial_port_out(port, SCBRR, brr); if (sci_getreg(port, HSSRR)->size) -@@ -2377,7 +2396,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2379,7 +2398,7 @@ done: smr_val |= serial_port_in(port, SCSMR) & (SCSMR_CKEDG | SCSMR_SRC_MASK | SCSMR_CKS); dev_dbg(port->dev, "SCR 0x%x SMR 0x%x\n", scr_val, smr_val); @@ -116,7 +114,7 @@ index 5d33bc1a0e09..6c9f99e67c13 100644 serial_port_out(port, SCSMR, smr_val); } -@@ -2414,7 +2433,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2416,7 +2435,7 @@ done: scr_val |= SCSCR_RE | SCSCR_TE | (s->cfg->scscr & ~(SCSCR_CKE1 | SCSCR_CKE0)); dev_dbg(port->dev, "SCSCR 0x%x\n", scr_val); @@ -125,7 +123,7 @@ index 5d33bc1a0e09..6c9f99e67c13 100644 if ((srr + 1 == 5) && (port->type == PORT_SCIFA || port->type == PORT_SCIFB)) { /* -@@ -2780,6 +2799,7 @@ static int sci_init_single(struct platform_device *dev, +@@ -2782,6 +2801,7 @@ static int sci_init_single(struct platfo } sci_port->rx_fifo_timeout = 0; @@ -133,7 +131,7 @@ index 5d33bc1a0e09..6c9f99e67c13 100644 /* SCIFA on sh7723 and sh7724 need a custom sampling rate that doesn't * match the SoC datasheet, this should be investigated. Let platform -@@ -2866,7 +2886,7 @@ static void serial_console_write(struct console *co, const char *s, +@@ -2868,7 +2888,7 @@ static void serial_console_write(struct ctrl_temp = SCSCR_RE | SCSCR_TE | (sci_port->cfg->scscr & ~(SCSCR_CKE1 | SCSCR_CKE0)) | (ctrl & (SCSCR_CKE1 | SCSCR_CKE0)); @@ -142,7 +140,7 @@ index 5d33bc1a0e09..6c9f99e67c13 100644 uart_console_write(port, s, count, serial_console_putchar); -@@ -2993,7 +3013,8 @@ static int sci_remove(struct platform_device *dev) +@@ -2995,7 +3015,8 @@ static int sci_remove(struct platform_de sysfs_remove_file(&dev->dev.kobj, &dev_attr_rx_fifo_trigger.attr); } @@ -152,7 +150,7 @@ index 5d33bc1a0e09..6c9f99e67c13 100644 sysfs_remove_file(&dev->dev.kobj, &dev_attr_rx_fifo_timeout.attr); } -@@ -3182,7 +3203,8 @@ static int sci_probe(struct platform_device *dev) +@@ -3184,7 +3205,8 @@ static int sci_probe(struct platform_dev if (ret) return ret; } @@ -162,8 +160,6 @@ index 5d33bc1a0e09..6c9f99e67c13 100644 ret = sysfs_create_file(&dev->dev.kobj, &dev_attr_rx_fifo_timeout.attr); if (ret) { -diff --git a/drivers/tty/serial/sh-sci.h b/drivers/tty/serial/sh-sci.h -index 938e23a2d166..a5f792fd48d9 100644 --- a/drivers/tty/serial/sh-sci.h +++ b/drivers/tty/serial/sh-sci.h @@ -63,6 +63,9 @@ enum { @@ -176,6 +172,3 @@ index 938e23a2d166..a5f792fd48d9 100644 /* SCxSR (Serial Status Register) on SCI */ #define SCI_TDRE BIT(7) /* Transmit Data Register Empty */ #define SCI_RDRF BIT(6) /* Receive Data Register Full */ --- -2.19.0 - diff --git a/patches/0225-serial-sh-sci-Use-of_device_get_match_data-helper.patch b/patches/0225-serial-sh-sci-Use-of_device_get_match_data-helper.patch index 201924a7d8777..ca3faaf0050c6 100644 --- a/patches/0225-serial-sh-sci-Use-of_device_get_match_data-helper.patch +++ b/patches/0225-serial-sh-sci-Use-of_device_get_match_data-helper.patch @@ -14,11 +14,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/tty/serial/sh-sci.c | 11 +++++------ + drivers/tty/serial/sh-sci.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c -index 6c9f99e67c13..2ce33146928c 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -37,6 +37,7 @@ @@ -29,7 +27,7 @@ index 6c9f99e67c13..2ce33146928c 100644 #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/scatterlist.h> -@@ -3070,17 +3071,15 @@ static struct plat_sci_port *sci_parse_dt(struct platform_device *pdev, +@@ -3072,17 +3073,15 @@ static struct plat_sci_port *sci_parse_d unsigned int *dev_id) { struct device_node *np = pdev->dev.of_node; @@ -49,7 +47,7 @@ index 6c9f99e67c13..2ce33146928c 100644 p = devm_kzalloc(&pdev->dev, sizeof(struct plat_sci_port), GFP_KERNEL); if (!p) -@@ -3100,8 +3099,8 @@ static struct plat_sci_port *sci_parse_dt(struct platform_device *pdev, +@@ -3102,8 +3101,8 @@ static struct plat_sci_port *sci_parse_d sp = &sci_ports[id]; *dev_id = id; @@ -60,6 +58,3 @@ index 6c9f99e67c13..2ce33146928c 100644 sp->has_rtscts = of_property_read_bool(np, "uart-has-rtscts"); --- -2.19.0 - diff --git a/patches/0226-serial-sh-sci-Fix-init-data-attribute-for-struct-por.patch b/patches/0226-serial-sh-sci-Fix-init-data-attribute-for-struct-por.patch index 80815e62def7a..d4b5687c0f79a 100644 --- a/patches/0226-serial-sh-sci-Fix-init-data-attribute-for-struct-por.patch +++ b/patches/0226-serial-sh-sci-Fix-init-data-attribute-for-struct-por.patch @@ -20,14 +20,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/serial/sh-sci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c -index 2ce33146928c..7a6b896a2324 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -3274,7 +3274,7 @@ early_platform_init_buffer("earlyprintk", &sci_driver, +@@ -3276,7 +3276,7 @@ early_platform_init_buffer("earlyprintk" early_serial_buf, ARRAY_SIZE(early_serial_buf)); #endif #ifdef CONFIG_SERIAL_SH_SCI_EARLYCON @@ -36,6 +34,3 @@ index 2ce33146928c..7a6b896a2324 100644 static int __init early_console_setup(struct earlycon_device *device, int type) --- -2.19.0 - diff --git a/patches/0227-serial-sh-sci-Fix-unlocked-access-to-SCSCR-register.patch b/patches/0227-serial-sh-sci-Fix-unlocked-access-to-SCSCR-register.patch index a5df46bf3c7f5..242f20f687230 100644 --- a/patches/0227-serial-sh-sci-Fix-unlocked-access-to-SCSCR-register.patch +++ b/patches/0227-serial-sh-sci-Fix-unlocked-access-to-SCSCR-register.patch @@ -29,14 +29,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/tty/serial/sh-sci.c | 25 ++++++++++++++++--------- + drivers/tty/serial/sh-sci.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) -diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c -index 7a6b896a2324..78f862df4f6e 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -1225,8 +1225,11 @@ static void sci_rx_dma_release(struct sci_port *s, bool enable_pio) +@@ -1225,8 +1225,11 @@ static void sci_rx_dma_release(struct sc dma_free_coherent(chan->device->dev, s->buf_len_rx * 2, s->rx_buf[0], sg_dma_address(&s->sg_rx[0])); dma_release_channel(chan); @@ -49,7 +47,7 @@ index 7a6b896a2324..78f862df4f6e 100644 } static void sci_dma_rx_complete(void *arg) -@@ -1293,8 +1296,11 @@ static void sci_tx_dma_release(struct sci_port *s, bool enable_pio) +@@ -1293,8 +1296,11 @@ static void sci_tx_dma_release(struct sc dma_unmap_single(chan->device->dev, s->tx_dma_addr, UART_XMIT_SIZE, DMA_TO_DEVICE); dma_release_channel(chan); @@ -62,7 +60,7 @@ index 7a6b896a2324..78f862df4f6e 100644 } static void sci_submit_rx(struct sci_port *s) -@@ -2003,6 +2009,7 @@ static void sci_enable_ms(struct uart_port *port) +@@ -2003,6 +2009,7 @@ static void sci_enable_ms(struct uart_po static void sci_break_ctl(struct uart_port *port, int break_state) { unsigned short scscr, scsptr; @@ -70,7 +68,7 @@ index 7a6b896a2324..78f862df4f6e 100644 /* check wheter the port has SCSPTR */ if (!sci_getreg(port, SCSPTR)->size) { -@@ -2013,6 +2020,7 @@ static void sci_break_ctl(struct uart_port *port, int break_state) +@@ -2013,6 +2020,7 @@ static void sci_break_ctl(struct uart_po return; } @@ -78,7 +76,7 @@ index 7a6b896a2324..78f862df4f6e 100644 scsptr = serial_port_in(port, SCSPTR); scscr = serial_port_in(port, SCSCR); -@@ -2026,6 +2034,7 @@ static void sci_break_ctl(struct uart_port *port, int break_state) +@@ -2026,6 +2034,7 @@ static void sci_break_ctl(struct uart_po serial_port_out(port, SCSPTR, scsptr); serial_port_out(port, SCSCR, scscr); @@ -86,7 +84,7 @@ index 7a6b896a2324..78f862df4f6e 100644 } static int sci_startup(struct uart_port *port) -@@ -2254,6 +2263,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2256,6 +2265,7 @@ static void sci_set_termios(struct uart_ int min_err = INT_MAX, err; unsigned long max_freq = 0; int best_clk = -1; @@ -94,7 +92,7 @@ index 7a6b896a2324..78f862df4f6e 100644 if ((termios->c_cflag & CSIZE) == CS7) smr_val |= SCSMR_CHR; -@@ -2363,6 +2373,8 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2365,6 +2375,8 @@ done: serial_port_out(port, SCCKS, sccks); } @@ -103,7 +101,7 @@ index 7a6b896a2324..78f862df4f6e 100644 sci_reset(port); uart_update_timeout(port, termios->c_cflag, baud); -@@ -2380,9 +2392,6 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2382,9 +2394,6 @@ done: case 27: smr_val |= SCSMR_SRC_27; break; } smr_val |= cks; @@ -113,7 +111,7 @@ index 7a6b896a2324..78f862df4f6e 100644 serial_port_out(port, SCSCR, scr_val | s->hscif_tot); serial_port_out(port, SCSMR, smr_val); serial_port_out(port, SCBRR, brr); -@@ -2396,7 +2405,6 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2398,7 +2407,6 @@ done: scr_val = s->cfg->scscr & (SCSCR_CKE1 | SCSCR_CKE0); smr_val |= serial_port_in(port, SCSMR) & (SCSMR_CKEDG | SCSMR_SRC_MASK | SCSMR_CKS); @@ -121,7 +119,7 @@ index 7a6b896a2324..78f862df4f6e 100644 serial_port_out(port, SCSCR, scr_val | s->hscif_tot); serial_port_out(port, SCSMR, smr_val); } -@@ -2433,7 +2441,6 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2435,7 +2443,6 @@ done: scr_val |= SCSCR_RE | SCSCR_TE | (s->cfg->scscr & ~(SCSCR_CKE1 | SCSCR_CKE0)); @@ -129,7 +127,7 @@ index 7a6b896a2324..78f862df4f6e 100644 serial_port_out(port, SCSCR, scr_val | s->hscif_tot); if ((srr + 1 == 5) && (port->type == PORT_SCIFA || port->type == PORT_SCIFB)) { -@@ -2480,8 +2487,6 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2482,8 +2489,6 @@ done: s->rx_frame = (100 * bits * HZ) / (baud / 10); #ifdef CONFIG_SERIAL_SH_SCI_DMA s->rx_timeout = DIV_ROUND_UP(s->buf_len_rx * 2 * s->rx_frame, 1000); @@ -138,7 +136,7 @@ index 7a6b896a2324..78f862df4f6e 100644 if (s->rx_timeout < msecs_to_jiffies(20)) s->rx_timeout = msecs_to_jiffies(20); #endif -@@ -2489,6 +2494,8 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2491,6 +2496,8 @@ done: if ((termios->c_cflag & CREAD) != 0) sci_start_rx(port); @@ -147,6 +145,3 @@ index 7a6b896a2324..78f862df4f6e 100644 sci_port_disable(s); if (UART_ENABLE_MS(port, termios->c_cflag)) --- -2.19.0 - diff --git a/patches/0849-spi-sh-msiof-Use-correct-enum-for-DMA-transfer-direc.patch b/patches/0849-spi-sh-msiof-Use-correct-enum-for-DMA-transfer-direc.patch index 2bd69c38ce67a..65db43a75dc22 100644 --- a/patches/0849-spi-sh-msiof-Use-correct-enum-for-DMA-transfer-direc.patch +++ b/patches/0849-spi-sh-msiof-Use-correct-enum-for-DMA-transfer-direc.patch @@ -30,14 +30,12 @@ Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/spi/spi-sh-msiof.c | 4 ++-- + drivers/spi/spi-sh-msiof.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c -index e607e224bb7c..c1ea7965fe27 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c -@@ -739,7 +739,7 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, +@@ -740,7 +740,7 @@ static int sh_msiof_dma_once(struct sh_m if (rx) { ier_bits |= IER_RDREQE | IER_RDMAE; desc_rx = dmaengine_prep_slave_single(p->master->dma_rx, @@ -46,7 +44,7 @@ index e607e224bb7c..c1ea7965fe27 100644 DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc_rx) return -EAGAIN; -@@ -756,7 +756,7 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, +@@ -757,7 +757,7 @@ static int sh_msiof_dma_once(struct sh_m dma_sync_single_for_device(p->master->dma_tx->device->dev, p->tx_dma_addr, len, DMA_TO_DEVICE); desc_tx = dmaengine_prep_slave_single(p->master->dma_tx, @@ -55,6 +53,3 @@ index e607e224bb7c..c1ea7965fe27 100644 DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc_tx) { ret = -EAGAIN; --- -2.19.0 - diff --git a/patches/0940-treewide-setup_timer-timer_setup.patch b/patches/0940-treewide-setup_timer-timer_setup.patch index 98af201ba0622..2dd36697915ed 100644 --- a/patches/0940-treewide-setup_timer-timer_setup.patch +++ b/patches/0940-treewide-setup_timer-timer_setup.patch @@ -712,14 +712,12 @@ Conflicts: net/x25/x25_link.c net/xfrm/xfrm_state.c --- - drivers/tty/serial/sh-sci.c | 16 +++++++--------- + drivers/tty/serial/sh-sci.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) -diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c -index 86b928e71dd9..a8a6ae8c3c57 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -1060,9 +1060,9 @@ static int scif_rtrg_enabled(struct uart_port *port) +@@ -1060,9 +1060,9 @@ static int scif_rtrg_enabled(struct uart (SCFCR_RTRG0 | SCFCR_RTRG1)) != 0; } @@ -731,7 +729,7 @@ index 86b928e71dd9..a8a6ae8c3c57 100644 struct uart_port *port = &s->port; dev_dbg(port->dev, "Rx timed out\n"); -@@ -1140,8 +1140,7 @@ static ssize_t rx_fifo_timeout_store(struct device *dev, +@@ -1140,8 +1140,7 @@ static ssize_t rx_fifo_timeout_store(str sci->rx_fifo_timeout = r; scif_set_rtrg(port, 1); if (r > 0) @@ -741,7 +739,7 @@ index 86b928e71dd9..a8a6ae8c3c57 100644 } return count; -@@ -1394,9 +1393,9 @@ static void work_fn_tx(struct work_struct *work) +@@ -1394,9 +1393,9 @@ static void work_fn_tx(struct work_struc dma_async_issue_pending(chan); } @@ -753,7 +751,7 @@ index 86b928e71dd9..a8a6ae8c3c57 100644 struct dma_chan *chan = s->chan_rx; struct uart_port *port = &s->port; struct dma_tx_state state; -@@ -1574,7 +1573,7 @@ static void sci_request_dma(struct uart_port *port) +@@ -1574,7 +1573,7 @@ static void sci_request_dma(struct uart_ dma += s->buf_len_rx; } @@ -762,7 +760,7 @@ index 86b928e71dd9..a8a6ae8c3c57 100644 if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) sci_submit_rx(s); -@@ -2240,8 +2239,7 @@ static void sci_reset(struct uart_port *port) +@@ -2242,8 +2241,7 @@ static void sci_reset(struct uart_port * if (s->rx_trigger > 1) { if (s->rx_fifo_timeout) { scif_set_rtrg(port, 1); @@ -772,6 +770,3 @@ index 86b928e71dd9..a8a6ae8c3c57 100644 } else { if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) --- -2.19.0 - diff --git a/patches/0942-serial-sh-sci-use-hrtimer-for-receive-timeout.patch b/patches/0942-serial-sh-sci-use-hrtimer-for-receive-timeout.patch index 4179e202487b9..b63334cc1de7a 100644 --- a/patches/0942-serial-sh-sci-use-hrtimer-for-receive-timeout.patch +++ b/patches/0942-serial-sh-sci-use-hrtimer-for-receive-timeout.patch @@ -13,11 +13,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/tty/serial/sh-sci.c | 47 +++++++++++++++++++++++-------------- + drivers/tty/serial/sh-sci.c | 47 ++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 17 deletions(-) -diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c -index a8a6ae8c3c57..2051a5309851 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -33,6 +33,7 @@ @@ -39,7 +37,7 @@ index a8a6ae8c3c57..2051a5309851 100644 #endif unsigned int rx_frame; int rx_trigger; -@@ -1231,6 +1232,15 @@ static void sci_rx_dma_release(struct sci_port *s, bool enable_pio) +@@ -1231,6 +1232,15 @@ static void sci_rx_dma_release(struct sc } } @@ -55,7 +53,7 @@ index a8a6ae8c3c57..2051a5309851 100644 static void sci_dma_rx_complete(void *arg) { struct sci_port *s = arg; -@@ -1249,7 +1259,7 @@ static void sci_dma_rx_complete(void *arg) +@@ -1249,7 +1259,7 @@ static void sci_dma_rx_complete(void *ar if (active >= 0) count = sci_dma_rx_push(s, s->rx_buf[active], s->buf_len_rx); @@ -64,7 +62,7 @@ index a8a6ae8c3c57..2051a5309851 100644 if (count) tty_flip_buffer_push(&port->state->port); -@@ -1393,9 +1403,9 @@ static void work_fn_tx(struct work_struct *work) +@@ -1393,9 +1403,9 @@ static void work_fn_tx(struct work_struc dma_async_issue_pending(chan); } @@ -76,7 +74,7 @@ index a8a6ae8c3c57..2051a5309851 100644 struct dma_chan *chan = s->chan_rx; struct uart_port *port = &s->port; struct dma_tx_state state; -@@ -1412,7 +1422,7 @@ static void rx_timer_fn(struct timer_list *t) +@@ -1412,7 +1422,7 @@ static void rx_timer_fn(struct timer_lis active = sci_dma_rx_find_active(s); if (active < 0) { spin_unlock_irqrestore(&port->lock, flags); @@ -85,7 +83,7 @@ index a8a6ae8c3c57..2051a5309851 100644 } status = dmaengine_tx_status(s->chan_rx, s->active_rx, &state); -@@ -1422,7 +1432,7 @@ static void rx_timer_fn(struct timer_list *t) +@@ -1422,7 +1432,7 @@ static void rx_timer_fn(struct timer_lis s->active_rx, active); /* Let packet complete handler take care of the packet */ @@ -94,7 +92,7 @@ index a8a6ae8c3c57..2051a5309851 100644 } dmaengine_pause(chan); -@@ -1437,7 +1447,7 @@ static void rx_timer_fn(struct timer_list *t) +@@ -1437,7 +1447,7 @@ static void rx_timer_fn(struct timer_lis if (status == DMA_COMPLETE) { spin_unlock_irqrestore(&port->lock, flags); dev_dbg(port->dev, "Transaction complete after DMA engine was stopped"); @@ -103,7 +101,7 @@ index a8a6ae8c3c57..2051a5309851 100644 } /* Handle incomplete DMA receive */ -@@ -1462,6 +1472,8 @@ static void rx_timer_fn(struct timer_list *t) +@@ -1462,6 +1472,8 @@ static void rx_timer_fn(struct timer_lis serial_port_out(port, SCSCR, scr | SCSCR_RIE); spin_unlock_irqrestore(&port->lock, flags); @@ -112,7 +110,7 @@ index a8a6ae8c3c57..2051a5309851 100644 } static struct dma_chan *sci_request_dma_chan(struct uart_port *port, -@@ -1573,7 +1585,8 @@ static void sci_request_dma(struct uart_port *port) +@@ -1573,7 +1585,8 @@ static void sci_request_dma(struct uart_ dma += s->buf_len_rx; } @@ -122,7 +120,7 @@ index a8a6ae8c3c57..2051a5309851 100644 if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) sci_submit_rx(s); -@@ -1632,9 +1645,9 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr) +@@ -1632,9 +1645,9 @@ static irqreturn_t sci_rx_interrupt(int /* Clear current interrupt */ serial_port_out(port, SCxSR, ssr & ~(SCIF_DR | SCxSR_RDxF(port))); @@ -134,7 +132,7 @@ index a8a6ae8c3c57..2051a5309851 100644 return IRQ_HANDLED; } -@@ -1645,7 +1658,7 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr) +@@ -1645,7 +1658,7 @@ static irqreturn_t sci_rx_interrupt(int scif_set_rtrg(port, s->rx_trigger); mod_timer(&s->rx_fifo_timer, jiffies + DIV_ROUND_UP( @@ -143,7 +141,7 @@ index a8a6ae8c3c57..2051a5309851 100644 } /* I think sci_receive_chars has to be called irrespective -@@ -2081,7 +2094,7 @@ static void sci_shutdown(struct uart_port *port) +@@ -2081,7 +2094,7 @@ static void sci_shutdown(struct uart_por if (s->chan_rx) { dev_dbg(port->dev, "%s(%d) deleting rx_timer\n", __func__, port->line); @@ -152,7 +150,7 @@ index a8a6ae8c3c57..2051a5309851 100644 } #endif -@@ -2482,11 +2495,11 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2484,11 +2497,11 @@ done: if (termios->c_cflag & PARENB) bits++; @@ -168,6 +166,3 @@ index a8a6ae8c3c57..2051a5309851 100644 #endif if ((termios->c_cflag & CREAD) != 0) --- -2.19.0 - diff --git a/patches/1241-spi-sh-msiof-Simplify-calculation-of-divisors-for-tr.patch b/patches/1241-spi-sh-msiof-Simplify-calculation-of-divisors-for-tr.patch index 23717d8dc9e86..728287064c7a9 100644 --- a/patches/1241-spi-sh-msiof-Simplify-calculation-of-divisors-for-tr.patch +++ b/patches/1241-spi-sh-msiof-Simplify-calculation-of-divisors-for-tr.patch @@ -22,11 +22,9 @@ Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/spi/spi-sh-msiof.c | 67 ++++++++++++++++++++------------------ + drivers/spi/spi-sh-msiof.c | 67 +++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 32 deletions(-) -diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c -index c1ea7965fe27..d1c51b49c8ce 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -38,7 +38,7 @@ struct sh_msiof_chipdata { @@ -47,7 +45,7 @@ index c1ea7965fe27..d1c51b49c8ce 100644 void *tx_dma_page; void *rx_dma_page; dma_addr_t tx_dma_addr; -@@ -243,43 +243,46 @@ static irqreturn_t sh_msiof_spi_irq(int irq, void *data) +@@ -243,43 +243,46 @@ static irqreturn_t sh_msiof_spi_irq(int return IRQ_HANDLED; } @@ -120,7 +118,7 @@ index c1ea7965fe27..d1c51b49c8ce 100644 sh_msiof_write(p, TSCR, scr); if (!(p->master->flags & SPI_MASTER_MUST_TX)) sh_msiof_write(p, RSCR, scr); -@@ -1028,21 +1031,21 @@ static const struct sh_msiof_chipdata sh_data = { +@@ -1029,21 +1032,21 @@ static const struct sh_msiof_chipdata sh .tx_fifo_size = 64, .rx_fifo_size = 64, .master_flags = 0, @@ -145,7 +143,7 @@ index c1ea7965fe27..d1c51b49c8ce 100644 }; static const struct of_device_id sh_msiof_match[] = { -@@ -1267,7 +1270,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) +@@ -1268,7 +1271,7 @@ static int sh_msiof_spi_probe(struct pla platform_set_drvdata(pdev, p); p->master = master; p->info = info; @@ -154,6 +152,3 @@ index c1ea7965fe27..d1c51b49c8ce 100644 init_completion(&p->done); --- -2.19.0 - diff --git a/patches/1262-serial-sh-sci-Add-support-for-dynamic-instances.patch b/patches/1262-serial-sh-sci-Add-support-for-dynamic-instances.patch index 91eb7d4204c4f..789655b32c86b 100644 --- a/patches/1262-serial-sh-sci-Add-support-for-dynamic-instances.patch +++ b/patches/1262-serial-sh-sci-Add-support-for-dynamic-instances.patch @@ -32,12 +32,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/tty/serial/Kconfig | 2 ++ - drivers/tty/serial/sh-sci.c | 8 ++++++++ + drivers/tty/serial/Kconfig | 2 ++ + drivers/tty/serial/sh-sci.c | 8 ++++++++ 2 files changed, 10 insertions(+) -diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig -index 3682fd3e960c..76005dc5f624 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -762,6 +762,8 @@ config SERIAL_SH_SCI @@ -49,8 +47,6 @@ index 3682fd3e960c..76005dc5f624 100644 depends on SERIAL_SH_SCI default "3" if H8300 default "10" if SUPERH -diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c -index 2051a5309851..59fac9761e9c 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -160,6 +160,7 @@ struct sci_port { @@ -61,7 +57,7 @@ index 2051a5309851..59fac9761e9c 100644 static struct uart_driver sci_uart_driver; static inline struct sci_port * -@@ -3024,6 +3025,7 @@ static int sci_remove(struct platform_device *dev) +@@ -3026,6 +3027,7 @@ static int sci_remove(struct platform_de { struct sci_port *port = platform_get_drvdata(dev); @@ -69,7 +65,7 @@ index 2051a5309851..59fac9761e9c 100644 uart_remove_one_port(&sci_uart_driver, &port->port); sci_cleanup_single(port); -@@ -3105,6 +3107,8 @@ static struct plat_sci_port *sci_parse_dt(struct platform_device *pdev, +@@ -3107,6 +3109,8 @@ static struct plat_sci_port *sci_parse_d /* Get the line number from the aliases node. */ id = of_alias_get_id(np, "serial"); @@ -78,7 +74,7 @@ index 2051a5309851..59fac9761e9c 100644 if (id < 0) { dev_err(&pdev->dev, "failed to get alias id (%d)\n", id); return NULL; -@@ -3139,6 +3143,9 @@ static int sci_probe_single(struct platform_device *dev, +@@ -3141,6 +3145,9 @@ static int sci_probe_single(struct platf dev_notice(&dev->dev, "Consider bumping CONFIG_SERIAL_SH_SCI_NR_UARTS!\n"); return -EINVAL; } @@ -88,7 +84,7 @@ index 2051a5309851..59fac9761e9c 100644 mutex_lock(&sci_uart_registration_lock); if (!sci_uart_driver.state) { -@@ -3237,6 +3244,7 @@ static int sci_probe(struct platform_device *dev) +@@ -3239,6 +3246,7 @@ static int sci_probe(struct platform_dev sh_bios_gdb_detach(); #endif @@ -96,6 +92,3 @@ index 2051a5309851..59fac9761e9c 100644 return 0; } --- -2.19.0 - diff --git a/patches/1263-serial-sh-sci-Support-for-HSCIF-RX-sampling-point-ad.patch b/patches/1263-serial-sh-sci-Support-for-HSCIF-RX-sampling-point-ad.patch index 8ef81688027a4..d01c3e0f5e77c 100644 --- a/patches/1263-serial-sh-sci-Support-for-HSCIF-RX-sampling-point-ad.patch +++ b/patches/1263-serial-sh-sci-Support-for-HSCIF-RX-sampling-point-ad.patch @@ -18,15 +18,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/tty/serial/sh-sci.c | 65 ++++++++++++++++++++++++------------- - drivers/tty/serial/sh-sci.h | 4 +++ + drivers/tty/serial/sh-sci.c | 65 ++++++++++++++++++++++++++++---------------- + drivers/tty/serial/sh-sci.h | 4 ++ 2 files changed, 46 insertions(+), 23 deletions(-) -diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c -index 59fac9761e9c..c181eb37f985 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -2391,6 +2391,27 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2393,6 +2393,27 @@ done: uart_update_timeout(port, termios->c_cflag, baud); @@ -54,7 +52,7 @@ index 59fac9761e9c..c181eb37f985 100644 if (best_clk >= 0) { if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) switch (srr + 1) { -@@ -2407,8 +2428,27 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2409,8 +2430,27 @@ done: serial_port_out(port, SCSCR, scr_val | s->hscif_tot); serial_port_out(port, SCSMR, smr_val); serial_port_out(port, SCBRR, brr); @@ -84,7 +82,7 @@ index 59fac9761e9c..c181eb37f985 100644 /* Wait one bit interval */ udelay((1000000 + (baud - 1)) / baud); -@@ -2475,27 +2515,6 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2477,27 +2517,6 @@ done: * value obtained by this formula is too small. Therefore, if the value * is smaller than 20ms, use 20ms as the timeout value for DMA. */ @@ -112,8 +110,6 @@ index 59fac9761e9c..c181eb37f985 100644 s->rx_frame = (10000 * bits) / (baud / 100); #ifdef CONFIG_SERIAL_SH_SCI_DMA s->rx_timeout = s->buf_len_rx * 2 * s->rx_frame; -diff --git a/drivers/tty/serial/sh-sci.h b/drivers/tty/serial/sh-sci.h -index a5f792fd48d9..0b9e804e61a9 100644 --- a/drivers/tty/serial/sh-sci.h +++ b/drivers/tty/serial/sh-sci.h @@ -130,6 +130,10 @@ enum { @@ -127,6 +123,3 @@ index a5f792fd48d9..0b9e804e61a9 100644 /* SCPCR (Serial Port Control Register), SCIFA/SCIFB only */ #define SCPCR_RTSC BIT(4) /* Serial Port RTS# Pin / Output Pin */ --- -2.19.0 - diff --git a/patches/1805-spi-sh-msiof-Make-sure-all-DMA-operations-have-compl.patch b/patches/1805-spi-sh-msiof-Make-sure-all-DMA-operations-have-compl.patch index 71b626a336824..0346f740b1d14 100644 --- a/patches/1805-spi-sh-msiof-Make-sure-all-DMA-operations-have-compl.patch +++ b/patches/1805-spi-sh-msiof-Make-sure-all-DMA-operations-have-compl.patch @@ -21,11 +21,9 @@ Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/spi/spi-sh-msiof.c | 53 +++++++++++++++++++++----------------- + drivers/spi/spi-sh-msiof.c | 53 ++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 24 deletions(-) -diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c -index d1c51b49c8ce..5cec432e04c0 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -48,6 +48,7 @@ struct sh_msiof_spi_priv { @@ -36,7 +34,7 @@ index d1c51b49c8ce..5cec432e04c0 100644 unsigned int tx_fifo_size; unsigned int rx_fifo_size; unsigned int min_div_pow; -@@ -633,19 +634,21 @@ static int sh_msiof_slave_abort(struct spi_master *master) +@@ -634,19 +635,21 @@ static int sh_msiof_slave_abort(struct s p->slave_aborted = true; complete(&p->done); @@ -61,7 +59,7 @@ index d1c51b49c8ce..5cec432e04c0 100644 dev_err(&p->pdev->dev, "timeout\n"); return -ETIMEDOUT; } -@@ -695,7 +698,7 @@ static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p, +@@ -696,7 +699,7 @@ static int sh_msiof_spi_txrx_once(struct } /* wait for tx fifo to be emptied / rx fifo to be filled */ @@ -70,7 +68,7 @@ index d1c51b49c8ce..5cec432e04c0 100644 if (ret) goto stop_reset; -@@ -724,10 +727,7 @@ static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p, +@@ -725,10 +728,7 @@ stop_ier: static void sh_msiof_dma_complete(void *arg) { @@ -82,7 +80,7 @@ index d1c51b49c8ce..5cec432e04c0 100644 } static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, -@@ -748,7 +748,7 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, +@@ -749,7 +749,7 @@ static int sh_msiof_dma_once(struct sh_m return -EAGAIN; desc_rx->callback = sh_msiof_dma_complete; @@ -91,7 +89,7 @@ index d1c51b49c8ce..5cec432e04c0 100644 cookie = dmaengine_submit(desc_rx); if (dma_submit_error(cookie)) return cookie; -@@ -766,13 +766,8 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, +@@ -767,13 +767,8 @@ static int sh_msiof_dma_once(struct sh_m goto no_dma_tx; } @@ -107,7 +105,7 @@ index d1c51b49c8ce..5cec432e04c0 100644 cookie = dmaengine_submit(desc_tx); if (dma_submit_error(cookie)) { ret = cookie; -@@ -789,6 +784,8 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, +@@ -790,6 +785,8 @@ static int sh_msiof_dma_once(struct sh_m sh_msiof_write(p, IER, ier_bits); reinit_completion(&p->done); @@ -116,7 +114,7 @@ index d1c51b49c8ce..5cec432e04c0 100644 p->slave_aborted = false; /* Now start DMA */ -@@ -803,17 +800,24 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx, +@@ -804,17 +801,24 @@ static int sh_msiof_dma_once(struct sh_m goto stop_dma; } @@ -149,7 +147,7 @@ index d1c51b49c8ce..5cec432e04c0 100644 if (ret) goto stop_reset; } -@@ -1273,6 +1277,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) +@@ -1274,6 +1278,7 @@ static int sh_msiof_spi_probe(struct pla p->min_div_pow = chipdata->min_div_pow; init_completion(&p->done); @@ -157,6 +155,3 @@ index d1c51b49c8ce..5cec432e04c0 100644 p->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(p->clk)) { --- -2.17.1 - diff --git a/patches/1808-eeprom-at24-Add-OF-device-ID-table.patch b/patches/1808-eeprom-at24-Add-OF-device-ID-table.patch index e6b405c66a6ff..255f14942150d 100644 --- a/patches/1808-eeprom-at24-Add-OF-device-ID-table.patch +++ b/patches/1808-eeprom-at24-Add-OF-device-ID-table.patch @@ -21,11 +21,9 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de> (cherry picked from commit 7f2a2f0d0d66b2d834c793df45af3277bb5f10f4) Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- - drivers/misc/eeprom/at24.c | 71 +++++++++++++++++++++++++++++++++++++- + drivers/misc/eeprom/at24.c | 71 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) -diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c -index 4cc0b42f2acc..87367efc8170 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -12,6 +12,7 @@ @@ -36,7 +34,7 @@ index 4cc0b42f2acc..87367efc8170 100644 #include <linux/slab.h> #include <linux/delay.h> #include <linux/mutex.h> -@@ -175,6 +176,64 @@ static const struct i2c_device_id at24_ids[] = { +@@ -175,6 +176,64 @@ static const struct i2c_device_id at24_i }; MODULE_DEVICE_TABLE(i2c, at24_ids); @@ -101,7 +99,7 @@ index 4cc0b42f2acc..87367efc8170 100644 static const struct acpi_device_id at24_acpi_ids[] = { { "INT3499", AT24_DEVICE_MAGIC(8192 / 8, 0) }, { } -@@ -605,7 +664,16 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) +@@ -605,7 +664,16 @@ static int at24_probe(struct i2c_client if (client->dev.platform_data) { chip = *(struct at24_platform_data *)client->dev.platform_data; } else { @@ -119,7 +117,7 @@ index 4cc0b42f2acc..87367efc8170 100644 magic = id->driver_data; } else { const struct acpi_device_id *aid; -@@ -831,6 +899,7 @@ static int at24_remove(struct i2c_client *client) +@@ -831,6 +899,7 @@ static int at24_remove(struct i2c_client static struct i2c_driver at24_driver = { .driver = { .name = "at24", @@ -127,6 +125,3 @@ index 4cc0b42f2acc..87367efc8170 100644 .acpi_match_table = ACPI_PTR(at24_acpi_ids), }, .probe = at24_probe, --- -2.17.1 - |