| Message ID | 1445603835-14506-4-git-send-email-eric.auger@linaro.org |
|---|---|
| State | Accepted |
| Commit | 588646529f2d09b723584d44ef0a8ab6ff2a690d |
| Headers | show |
On Friday 23 October 2015 14:37:11 Eric Auger wrote: > +static int __init reset ## _module_init(void) \ > +{ \ > + vfio_platform_register_reset(compat, reset); \ > + return 0; \ > +}; \ > I would make this 'return vfio_platform_register_reset(...)', so loading the driver fails if the handler cannot get registered. Alternatively, change the return type of vfio_platform_register_reset to 'void' so it can never fail. Arnd
Hi Arnd, On 10/23/2015 03:09 PM, Arnd Bergmann wrote: > On Friday 23 October 2015 14:37:11 Eric Auger wrote: >> +static int __init reset ## _module_init(void) \ >> +{ \ >> + vfio_platform_register_reset(compat, reset); \ >> + return 0; \ >> +}; \ >> > > I would make this 'return vfio_platform_register_reset(...)', so loading > the driver fails if the handler cannot get registered. Alternatively, > change the return type of vfio_platform_register_reset to 'void' > so it can never fail. I will turn __vfio_platform_register_reset to 'void' then since it has no reason to fail now. Thanks Eric > > Arnd >
diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index 277521a..5a1e8e6 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -110,4 +110,18 @@ static struct vfio_platform_reset_node __reset ## _node = { \ }; \ __vfio_platform_register_reset(&__reset ## _node) +#define module_vfio_reset_handler(compat, reset) \ +MODULE_ALIAS("vfio-reset:" compat); \ +static int __init reset ## _module_init(void) \ +{ \ + vfio_platform_register_reset(compat, reset); \ + return 0; \ +}; \ +static void __exit reset ## _module_exit(void) \ +{ \ + vfio_platform_unregister_reset(compat); \ +}; \ +module_init(reset ## _module_init); \ +module_exit(reset ## _module_exit) + #endif /* VFIO_PLATFORM_PRIVATE_H */
The module_vfio_reset_handler macro - define a module alias - implement module init/exit function which respectively registers and unregisters the reset function. Signed-off-by: Eric Auger <eric.auger@linaro.org> --- v2 -> v3: - use vfio_platform_register_reset macro v1 -> v2: - remove vfio_platform_reset_private.h and move back the macro to vfio_platform_private.h header: removed reset_module_register & unregister (symbol_get) - defines the module_vfio_reset_handler macro as suggested by Arnd (formerly in vfio_platform_reset_private.h) --- drivers/vfio/platform/vfio_platform_private.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)