Skip to contentSkip to conversation

drivers: mcb: use symbol namespaces

PATCH In review Johannes Thumshirn 4 participants 9 messages Oct 16, 2019 – Nov 3, 2019

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers: mcb: use symbol namespaces

Now that we have symbol namespaces, use them in MCB to not pollute the default namespace with MCB internals.

---
 drivers/gpio/gpio-menz127.c            |  1 +
 drivers/iio/adc/men_z188_adc.c         |  1 +
 drivers/mcb/mcb-core.c                 | 28 ++++++++++++++--------------
 drivers/mcb/mcb-lpc.c                  |  1 +
 drivers/mcb/mcb-parse.c                |  2 +-
 drivers/mcb/mcb-pci.c                  |  1 +
 drivers/tty/serial/8250/8250_men_mcb.c |  1 +
 drivers/tty/serial/men_z135_uart.c     |  1 +
 drivers/watchdog/menz69_wdt.c          |  1 +
 9 files changed, 22 insertions(+), 15 deletions(-)
drivers/gpio/gpio-menz127.c +1 -0
index 70fdb42a8e88..1e21c661d79d 100644
@@ -211,3 +211,4 @@ MODULE_AUTHOR("Andreas Werner <[email protected]>");
 MODULE_DESCRIPTION("MEN 16z127 GPIO Controller");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("mcb:16z127");
+MODULE_IMPORT_NS(MCB);
drivers/iio/adc/men_z188_adc.c +1 -0
index 3b2fbb7ce431..196c8226381e 100644
@@ -167,3 +167,4 @@ MODULE_AUTHOR("Johannes Thumshirn <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("IIO ADC driver for MEN 16z188 ADC Core");
 MODULE_ALIAS("mcb:16z188");
+MODULE_IMPORT_NS(MCB);
drivers/mcb/mcb-core.c +14 -14
index b72e82efaee5..38fbb3b59873 100644
@@ -191,7 +191,7 @@ int __mcb_register_driver(struct mcb_driver *drv, struct module *owner,
 
 	return driver_register(&drv->driver);
 }
-EXPORT_SYMBOL_GPL(__mcb_register_driver);
+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_GPL(mcb_unregister_driver);
+EXPORT_SYMBOL_NS_GPL(mcb_unregister_driver, MCB);
 
 static void mcb_release_dev(struct device *dev)
 {
@@ -249,7 +249,7 @@ int mcb_device_register(struct mcb_bus *bus, struct mcb_device *dev)
 
 	return ret;
 }
-EXPORT_SYMBOL_GPL(mcb_device_register);
+EXPORT_SYMBOL_NS_GPL(mcb_device_register, MCB);
 
 static void mcb_free_bus(struct device *dev)
 {
@@ -301,7 +301,7 @@ struct mcb_bus *mcb_alloc_bus(struct device *carrier)
 	kfree(bus);
 	return ERR_PTR(rc);
 }
-EXPORT_SYMBOL_GPL(mcb_alloc_bus);
+EXPORT_SYMBOL_NS_GPL(mcb_alloc_bus, MCB);
 
 static int __mcb_devices_unregister(struct device *dev, void *data)
 {
@@ -323,7 +323,7 @@ void mcb_release_bus(struct mcb_bus *bus)
 {
 	mcb_devices_unregister(bus);
 }
-EXPORT_SYMBOL_GPL(mcb_release_bus);
+EXPORT_SYMBOL_NS_GPL(mcb_release_bus, MCB);
 
 /**
  * mcb_bus_put() - Increment refcnt
@@ -338,7 +338,7 @@ struct mcb_bus *mcb_bus_get(struct mcb_bus *bus)
 
 	return bus;
 }
-EXPORT_SYMBOL_GPL(mcb_bus_get);
+EXPORT_SYMBOL_NS_GPL(mcb_bus_get, MCB);
 
 /**
  * mcb_bus_put() - Decrement refcnt
@@ -351,7 +351,7 @@ void mcb_bus_put(struct mcb_bus *bus)
 	if (bus)
 		put_device(&bus->dev);
 }
-EXPORT_SYMBOL_GPL(mcb_bus_put);
+EXPORT_SYMBOL_NS_GPL(mcb_bus_put, MCB);
 
 /**
  * mcb_alloc_dev() - Allocate a device
@@ -371,7 +371,7 @@ struct mcb_device *mcb_alloc_dev(struct mcb_bus *bus)
 
 	return dev;
 }
-EXPORT_SYMBOL_GPL(mcb_alloc_dev);
+EXPORT_SYMBOL_NS_GPL(mcb_alloc_dev, MCB);
 
 /**
  * mcb_free_dev() - Free @mcb_device
@@ -383,7 +383,7 @@ void mcb_free_dev(struct mcb_device *dev)
 {
 	kfree(dev);
 }
-EXPORT_SYMBOL_GPL(mcb_free_dev);
+EXPORT_SYMBOL_NS_GPL(mcb_free_dev, MCB);
 
 static int __mcb_bus_add_devices(struct device *dev, void *data)
 {
@@ -412,7 +412,7 @@ void mcb_bus_add_devices(const struct mcb_bus *bus)
 {
 	bus_for_each_dev(&mcb_bus_type, NULL, NULL, __mcb_bus_add_devices);
 }
-EXPORT_SYMBOL_GPL(mcb_bus_add_devices);
+EXPORT_SYMBOL_NS_GPL(mcb_bus_add_devices, MCB);
 
 /**
  * mcb_get_resource() - get a resource for a mcb device
@@ -428,7 +428,7 @@ struct resource *mcb_get_resource(struct mcb_device *dev, unsigned int type)
 	else
 		return NULL;
 }
-EXPORT_SYMBOL_GPL(mcb_get_resource);
+EXPORT_SYMBOL_NS_GPL(mcb_get_resource, MCB);
 
 /**
  * mcb_request_mem() - Request memory
@@ -454,7 +454,7 @@ struct resource *mcb_request_mem(struct mcb_device *dev, const char *name)
 
 	return mem;
 }
-EXPORT_SYMBOL_GPL(mcb_request_mem);
+EXPORT_SYMBOL_NS_GPL(mcb_request_mem, MCB);
 
 /**
  * mcb_release_mem() - Release memory requested by device
@@ -469,7 +469,7 @@ void mcb_release_mem(struct resource *mem)
 	size = resource_size(mem);
 	release_mem_region(mem->start, size);
 }
-EXPORT_SYMBOL_GPL(mcb_release_mem);
+EXPORT_SYMBOL_NS_GPL(mcb_release_mem, MCB);
 
 static int __mcb_get_irq(struct mcb_device *dev)
 {
@@ -495,7 +495,7 @@ int mcb_get_irq(struct mcb_device *dev)
 
 	return __mcb_get_irq(dev);
 }
-EXPORT_SYMBOL_GPL(mcb_get_irq);
+EXPORT_SYMBOL_NS_GPL(mcb_get_irq, MCB);
 
 static int mcb_init(void)
 {
drivers/mcb/mcb-lpc.c +1 -0
index 8f1bde437a7e..506676754538 100644
@@ -168,3 +168,4 @@ module_exit(mcb_lpc_exit);
 MODULE_AUTHOR("Andreas Werner <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("MCB over LPC support");
+MODULE_IMPORT_NS(MCB);
drivers/mcb/mcb-parse.c +1 -1
index 3b69e6aa3d88..0266bfddfbe2 100644
@@ -253,4 +253,4 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase,
 
 	return ret;
 }
-EXPORT_SYMBOL_GPL(chameleon_parse_cells);
+EXPORT_SYMBOL_NS_GPL(chameleon_parse_cells, MCB);
drivers/mcb/mcb-pci.c +1 -0
index 14866aa22f75..dc88232d9af8 100644
@@ -131,3 +131,4 @@ module_pci_driver(mcb_pci_driver);
 MODULE_AUTHOR("Johannes Thumshirn <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("MCB over PCI support");
+MODULE_IMPORT_NS(MCB);
drivers/tty/serial/8250/8250_men_mcb.c +1 -0
index 02c5aff58a74..80a5c063ed70 100644
@@ -174,3 +174,4 @@ MODULE_AUTHOR("Michael Moese <[email protected]");
 MODULE_ALIAS("mcb:16z125");
 MODULE_ALIAS("mcb:16z025");
 MODULE_ALIAS("mcb:16z057");
+MODULE_IMPORT_NS(MCB);
drivers/tty/serial/men_z135_uart.c +1 -0
index e5d3ebab6dae..4f53a4caabf6 100644
@@ -930,3 +930,4 @@ MODULE_AUTHOR("Johannes Thumshirn <[email protected]>");
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("MEN 16z135 High Speed UART");
 MODULE_ALIAS("mcb:16z135");
+MODULE_IMPORT_NS(MCB);
drivers/watchdog/menz69_wdt.c +1 -0
index ed18238c5407..8973f98bc6a5 100644
@@ -168,3 +168,4 @@ module_mcb_driver(men_z069_driver);
 MODULE_AUTHOR("Johannes Thumshirn <[email protected]>");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("mcb:16z069");
+MODULE_IMPORT_NS(MCB);
Signature · 1 line
2.16.4
Reviewed-by on v1 1/1
#1 lore raw

+++ Johannes Thumshirn [16/10/19 12:01 +0200]:

Quoted 4 lines

Now that we have symbol namespaces, use them in MCB to not pollute the default namespace with MCB internals.

Hurray, more namespace users! :)

Thanks!

Quoted 218 lines

---

drivers/gpio/gpio-menz127.c            |  1 +
drivers/iio/adc/men_z188_adc.c         |  1 +
drivers/mcb/mcb-core.c                 | 28 ++++++++++++++--------------
drivers/mcb/mcb-lpc.c                  |  1 +
drivers/mcb/mcb-parse.c                |  2 +-
drivers/mcb/mcb-pci.c                  |  1 +
drivers/tty/serial/8250/8250_men_mcb.c |  1 +
drivers/tty/serial/men_z135_uart.c     |  1 +
drivers/watchdog/menz69_wdt.c          |  1 +
9 files changed, 22 insertions(+), 15 deletions(-)
drivers/gpio/gpio-menz127.c +1 -0
index 70fdb42a8e88..1e21c661d79d 100644
@@ -211,3 +211,4 @@ MODULE_AUTHOR("Andreas Werner <[email protected]>");
 MODULE_DESCRIPTION("MEN 16z127 GPIO Controller");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("mcb:16z127");
+MODULE_IMPORT_NS(MCB);
drivers/iio/adc/men_z188_adc.c +1 -0
index 3b2fbb7ce431..196c8226381e 100644
@@ -167,3 +167,4 @@ MODULE_AUTHOR("Johannes Thumshirn <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("IIO ADC driver for MEN 16z188 ADC Core");
 MODULE_ALIAS("mcb:16z188");
+MODULE_IMPORT_NS(MCB);
drivers/mcb/mcb-core.c +14 -14
index b72e82efaee5..38fbb3b59873 100644
@@ -191,7 +191,7 @@ int __mcb_register_driver(struct mcb_driver *drv, struct module *owner,
 
 	return driver_register(&drv->driver);
 }
-EXPORT_SYMBOL_GPL(__mcb_register_driver);
+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_GPL(mcb_unregister_driver);
+EXPORT_SYMBOL_NS_GPL(mcb_unregister_driver, MCB);
 
 static void mcb_release_dev(struct device *dev)
 {
@@ -249,7 +249,7 @@ int mcb_device_register(struct mcb_bus *bus, struct mcb_device *dev)
 
 	return ret;
 }
-EXPORT_SYMBOL_GPL(mcb_device_register);
+EXPORT_SYMBOL_NS_GPL(mcb_device_register, MCB);
 
 static void mcb_free_bus(struct device *dev)
 {
@@ -301,7 +301,7 @@ struct mcb_bus *mcb_alloc_bus(struct device *carrier)
 	kfree(bus);
 	return ERR_PTR(rc);
 }
-EXPORT_SYMBOL_GPL(mcb_alloc_bus);
+EXPORT_SYMBOL_NS_GPL(mcb_alloc_bus, MCB);
 
 static int __mcb_devices_unregister(struct device *dev, void *data)
 {
@@ -323,7 +323,7 @@ void mcb_release_bus(struct mcb_bus *bus)
 {
 	mcb_devices_unregister(bus);
 }
-EXPORT_SYMBOL_GPL(mcb_release_bus);
+EXPORT_SYMBOL_NS_GPL(mcb_release_bus, MCB);
 
 /**
 * mcb_bus_put() - Increment refcnt
@@ -338,7 +338,7 @@ struct mcb_bus *mcb_bus_get(struct mcb_bus *bus)
 
 	return bus;
 }
-EXPORT_SYMBOL_GPL(mcb_bus_get);
+EXPORT_SYMBOL_NS_GPL(mcb_bus_get, MCB);
 
 /**
 * mcb_bus_put() - Decrement refcnt
@@ -351,7 +351,7 @@ void mcb_bus_put(struct mcb_bus *bus)
 	if (bus)
 		put_device(&bus->dev);
 }
-EXPORT_SYMBOL_GPL(mcb_bus_put);
+EXPORT_SYMBOL_NS_GPL(mcb_bus_put, MCB);
 
 /**
 * mcb_alloc_dev() - Allocate a device
@@ -371,7 +371,7 @@ struct mcb_device *mcb_alloc_dev(struct mcb_bus *bus)
 
 	return dev;
 }
-EXPORT_SYMBOL_GPL(mcb_alloc_dev);
+EXPORT_SYMBOL_NS_GPL(mcb_alloc_dev, MCB);
 
 /**
 * mcb_free_dev() - Free @mcb_device
@@ -383,7 +383,7 @@ void mcb_free_dev(struct mcb_device *dev)
 {
 	kfree(dev);
 }
-EXPORT_SYMBOL_GPL(mcb_free_dev);
+EXPORT_SYMBOL_NS_GPL(mcb_free_dev, MCB);
 
 static int __mcb_bus_add_devices(struct device *dev, void *data)
 {
@@ -412,7 +412,7 @@ void mcb_bus_add_devices(const struct mcb_bus *bus)
 {
 	bus_for_each_dev(&mcb_bus_type, NULL, NULL, __mcb_bus_add_devices);
 }
-EXPORT_SYMBOL_GPL(mcb_bus_add_devices);
+EXPORT_SYMBOL_NS_GPL(mcb_bus_add_devices, MCB);
 
 /**
 * mcb_get_resource() - get a resource for a mcb device
@@ -428,7 +428,7 @@ struct resource *mcb_get_resource(struct mcb_device *dev, unsigned int type)
 	else
 		return NULL;
 }
-EXPORT_SYMBOL_GPL(mcb_get_resource);
+EXPORT_SYMBOL_NS_GPL(mcb_get_resource, MCB);
 
 /**
 * mcb_request_mem() - Request memory
@@ -454,7 +454,7 @@ struct resource *mcb_request_mem(struct mcb_device *dev, const char *name)
 
 	return mem;
 }
-EXPORT_SYMBOL_GPL(mcb_request_mem);
+EXPORT_SYMBOL_NS_GPL(mcb_request_mem, MCB);
 
 /**
 * mcb_release_mem() - Release memory requested by device
@@ -469,7 +469,7 @@ void mcb_release_mem(struct resource *mem)
 	size = resource_size(mem);
 	release_mem_region(mem->start, size);
 }
-EXPORT_SYMBOL_GPL(mcb_release_mem);
+EXPORT_SYMBOL_NS_GPL(mcb_release_mem, MCB);
 
 static int __mcb_get_irq(struct mcb_device *dev)
 {
@@ -495,7 +495,7 @@ int mcb_get_irq(struct mcb_device *dev)
 
 	return __mcb_get_irq(dev);
 }
-EXPORT_SYMBOL_GPL(mcb_get_irq);
+EXPORT_SYMBOL_NS_GPL(mcb_get_irq, MCB);
 
 static int mcb_init(void)
 {
drivers/mcb/mcb-lpc.c +1 -0
index 8f1bde437a7e..506676754538 100644
@@ -168,3 +168,4 @@ module_exit(mcb_lpc_exit);
 MODULE_AUTHOR("Andreas Werner <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("MCB over LPC support");
+MODULE_IMPORT_NS(MCB);
drivers/mcb/mcb-parse.c +1 -1
index 3b69e6aa3d88..0266bfddfbe2 100644
@@ -253,4 +253,4 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase,
 
 	return ret;
 }
-EXPORT_SYMBOL_GPL(chameleon_parse_cells);
+EXPORT_SYMBOL_NS_GPL(chameleon_parse_cells, MCB);
drivers/mcb/mcb-pci.c +1 -0
index 14866aa22f75..dc88232d9af8 100644
@@ -131,3 +131,4 @@ module_pci_driver(mcb_pci_driver);
 MODULE_AUTHOR("Johannes Thumshirn <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("MCB over PCI support");
+MODULE_IMPORT_NS(MCB);
drivers/tty/serial/8250/8250_men_mcb.c +1 -0
index 02c5aff58a74..80a5c063ed70 100644
@@ -174,3 +174,4 @@ MODULE_AUTHOR("Michael Moese <[email protected]");
 MODULE_ALIAS("mcb:16z125");
 MODULE_ALIAS("mcb:16z025");
 MODULE_ALIAS("mcb:16z057");
+MODULE_IMPORT_NS(MCB);
drivers/tty/serial/men_z135_uart.c +1 -0
index e5d3ebab6dae..4f53a4caabf6 100644
@@ -930,3 +930,4 @@ MODULE_AUTHOR("Johannes Thumshirn <[email protected]>");
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("MEN 16z135 High Speed UART");
 MODULE_ALIAS("mcb:16z135");
+MODULE_IMPORT_NS(MCB);
drivers/watchdog/menz69_wdt.c +1 -0
index ed18238c5407..8973f98bc6a5 100644
@@ -168,3 +168,4 @@ module_mcb_driver(men_z069_driver);
 MODULE_AUTHOR("Johannes Thumshirn <[email protected]>");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("mcb:16z069");
+MODULE_IMPORT_NS(MCB);
Signature · 1 line
2.16.4
Reviewed-by on v1 1/1
#2 lore raw
In reply to Johannes Thumshirn
Quoted 4 lines · Johannes Thumshirn

Now that we have symbol namespaces, use them in MCB to not pollute the default namespace with MCB internals.

Quoted 216 lines
---
 drivers/gpio/gpio-menz127.c            |  1 +
 drivers/iio/adc/men_z188_adc.c         |  1 +
 drivers/mcb/mcb-core.c                 | 28 ++++++++++++++--------------
 drivers/mcb/mcb-lpc.c                  |  1 +
 drivers/mcb/mcb-parse.c                |  2 +-
 drivers/mcb/mcb-pci.c                  |  1 +
 drivers/tty/serial/8250/8250_men_mcb.c |  1 +
 drivers/tty/serial/men_z135_uart.c     |  1 +
 drivers/watchdog/menz69_wdt.c          |  1 +
 9 files changed, 22 insertions(+), 15 deletions(-)
drivers/gpio/gpio-menz127.c +1 -0
index 70fdb42a8e88..1e21c661d79d 100644
@@ -211,3 +211,4 @@ MODULE_AUTHOR("Andreas Werner <[email protected]>");
 MODULE_DESCRIPTION("MEN 16z127 GPIO Controller");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("mcb:16z127");
+MODULE_IMPORT_NS(MCB);
drivers/iio/adc/men_z188_adc.c +1 -0
index 3b2fbb7ce431..196c8226381e 100644
@@ -167,3 +167,4 @@ MODULE_AUTHOR("Johannes Thumshirn <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("IIO ADC driver for MEN 16z188 ADC Core");
 MODULE_ALIAS("mcb:16z188");
+MODULE_IMPORT_NS(MCB);
drivers/mcb/mcb-core.c +14 -14
index b72e82efaee5..38fbb3b59873 100644
@@ -191,7 +191,7 @@ int __mcb_register_driver(struct mcb_driver *drv, struct module *owner,
 
 	return driver_register(&drv->driver);
 }
-EXPORT_SYMBOL_GPL(__mcb_register_driver);
+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_GPL(mcb_unregister_driver);
+EXPORT_SYMBOL_NS_GPL(mcb_unregister_driver, MCB);
 
 static void mcb_release_dev(struct device *dev)
 {
@@ -249,7 +249,7 @@ int mcb_device_register(struct mcb_bus *bus, struct mcb_device *dev)
 
 	return ret;
 }
-EXPORT_SYMBOL_GPL(mcb_device_register);
+EXPORT_SYMBOL_NS_GPL(mcb_device_register, MCB);
 
 static void mcb_free_bus(struct device *dev)
 {
@@ -301,7 +301,7 @@ struct mcb_bus *mcb_alloc_bus(struct device *carrier)
 	kfree(bus);
 	return ERR_PTR(rc);
 }
-EXPORT_SYMBOL_GPL(mcb_alloc_bus);
+EXPORT_SYMBOL_NS_GPL(mcb_alloc_bus, MCB);
 
 static int __mcb_devices_unregister(struct device *dev, void *data)
 {
@@ -323,7 +323,7 @@ void mcb_release_bus(struct mcb_bus *bus)
 {
 	mcb_devices_unregister(bus);
 }
-EXPORT_SYMBOL_GPL(mcb_release_bus);
+EXPORT_SYMBOL_NS_GPL(mcb_release_bus, MCB);
 
 /**
  * mcb_bus_put() - Increment refcnt
@@ -338,7 +338,7 @@ struct mcb_bus *mcb_bus_get(struct mcb_bus *bus)
 
 	return bus;
 }
-EXPORT_SYMBOL_GPL(mcb_bus_get);
+EXPORT_SYMBOL_NS_GPL(mcb_bus_get, MCB);
 
 /**
  * mcb_bus_put() - Decrement refcnt
@@ -351,7 +351,7 @@ void mcb_bus_put(struct mcb_bus *bus)
 	if (bus)
 		put_device(&bus->dev);
 }
-EXPORT_SYMBOL_GPL(mcb_bus_put);
+EXPORT_SYMBOL_NS_GPL(mcb_bus_put, MCB);
 
 /**
  * mcb_alloc_dev() - Allocate a device
@@ -371,7 +371,7 @@ struct mcb_device *mcb_alloc_dev(struct mcb_bus *bus)
 
 	return dev;
 }
-EXPORT_SYMBOL_GPL(mcb_alloc_dev);
+EXPORT_SYMBOL_NS_GPL(mcb_alloc_dev, MCB);
 
 /**
  * mcb_free_dev() - Free @mcb_device
@@ -383,7 +383,7 @@ void mcb_free_dev(struct mcb_device *dev)
 {
 	kfree(dev);
 }
-EXPORT_SYMBOL_GPL(mcb_free_dev);
+EXPORT_SYMBOL_NS_GPL(mcb_free_dev, MCB);
 
 static int __mcb_bus_add_devices(struct device *dev, void *data)
 {
@@ -412,7 +412,7 @@ void mcb_bus_add_devices(const struct mcb_bus *bus)
 {
 	bus_for_each_dev(&mcb_bus_type, NULL, NULL, __mcb_bus_add_devices);
 }
-EXPORT_SYMBOL_GPL(mcb_bus_add_devices);
+EXPORT_SYMBOL_NS_GPL(mcb_bus_add_devices, MCB);
 
 /**
  * mcb_get_resource() - get a resource for a mcb device
@@ -428,7 +428,7 @@ struct resource *mcb_get_resource(struct mcb_device *dev, unsigned int type)
 	else
 		return NULL;
 }
-EXPORT_SYMBOL_GPL(mcb_get_resource);
+EXPORT_SYMBOL_NS_GPL(mcb_get_resource, MCB);
 
 /**
  * mcb_request_mem() - Request memory
@@ -454,7 +454,7 @@ struct resource *mcb_request_mem(struct mcb_device *dev, const char *name)
 
 	return mem;
 }
-EXPORT_SYMBOL_GPL(mcb_request_mem);
+EXPORT_SYMBOL_NS_GPL(mcb_request_mem, MCB);
 
 /**
  * mcb_release_mem() - Release memory requested by device
@@ -469,7 +469,7 @@ void mcb_release_mem(struct resource *mem)
 	size = resource_size(mem);
 	release_mem_region(mem->start, size);
 }
-EXPORT_SYMBOL_GPL(mcb_release_mem);
+EXPORT_SYMBOL_NS_GPL(mcb_release_mem, MCB);
 
 static int __mcb_get_irq(struct mcb_device *dev)
 {
@@ -495,7 +495,7 @@ int mcb_get_irq(struct mcb_device *dev)
 
 	return __mcb_get_irq(dev);
 }
-EXPORT_SYMBOL_GPL(mcb_get_irq);
+EXPORT_SYMBOL_NS_GPL(mcb_get_irq, MCB);
 
 static int mcb_init(void)
 {
drivers/mcb/mcb-lpc.c +1 -0
index 8f1bde437a7e..506676754538 100644
@@ -168,3 +168,4 @@ module_exit(mcb_lpc_exit);
 MODULE_AUTHOR("Andreas Werner <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("MCB over LPC support");
+MODULE_IMPORT_NS(MCB);
drivers/mcb/mcb-parse.c +1 -1
index 3b69e6aa3d88..0266bfddfbe2 100644
@@ -253,4 +253,4 @@ int chameleon_parse_cells(struct mcb_bus *bus, phys_addr_t mapbase,
 
 	return ret;
 }
-EXPORT_SYMBOL_GPL(chameleon_parse_cells);
+EXPORT_SYMBOL_NS_GPL(chameleon_parse_cells, MCB);
drivers/mcb/mcb-pci.c +1 -0
index 14866aa22f75..dc88232d9af8 100644
@@ -131,3 +131,4 @@ module_pci_driver(mcb_pci_driver);
 MODULE_AUTHOR("Johannes Thumshirn <[email protected]>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("MCB over PCI support");
+MODULE_IMPORT_NS(MCB);
drivers/tty/serial/8250/8250_men_mcb.c +1 -0
index 02c5aff58a74..80a5c063ed70 100644
@@ -174,3 +174,4 @@ MODULE_AUTHOR("Michael Moese <[email protected]");
 MODULE_ALIAS("mcb:16z125");
 MODULE_ALIAS("mcb:16z025");
 MODULE_ALIAS("mcb:16z057");
+MODULE_IMPORT_NS(MCB);
drivers/tty/serial/men_z135_uart.c +1 -0
index e5d3ebab6dae..4f53a4caabf6 100644
@@ -930,3 +930,4 @@ MODULE_AUTHOR("Johannes Thumshirn <[email protected]>");
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("MEN 16z135 High Speed UART");
 MODULE_ALIAS("mcb:16z135");
+MODULE_IMPORT_NS(MCB);
drivers/watchdog/menz69_wdt.c +1 -0
index ed18238c5407..8973f98bc6a5 100644
@@ -168,3 +168,4 @@ module_mcb_driver(men_z069_driver);
 MODULE_AUTHOR("Johannes Thumshirn <[email protected]>");
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("mcb:16z069");
+MODULE_IMPORT_NS(MCB);
Signature · 11 lines
Michael Moese <[email protected]>
QA Engineer
PGP Fingerprint: 4CCE 3896 F873 2CA5 2382  3C6F 6021 375C 8635 7E74

SUSE Software Solutions Germany GmbH
Maxfeldstr. 5
90409 Nürnberg
Germany

(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
maintainer Reviewed-by on v1 1/1
#3 lore raw
In reply to Johannes Thumshirn
Quoted 4 lines · Johannes Thumshirn

Now that we have symbol namespaces, use them in MCB to not pollute the default namespace with MCB internals.

Quoted 11 lines
---
 drivers/gpio/gpio-menz127.c            |  1 +
 drivers/iio/adc/men_z188_adc.c         |  1 +
 drivers/mcb/mcb-core.c                 | 28 ++++++++++++++--------------
 drivers/mcb/mcb-lpc.c                  |  1 +
 drivers/mcb/mcb-parse.c                |  2 +-
 drivers/mcb/mcb-pci.c                  |  1 +
 drivers/tty/serial/8250/8250_men_mcb.c |  1 +
 drivers/tty/serial/men_z135_uart.c     |  1 +
 drivers/watchdog/menz69_wdt.c          |  1 +
 9 files changed, 22 insertions(+), 15 deletions(-)
#4 lore raw
Quoted 17 lines · Greg KH
Quoted 4 lines · Johannes Thumshirn

Now that we have symbol namespaces, use them in MCB to not pollute the default namespace with MCB internals.

Quoted 11 lines
---
 drivers/gpio/gpio-menz127.c            |  1 +
 drivers/iio/adc/men_z188_adc.c         |  1 +
 drivers/mcb/mcb-core.c                 | 28 ++++++++++++++--------------
 drivers/mcb/mcb-lpc.c                  |  1 +
 drivers/mcb/mcb-parse.c                |  2 +-
 drivers/mcb/mcb-pci.c                  |  1 +
 drivers/tty/serial/8250/8250_men_mcb.c |  1 +
 drivers/tty/serial/men_z135_uart.c     |  1 +
 drivers/watchdog/menz69_wdt.c          |  1 +
 9 files changed, 22 insertions(+), 15 deletions(-)
Quoted 1 line

Btw do you want me to send it to you again shortly before the merge window opens or can you queue it up before?

Thanks,
Johannes

Signature · 9 lines
Johannes Thumshirn                            SUSE Labs Filesystems
[email protected]                                +49 911 74053 689
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5
90409 Nürnberg
Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
maintainer
#5 lore raw
Quoted 18 lines · Johannes Thumshirn
Quoted 17 lines · Greg KH
Quoted 15 lines · Johannes Thumshirn

Now that we have symbol namespaces, use them in MCB to not pollute the default namespace with MCB internals.

---
 drivers/gpio/gpio-menz127.c            |  1 +
 drivers/iio/adc/men_z188_adc.c         |  1 +
 drivers/mcb/mcb-core.c                 | 28 ++++++++++++++--------------
 drivers/mcb/mcb-lpc.c                  |  1 +
 drivers/mcb/mcb-parse.c                |  2 +-
 drivers/mcb/mcb-pci.c                  |  1 +
 drivers/tty/serial/8250/8250_men_mcb.c |  1 +
 drivers/tty/serial/men_z135_uart.c     |  1 +
 drivers/watchdog/menz69_wdt.c          |  1 +
 9 files changed, 22 insertions(+), 15 deletions(-)
Quoted 4 lines
Quoted 1 line

Btw do you want me to send it to you again shortly before the merge window opens or can you queue it up before?

I can take this now, into my -next tree. I'll do so later this week unless you object.

thanks,

greg k-h

#6 lore raw
Quoted 2 lines · Greg KH

I can take this now, into my -next tree. I'll do so later this week unless you object.

Perfect, thanks.

Signature · 9 lines
Johannes Thumshirn                            SUSE Labs Filesystems
[email protected]                                +49 911 74053 689
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5
90409 Nürnberg
Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
#7 lore raw
In reply to Greg KH

On 16/10/2019 15:53, Greg KH wrote:
[...]

Quoted 2 lines

I can take this now, into my -next tree. I'll do so later this week unless you object.

Ping?

Byte,
Johannes

Signature · 9 lines
Johannes Thumshirn                            SUSE Labs Filesystems
[email protected]                                +49 911 74053 689
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5
90409 Nürnberg
Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
maintainer
#8 lore raw
Quoted 6 lines · Johannes Thumshirn

On 16/10/2019 15:53, Greg KH wrote:
[...]

Quoted 2 lines

I can take this now, into my -next tree. I'll do so later this week unless you object.

Ping?

Sorry, been traveling, will get to this now...