firmware: google: Add a module_coreboot_driver() macro and use it
Remove some boiler plate code we have in three drivers with a single line each time. This also gets us a free assignment of the driver .owner field, making these drivers work better as modules. Cc: Wei-Ning Huang <wnhuang@chromium.org> Cc: Julius Werner <jwerner@chromium.org> Cc: Brian Norris <briannorris@chromium.org> Cc: Samuel Holland <samuel@sholland.org> Cc: Guenter Roeck <groeck@chromium.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Samuel Holland <samuel@sholland.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
7ef0b15244
commit
354635039d
@@ -20,6 +20,7 @@
|
|||||||
#ifndef __COREBOOT_TABLE_H
|
#ifndef __COREBOOT_TABLE_H
|
||||||
#define __COREBOOT_TABLE_H
|
#define __COREBOOT_TABLE_H
|
||||||
|
|
||||||
|
#include <linux/device.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
|
|
||||||
/* Coreboot table header structure */
|
/* Coreboot table header structure */
|
||||||
@@ -91,4 +92,13 @@ int coreboot_driver_register(struct coreboot_driver *driver);
|
|||||||
/* Unregister a driver that uses the data from a coreboot table. */
|
/* Unregister a driver that uses the data from a coreboot table. */
|
||||||
void coreboot_driver_unregister(struct coreboot_driver *driver);
|
void coreboot_driver_unregister(struct coreboot_driver *driver);
|
||||||
|
|
||||||
|
/* module_coreboot_driver() - Helper macro for drivers that don't do
|
||||||
|
* anything special in module init/exit. This eliminates a lot of
|
||||||
|
* boilerplate. Each module may only use this macro once, and
|
||||||
|
* calling it replaces module_init() and module_exit()
|
||||||
|
*/
|
||||||
|
#define module_coreboot_driver(__coreboot_driver) \
|
||||||
|
module_driver(__coreboot_driver, coreboot_driver_register, \
|
||||||
|
coreboot_driver_unregister)
|
||||||
|
|
||||||
#endif /* __COREBOOT_TABLE_H */
|
#endif /* __COREBOOT_TABLE_H */
|
||||||
|
@@ -97,19 +97,7 @@ static struct coreboot_driver framebuffer_driver = {
|
|||||||
},
|
},
|
||||||
.tag = CB_TAG_FRAMEBUFFER,
|
.tag = CB_TAG_FRAMEBUFFER,
|
||||||
};
|
};
|
||||||
|
module_coreboot_driver(framebuffer_driver);
|
||||||
static int __init coreboot_framebuffer_init(void)
|
|
||||||
{
|
|
||||||
return coreboot_driver_register(&framebuffer_driver);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void coreboot_framebuffer_exit(void)
|
|
||||||
{
|
|
||||||
coreboot_driver_unregister(&framebuffer_driver);
|
|
||||||
}
|
|
||||||
|
|
||||||
module_init(coreboot_framebuffer_init);
|
|
||||||
module_exit(coreboot_framebuffer_exit);
|
|
||||||
|
|
||||||
MODULE_AUTHOR("Samuel Holland <samuel@sholland.org>");
|
MODULE_AUTHOR("Samuel Holland <samuel@sholland.org>");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
@@ -116,19 +116,7 @@ static struct coreboot_driver memconsole_driver = {
|
|||||||
},
|
},
|
||||||
.tag = CB_TAG_CBMEM_CONSOLE,
|
.tag = CB_TAG_CBMEM_CONSOLE,
|
||||||
};
|
};
|
||||||
|
module_coreboot_driver(memconsole_driver);
|
||||||
static void coreboot_memconsole_exit(void)
|
|
||||||
{
|
|
||||||
coreboot_driver_unregister(&memconsole_driver);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int __init coreboot_memconsole_init(void)
|
|
||||||
{
|
|
||||||
return coreboot_driver_register(&memconsole_driver);
|
|
||||||
}
|
|
||||||
|
|
||||||
module_exit(coreboot_memconsole_exit);
|
|
||||||
module_init(coreboot_memconsole_init);
|
|
||||||
|
|
||||||
MODULE_AUTHOR("Google, Inc.");
|
MODULE_AUTHOR("Google, Inc.");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
@@ -324,19 +324,7 @@ static struct coreboot_driver vpd_driver = {
|
|||||||
},
|
},
|
||||||
.tag = CB_TAG_VPD,
|
.tag = CB_TAG_VPD,
|
||||||
};
|
};
|
||||||
|
module_coreboot_driver(vpd_driver);
|
||||||
static int __init coreboot_vpd_init(void)
|
|
||||||
{
|
|
||||||
return coreboot_driver_register(&vpd_driver);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __exit coreboot_vpd_exit(void)
|
|
||||||
{
|
|
||||||
coreboot_driver_unregister(&vpd_driver);
|
|
||||||
}
|
|
||||||
|
|
||||||
module_init(coreboot_vpd_init);
|
|
||||||
module_exit(coreboot_vpd_exit);
|
|
||||||
|
|
||||||
MODULE_AUTHOR("Google, Inc.");
|
MODULE_AUTHOR("Google, Inc.");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
Reference in New Issue
Block a user