summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamalesh Babulal <kamalesh@linux.vnet.ibm.com>2008-11-20 21:46:45 +0530
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 13:52:29 -0800
commit18223a99e60787ce41159ed321c8f0a21c328ac1 (patch)
treee638a96624f6233245c028f043d3792b904976f3
parent3fedd14818592016f7ffd84dfe134881b3896ecf (diff)
downloadop-kernel-dev-18223a99e60787ce41159ed321c8f0a21c328ac1.zip
op-kernel-dev-18223a99e60787ce41159ed321c8f0a21c328ac1.tar.gz
Staging: meilhaus: fix __symbol_get problems
next-20081120 kernel randconfig on x86_64 box fails, while !CONFIG_MODULES drivers/staging/meilhaus/memain.c: In function 'me_probe_pci': drivers/staging/meilhaus/memain.c:425: error: implicit declaration of function '__symbol_get' drivers/staging/meilhaus/memain.c:425: warning: cast to pointer from integer of different size drivers/staging/meilhaus/memain.c:433: warning: cast to pointer from integer of different size drivers/staging/meilhaus/memain.c:453: error: implicit declaration of function '__symbol_put' make[3]: *** [drivers/staging/meilhaus/memain.o] Error 1 the driver uses __symbol_get and __symbol_put instead of marco's symbol_get and symbol_put, I have only build tested the patch. Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/meilhaus/memain.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/meilhaus/memain.c b/drivers/staging/meilhaus/memain.c
index 6cdeb85..b09d1a6 100644
--- a/drivers/staging/meilhaus/memain.c
+++ b/drivers/staging/meilhaus/memain.c
@@ -422,7 +422,7 @@ static int me_probe_pci(struct pci_dev *dev, const struct pci_device_id *id)
PDEBUG("module_name: %s\n", module_name);
if ((constructor =
- (me_pci_constructor_t) __symbol_get(constructor_name)) == NULL) {
+ (me_pci_constructor_t) symbol_get(constructor_name)) == NULL) {
if (request_module(module_name)) {
PERROR("Error while request for module %s.\n",
module_name);
@@ -430,7 +430,7 @@ static int me_probe_pci(struct pci_dev *dev, const struct pci_device_id *id)
}
if ((constructor =
- (me_pci_constructor_t) __symbol_get(constructor_name)) ==
+ (me_pci_constructor_t) symbol_get(constructor_name)) ==
NULL) {
PERROR("Can't get %s driver module constructor.\n",
module_name);
@@ -441,7 +441,7 @@ static int me_probe_pci(struct pci_dev *dev, const struct pci_device_id *id)
if ((device & 0xF000) == 0x4000) { // Bosch build has differnt constructor for me4600.
if ((n_device =
(*constructor_bosch) (dev, me_bosch_fw)) == NULL) {
- __symbol_put(constructor_name);
+ symbol_put(constructor_name);
PERROR
("Can't get device instance of %s driver module.\n",
module_name);
@@ -450,7 +450,7 @@ static int me_probe_pci(struct pci_dev *dev, const struct pci_device_id *id)
} else {
#endif
if ((n_device = (*constructor) (dev)) == NULL) {
- __symbol_put(constructor_name);
+ symbol_put(constructor_name);
PERROR
("Can't get device instance of %s driver module.\n",
module_name);
@@ -503,7 +503,7 @@ static void release_instance(me_device_t * device)
if (plugged != ME_PLUGGED_IN) {
PDEBUG("release: medummy_constructor\n");
- __symbol_put("medummy_constructor");
+ symbol_put("medummy_constructor");
} else {
if ((dev_id & 0xF000) == 0x6000) { // Exceptions: me61xx, me62xx, me63xx are handled by one driver.
dev_id &= 0xF0FF;
@@ -513,7 +513,7 @@ static void release_instance(me_device_t * device)
constructor_name[3] += (char)((dev_id >> 8) & 0x000F);
PDEBUG("release: %s\n", constructor_name);
- __symbol_put(constructor_name);
+ symbol_put(constructor_name);
}
}
OpenPOWER on IntegriCloud