diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-02 11:59:33 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-02 11:59:33 -0400 |
| commit | 6eff18dc602d7cb81320e5fdc911249fc430f16e (patch) | |
| tree | 9dde42050a8d98206fcc555c38e5823d4d44b6f3 | |
| parent | 7f0a14503fdd5edb464e992f1607cc80c6b4e7cd (diff) | |
| download | longterm-queue-4.8-6eff18dc602d7cb81320e5fdc911249fc430f16e.tar.gz | |
iio: drop patch for 4.9+ driver
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/iio-magnetometer-ak8974-remove-incorrect-__exit-mark.patch | 43 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 44 deletions
diff --git a/queue/iio-magnetometer-ak8974-remove-incorrect-__exit-mark.patch b/queue/iio-magnetometer-ak8974-remove-incorrect-__exit-mark.patch deleted file mode 100644 index 1b54bb1..0000000 --- a/queue/iio-magnetometer-ak8974-remove-incorrect-__exit-mark.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3ff861f59f6c1f5bf2bc03d2cd36ac3f992cbc06 Mon Sep 17 00:00:00 2001 -From: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Date: Wed, 1 Mar 2017 15:37:57 -0800 -Subject: [PATCH] iio: magnetometer: ak8974: remove incorrect __exit markups - -commit 3ff861f59f6c1f5bf2bc03d2cd36ac3f992cbc06 upstream. - -Even if bus is not hot-pluggable, devices can be unbound from the -driver via sysfs, so we should not be using __exit annotations on -remove() methods. The only exception is drivers registered with -platform_driver_probe() which specifically disables sysfs bind/unbind -attributes. - -Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Reviewed-by: Linus Walleij <linus.walleij@linaro.org> -Cc: <stable@vger.kernel.org> -Signed-off-by: Jonathan Cameron <jic23@kernel.org> - -diff --git a/drivers/iio/magnetometer/ak8974.c b/drivers/iio/magnetometer/ak8974.c -index 6dd8cbd7ce95..e13370dc9b1c 100644 ---- a/drivers/iio/magnetometer/ak8974.c -+++ b/drivers/iio/magnetometer/ak8974.c -@@ -763,7 +763,7 @@ power_off: - return ret; - } - --static int __exit ak8974_remove(struct i2c_client *i2c) -+static int ak8974_remove(struct i2c_client *i2c) - { - struct iio_dev *indio_dev = i2c_get_clientdata(i2c); - struct ak8974 *ak8974 = iio_priv(indio_dev); -@@ -845,7 +845,7 @@ static struct i2c_driver ak8974_driver = { - .of_match_table = of_match_ptr(ak8974_of_match), - }, - .probe = ak8974_probe, -- .remove = __exit_p(ak8974_remove), -+ .remove = ak8974_remove, - .id_table = ak8974_id, - }; - module_i2c_driver(ak8974_driver); --- -2.12.0 - diff --git a/queue/series b/queue/series index d8585dd..1abc3fe 100644 --- a/queue/series +++ b/queue/series @@ -64,7 +64,6 @@ mmc-ushc-fix-NULL-deref-at-probe.patch iio-adc-ti_am335x_adc-fix-fifo-overrun-recovery.patch iio-sw-device-Fix-config-group-initialization.patch iio-hid-sensor-trigger-Change-get-poll-value-functio.patch -iio-magnetometer-ak8974-remove-incorrect-__exit-mark.patch parport-fix-attempt-to-write-duplicate-procfiles.patch ext4-mark-inode-dirty-after-converting-inline-direct.patch ext4-lock-the-xattr-block-before-checksuming-it.patch |