Skip to content

Commit

Permalink
HSI: core: switch port event notifier from atomic to blocking
Browse files Browse the repository at this point in the history
port events should be sent from process context after
irq_safe runtime pm flag is removed in omap-ssi.

Signed-off-By: Sebastian Reichel <sre@kernel.org>
Tested-by: Pavel Machek <pavel@ucw.cz>
  • Loading branch information
Sebastian Reichel committed Jun 27, 2016
1 parent 2083057 commit de5a377
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions drivers/hsi/hsi_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ struct hsi_controller *hsi_alloc_controller(unsigned int n_ports, gfp_t flags)
port[i]->stop_tx = hsi_dummy_cl;
port[i]->release = hsi_dummy_cl;
mutex_init(&port[i]->lock);
ATOMIC_INIT_NOTIFIER_HEAD(&port[i]->n_head);
BLOCKING_INIT_NOTIFIER_HEAD(&port[i]->n_head);
dev_set_name(&port[i]->device, "port%d", i);
hsi->port[i]->device.release = hsi_port_release;
device_initialize(&hsi->port[i]->device);
Expand Down Expand Up @@ -689,7 +689,7 @@ int hsi_register_port_event(struct hsi_client *cl,
cl->ehandler = handler;
cl->nb.notifier_call = hsi_event_notifier_call;

return atomic_notifier_chain_register(&port->n_head, &cl->nb);
return blocking_notifier_chain_register(&port->n_head, &cl->nb);
}
EXPORT_SYMBOL_GPL(hsi_register_port_event);

Expand All @@ -709,7 +709,7 @@ int hsi_unregister_port_event(struct hsi_client *cl)

WARN_ON(!hsi_port_claimed(cl));

err = atomic_notifier_chain_unregister(&port->n_head, &cl->nb);
err = blocking_notifier_chain_unregister(&port->n_head, &cl->nb);
if (!err)
cl->ehandler = NULL;

Expand All @@ -734,7 +734,7 @@ EXPORT_SYMBOL_GPL(hsi_unregister_port_event);
*/
int hsi_event(struct hsi_port *port, unsigned long event)
{
return atomic_notifier_call_chain(&port->n_head, event, NULL);
return blocking_notifier_call_chain(&port->n_head, event, NULL);
}
EXPORT_SYMBOL_GPL(hsi_event);

Expand Down
2 changes: 1 addition & 1 deletion include/linux/hsi/hsi.h
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ struct hsi_port {
int (*stop_tx)(struct hsi_client *cl);
int (*release)(struct hsi_client *cl);
/* private */
struct atomic_notifier_head n_head;
struct blocking_notifier_head n_head;
};

#define to_hsi_port(dev) container_of(dev, struct hsi_port, device)
Expand Down

0 comments on commit de5a377

Please sign in to comment.