diff options
| author |   Carlos Chinea <carlos.chinea@nokia.com> | 2012-04-04 14:11:45 +0300 |
|---|---|---|
| committer | Carlos Chinea <carlos.chinea@nokia.com> | 2012-04-23 14:23:31 +0300 |
| commit | 5a218ceba7b64f506bf4f004b04bb457c1805a62 (patch) | |
| tree | f1f123391bbebd8c6136e9118bf8a2f6b0c49734 /include | |
| parent | Linux 3.4-rc4 (diff) | |
| download | linux-dev-5a218ceba7b64f506bf4f004b04bb457c1805a62.tar.xz linux-dev-5a218ceba7b64f506bf4f004b04bb457c1805a62.zip | |
HSI: hsi: Rework hsi_controller release
Use the proper release mechanism for hsi_controller and
hsi_ports structures. Free the structures through their
associated device release callbacks.
Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hsi/hsi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/hsi/hsi.h b/include/linux/hsi/hsi.h index 4b178067f405..7f3b7262a2b6 100644 --- a/include/linux/hsi/hsi.h +++ b/include/linux/hsi/hsi.h @@ -270,13 +270,13 @@ struct hsi_controller { struct module *owner; unsigned int id; unsigned int num_ports; - struct hsi_port *port; + struct hsi_port **port; }; #define to_hsi_controller(dev) container_of(dev, struct hsi_controller, device) struct hsi_controller *hsi_alloc_controller(unsigned int n_ports, gfp_t flags); -void hsi_free_controller(struct hsi_controller *hsi); +void hsi_put_controller(struct hsi_controller *hsi); int hsi_register_controller(struct hsi_controller *hsi); void hsi_unregister_controller(struct hsi_controller *hsi); @@ -294,7 +294,7 @@ static inline void *hsi_controller_drvdata(struct hsi_controller *hsi) static inline struct hsi_port *hsi_find_port_num(struct hsi_controller *hsi, unsigned int num) { - return (num < hsi->num_ports) ? &hsi->port[num] : NULL; + return (num < hsi->num_ports) ? hsi->port[num] : NULL; } /* |