| Message ID | 20170516232007.20980-2-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Laurent, Thanks for the patch: On 17/05/17 00:20, Laurent Pinchart wrote: > Direct callers of the FCP API hold a reference to the FCP module due to > module linkage, there's no need to take another one manually. Take a > reference to the device instead to ensure that it won't disappear behind > the caller's back. > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > --- > drivers/media/platform/rcar-fcp.c | 11 ++--------- > 1 file changed, 2 insertions(+), 9 deletions(-) > > diff --git a/drivers/media/platform/rcar-fcp.c b/drivers/media/platform/rcar-fcp.c > index 7146fc5ef168..e9f609edf513 100644 > --- a/drivers/media/platform/rcar-fcp.c > +++ b/drivers/media/platform/rcar-fcp.c > @@ -53,14 +53,7 @@ struct rcar_fcp_device *rcar_fcp_get(const struct device_node *np) > if (fcp->dev->of_node != np) > continue; > > - /* > - * Make sure the module won't be unloaded behind our back. This > - * is a poor man's safety net, the module should really not be > - * unloaded while FCP users can be active. > - */ > - if (!try_module_get(fcp->dev->driver->owner)) > - fcp = NULL; > - > + get_device(fcp->dev); > goto done; > } > > @@ -81,7 +74,7 @@ EXPORT_SYMBOL_GPL(rcar_fcp_get); > void rcar_fcp_put(struct rcar_fcp_device *fcp) > { > if (fcp) > - module_put(fcp->dev->driver->owner); > + put_device(fcp->dev); > } > EXPORT_SYMBOL_GPL(rcar_fcp_put); > >
diff --git a/drivers/media/platform/rcar-fcp.c b/drivers/media/platform/rcar-fcp.c index 7146fc5ef168..e9f609edf513 100644 --- a/drivers/media/platform/rcar-fcp.c +++ b/drivers/media/platform/rcar-fcp.c @@ -53,14 +53,7 @@ struct rcar_fcp_device *rcar_fcp_get(const struct device_node *np) if (fcp->dev->of_node != np) continue; - /* - * Make sure the module won't be unloaded behind our back. This - * is a poor man's safety net, the module should really not be - * unloaded while FCP users can be active. - */ - if (!try_module_get(fcp->dev->driver->owner)) - fcp = NULL; - + get_device(fcp->dev); goto done; } @@ -81,7 +74,7 @@ EXPORT_SYMBOL_GPL(rcar_fcp_get); void rcar_fcp_put(struct rcar_fcp_device *fcp) { if (fcp) - module_put(fcp->dev->driver->owner); + put_device(fcp->dev); } EXPORT_SYMBOL_GPL(rcar_fcp_put);
Direct callers of the FCP API hold a reference to the FCP module due to module linkage, there's no need to take another one manually. Take a reference to the device instead to ensure that it won't disappear behind the caller's back. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/media/platform/rcar-fcp.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)