mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 03:23:53 -04:00
module: Convert symbol namespace to string literal
Clean up the existing export namespace code along the same lines of
commit 33def8498f ("treewide: Convert macro and uses of __section(foo)
to __section("foo")") and for the same reason, it is not desired for the
namespace argument to be a macro expansion itself.
Scripted using
git grep -l -e MODULE_IMPORT_NS -e EXPORT_SYMBOL_NS | while read file;
do
awk -i inplace '
/^#define EXPORT_SYMBOL_NS/ {
gsub(/__stringify\(ns\)/, "ns");
print;
next;
}
/^#define MODULE_IMPORT_NS/ {
gsub(/__stringify\(ns\)/, "ns");
print;
next;
}
/MODULE_IMPORT_NS/ {
$0 = gensub(/MODULE_IMPORT_NS\(([^)]*)\)/, "MODULE_IMPORT_NS(\"\\1\")", "g");
}
/EXPORT_SYMBOL_NS/ {
if ($0 ~ /(EXPORT_SYMBOL_NS[^(]*)\(([^,]+),/) {
if ($0 !~ /(EXPORT_SYMBOL_NS[^(]*)\(([^,]+), ([^)]+)\)/ &&
$0 !~ /(EXPORT_SYMBOL_NS[^(]*)\(\)/ &&
$0 !~ /^my/) {
getline line;
gsub(/[[:space:]]*\\$/, "");
gsub(/[[:space:]]/, "", line);
$0 = $0 " " line;
}
$0 = gensub(/(EXPORT_SYMBOL_NS[^(]*)\(([^,]+), ([^)]+)\)/,
"\\1(\\2, \"\\3\")", "g");
}
}
{ print }' $file;
done
Requested-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://mail.google.com/mail/u/2/#inbox/FMfcgzQXKWgMmjdFwwdsfgxzKpVHWPlc
Acked-by: Greg KH <gregkh@linuxfoundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
e70140ba0d
commit
cdd30ebb1b
@@ -191,7 +191,7 @@ int __mcb_register_driver(struct mcb_driver *drv, struct module *owner,
|
||||
|
||||
return driver_register(&drv->driver);
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(__mcb_register_driver, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(__mcb_register_driver, "MCB");
|
||||
|
||||
/**
|
||||
* mcb_unregister_driver() - Unregister a @mcb_driver from the system
|
||||
@@ -203,7 +203,7 @@ void mcb_unregister_driver(struct mcb_driver *drv)
|
||||
{
|
||||
driver_unregister(&drv->driver);
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_unregister_driver, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_unregister_driver, "MCB");
|
||||
|
||||
static void mcb_release_dev(struct device *dev)
|
||||
{
|
||||
@@ -250,7 +250,7 @@ out:
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_device_register, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_device_register, "MCB");
|
||||
|
||||
static void mcb_free_bus(struct device *dev)
|
||||
{
|
||||
@@ -303,7 +303,7 @@ err_put:
|
||||
put_device(&bus->dev);
|
||||
return ERR_PTR(rc);
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_alloc_bus, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_alloc_bus, "MCB");
|
||||
|
||||
static int __mcb_devices_unregister(struct device *dev, void *data)
|
||||
{
|
||||
@@ -325,7 +325,7 @@ void mcb_release_bus(struct mcb_bus *bus)
|
||||
{
|
||||
mcb_devices_unregister(bus);
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_release_bus, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_release_bus, "MCB");
|
||||
|
||||
/**
|
||||
* mcb_bus_get() - Increment refcnt
|
||||
@@ -340,7 +340,7 @@ struct mcb_bus *mcb_bus_get(struct mcb_bus *bus)
|
||||
|
||||
return bus;
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_bus_get, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_bus_get, "MCB");
|
||||
|
||||
/**
|
||||
* mcb_bus_put() - Decrement refcnt
|
||||
@@ -353,7 +353,7 @@ void mcb_bus_put(struct mcb_bus *bus)
|
||||
if (bus)
|
||||
put_device(&bus->dev);
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_bus_put, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_bus_put, "MCB");
|
||||
|
||||
/**
|
||||
* mcb_alloc_dev() - Allocate a device
|
||||
@@ -373,7 +373,7 @@ struct mcb_device *mcb_alloc_dev(struct mcb_bus *bus)
|
||||
|
||||
return dev;
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_alloc_dev, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_alloc_dev, "MCB");
|
||||
|
||||
/**
|
||||
* mcb_free_dev() - Free @mcb_device
|
||||
@@ -385,7 +385,7 @@ void mcb_free_dev(struct mcb_device *dev)
|
||||
{
|
||||
kfree(dev);
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_free_dev, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_free_dev, "MCB");
|
||||
|
||||
static int __mcb_bus_add_devices(struct device *dev, void *data)
|
||||
{
|
||||
@@ -410,7 +410,7 @@ void mcb_bus_add_devices(const struct mcb_bus *bus)
|
||||
{
|
||||
bus_for_each_dev(bus->dev.bus, NULL, NULL, __mcb_bus_add_devices);
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_bus_add_devices, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_bus_add_devices, "MCB");
|
||||
|
||||
/**
|
||||
* mcb_get_resource() - get a resource for a mcb device
|
||||
@@ -426,7 +426,7 @@ struct resource *mcb_get_resource(struct mcb_device *dev, unsigned int type)
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_get_resource, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_get_resource, "MCB");
|
||||
|
||||
/**
|
||||
* mcb_request_mem() - Request memory
|
||||
@@ -452,7 +452,7 @@ struct resource *mcb_request_mem(struct mcb_device *dev, const char *name)
|
||||
|
||||
return mem;
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_request_mem, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_request_mem, "MCB");
|
||||
|
||||
/**
|
||||
* mcb_release_mem() - Release memory requested by device
|
||||
@@ -467,7 +467,7 @@ void mcb_release_mem(struct resource *mem)
|
||||
size = resource_size(mem);
|
||||
release_mem_region(mem->start, size);
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_release_mem, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_release_mem, "MCB");
|
||||
|
||||
static int __mcb_get_irq(struct mcb_device *dev)
|
||||
{
|
||||
@@ -493,7 +493,7 @@ int mcb_get_irq(struct mcb_device *dev)
|
||||
|
||||
return __mcb_get_irq(dev);
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_get_irq, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(mcb_get_irq, "MCB");
|
||||
|
||||
static int mcb_init(void)
|
||||
{
|
||||
|
||||
@@ -184,4 +184,4 @@ module_exit(mcb_lpc_exit);
|
||||
MODULE_AUTHOR("Andreas Werner <andreas.werner@men.de>");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("MCB over LPC support");
|
||||
MODULE_IMPORT_NS(MCB);
|
||||
MODULE_IMPORT_NS("MCB");
|
||||
|
||||
@@ -251,4 +251,4 @@ free_header:
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(chameleon_parse_cells, MCB);
|
||||
EXPORT_SYMBOL_NS_GPL(chameleon_parse_cells, "MCB");
|
||||
|
||||
@@ -154,4 +154,4 @@ module_pci_driver(mcb_pci_driver);
|
||||
MODULE_AUTHOR("Johannes Thumshirn <johannes.thumshirn@men.de>");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("MCB over PCI support");
|
||||
MODULE_IMPORT_NS(MCB);
|
||||
MODULE_IMPORT_NS("MCB");
|
||||
|
||||
Reference in New Issue
Block a user