diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-22 14:38:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-22 14:38:22 -0500 |
commit | e30aee9e10bb5168579e047f05c3d13d09e23356 (patch) | |
tree | 12371bdcd52d2427cad838201997479e31b6a9c9 /drivers/platform/goldfish/pdev_bus.c | |
parent | 8ff546b801e5cca0337c0f0a7234795d0a6309a1 (diff) | |
parent | 6cf18e6927c0b224f972e3042fb85770d63cb9f8 (diff) |
Merge tag 'char-misc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH:
"Here is the big char/misc driver patchset for 4.11-rc1.
Lots of different driver subsystems updated here: rework for the
hyperv subsystem to handle new platforms better, mei and w1 and extcon
driver updates, as well as a number of other "minor" driver updates.
All of these have been in linux-next for a while with no reported
issues"
* tag 'char-misc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (169 commits)
goldfish: Sanitize the broken interrupt handler
x86/platform/goldfish: Prevent unconditional loading
vmbus: replace modulus operation with subtraction
vmbus: constify parameters where possible
vmbus: expose hv_begin/end_read
vmbus: remove conditional locking of vmbus_write
vmbus: add direct isr callback mode
vmbus: change to per channel tasklet
vmbus: put related per-cpu variable together
vmbus: callback is in softirq not workqueue
binder: Add support for file-descriptor arrays
binder: Add support for scatter-gather
binder: Add extra size to allocator
binder: Refactor binder_transact()
binder: Support multiple /dev instances
binder: Deal with contexts in debugfs
binder: Support multiple context managers
binder: Split flat_binder_object
auxdisplay: ht16k33: remove private workqueue
auxdisplay: ht16k33: rework input device initialization
...
Diffstat (limited to 'drivers/platform/goldfish/pdev_bus.c')
-rw-r--r-- | drivers/platform/goldfish/pdev_bus.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/platform/goldfish/pdev_bus.c b/drivers/platform/goldfish/pdev_bus.c index 1f52462f4cdd..dd9ea463c2a4 100644 --- a/drivers/platform/goldfish/pdev_bus.c +++ b/drivers/platform/goldfish/pdev_bus.c | |||
@@ -157,23 +157,26 @@ static int goldfish_new_pdev(void) | |||
157 | static irqreturn_t goldfish_pdev_bus_interrupt(int irq, void *dev_id) | 157 | static irqreturn_t goldfish_pdev_bus_interrupt(int irq, void *dev_id) |
158 | { | 158 | { |
159 | irqreturn_t ret = IRQ_NONE; | 159 | irqreturn_t ret = IRQ_NONE; |
160 | |||
160 | while (1) { | 161 | while (1) { |
161 | u32 op = readl(pdev_bus_base + PDEV_BUS_OP); | 162 | u32 op = readl(pdev_bus_base + PDEV_BUS_OP); |
162 | switch (op) { | ||
163 | case PDEV_BUS_OP_DONE: | ||
164 | return IRQ_NONE; | ||
165 | 163 | ||
164 | switch (op) { | ||
166 | case PDEV_BUS_OP_REMOVE_DEV: | 165 | case PDEV_BUS_OP_REMOVE_DEV: |
167 | goldfish_pdev_remove(); | 166 | goldfish_pdev_remove(); |
167 | ret = IRQ_HANDLED; | ||
168 | break; | 168 | break; |
169 | 169 | ||
170 | case PDEV_BUS_OP_ADD_DEV: | 170 | case PDEV_BUS_OP_ADD_DEV: |
171 | goldfish_new_pdev(); | 171 | goldfish_new_pdev(); |
172 | ret = IRQ_HANDLED; | ||
172 | break; | 173 | break; |
174 | |||
175 | case PDEV_BUS_OP_DONE: | ||
176 | default: | ||
177 | return ret; | ||
173 | } | 178 | } |
174 | ret = IRQ_HANDLED; | ||
175 | } | 179 | } |
176 | return ret; | ||
177 | } | 180 | } |
178 | 181 | ||
179 | static int goldfish_pdev_bus_probe(struct platform_device *pdev) | 182 | static int goldfish_pdev_bus_probe(struct platform_device *pdev) |