diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2020-12-02 12:59:55 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2020-12-13 22:22:29 +0100 |
| commit | 2fccfcc0c742625c01e6a3913f4fc2d330541fbb (patch) | |
| tree | acc1b9f10c17e1a5e25afd13985deecf53219cfc /arch/um/drivers | |
| parent | 0737402f42d3cdc7b7ef27e8cc7caf1e9ba2a2bc (diff) | |
| download | linux-stable-2fccfcc0c742625c01e6a3913f4fc2d330541fbb.tar.gz linux-stable-2fccfcc0c742625c01e6a3913f4fc2d330541fbb.tar.bz2 linux-stable-2fccfcc0c742625c01e6a3913f4fc2d330541fbb.zip | |
um: Remove IRQ_NONE type
We don't actually use this in um_request_irq(), so it can
never be assigned. It's also not clear what that would be
useful for, so just remove it.
This results in quite a number of cleanups, all the way to
removing the "SIGIO on close" startup check, since the data
it assigns (pty_close_sigio) is not used anymore.
While at it, also make this an enum so we get a minimum of
type checking, and remove the IRQ_NONE hack in virtio since
we now no longer have the name twice.
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/drivers')
| -rw-r--r-- | arch/um/drivers/random.c | 2 | ||||
| -rw-r--r-- | arch/um/drivers/virtio_uml.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c index bd3059adc2fb..433a3f8f2ef3 100644 --- a/arch/um/drivers/random.c +++ b/arch/um/drivers/random.c @@ -79,7 +79,7 @@ static int __init rng_init (void) if (err < 0) goto err_out_cleanup_hw; - sigio_broken(random_fd, 1); + sigio_broken(random_fd); hwrng.name = RNG_MODULE_NAME; hwrng.read = rng_dev_read; hwrng.quality = 1024; diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c index 94b112749d5b..27e92d3881ff 100644 --- a/arch/um/drivers/virtio_uml.c +++ b/arch/um/drivers/virtio_uml.c @@ -33,11 +33,6 @@ #include <os.h> #include "vhost_user.h" -/* Workaround due to a conflict between irq_user.h and irqreturn.h */ -#ifdef IRQ_NONE -#undef IRQ_NONE -#endif - #define MAX_SUPPORTED_QUEUE_SIZE 256 #define to_virtio_uml_device(_vdev) \ |