diff options
author | Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> | 2008-11-20 11:16:45 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 16:52:29 -0500 |
commit | 18223a99e60787ce41159ed321c8f0a21c328ac1 (patch) | |
tree | e638a96624f6233245c028f043d3792b904976f3 | |
parent | 3fedd14818592016f7ffd84dfe134881b3896ecf (diff) |
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.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/meilhaus/memain.c b/drivers/staging/meilhaus/memain.c index 6cdeb8582453..b09d1a6c766c 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) | |||
422 | PDEBUG("module_name: %s\n", module_name); | 422 | PDEBUG("module_name: %s\n", module_name); |
423 | 423 | ||
424 | if ((constructor = | 424 | if ((constructor = |
425 | (me_pci_constructor_t) __symbol_get(constructor_name)) == NULL) { | 425 | (me_pci_constructor_t) symbol_get(constructor_name)) == NULL) { |
426 | if (request_module(module_name)) { | 426 | if (request_module(module_name)) { |
427 | PERROR("Error while request for module %s.\n", | 427 | PERROR("Error while request for module %s.\n", |
428 | module_name); | 428 | module_name); |
@@ -430,7 +430,7 @@ static int me_probe_pci(struct pci_dev *dev, const struct pci_device_id *id) | |||
430 | } | 430 | } |
431 | 431 | ||
432 | if ((constructor = | 432 | if ((constructor = |
433 | (me_pci_constructor_t) __symbol_get(constructor_name)) == | 433 | (me_pci_constructor_t) symbol_get(constructor_name)) == |
434 | NULL) { | 434 | NULL) { |
435 | PERROR("Can't get %s driver module constructor.\n", | 435 | PERROR("Can't get %s driver module constructor.\n", |
436 | module_name); | 436 | module_name); |
@@ -441,7 +441,7 @@ static int me_probe_pci(struct pci_dev *dev, const struct pci_device_id *id) | |||
441 | if ((device & 0xF000) == 0x4000) { // Bosch build has differnt constructor for me4600. | 441 | if ((device & 0xF000) == 0x4000) { // Bosch build has differnt constructor for me4600. |
442 | if ((n_device = | 442 | if ((n_device = |
443 | (*constructor_bosch) (dev, me_bosch_fw)) == NULL) { | 443 | (*constructor_bosch) (dev, me_bosch_fw)) == NULL) { |
444 | __symbol_put(constructor_name); | 444 | symbol_put(constructor_name); |
445 | PERROR | 445 | PERROR |
446 | ("Can't get device instance of %s driver module.\n", | 446 | ("Can't get device instance of %s driver module.\n", |
447 | module_name); | 447 | module_name); |
@@ -450,7 +450,7 @@ static int me_probe_pci(struct pci_dev *dev, const struct pci_device_id *id) | |||
450 | } else { | 450 | } else { |
451 | #endif | 451 | #endif |
452 | if ((n_device = (*constructor) (dev)) == NULL) { | 452 | if ((n_device = (*constructor) (dev)) == NULL) { |
453 | __symbol_put(constructor_name); | 453 | symbol_put(constructor_name); |
454 | PERROR | 454 | PERROR |
455 | ("Can't get device instance of %s driver module.\n", | 455 | ("Can't get device instance of %s driver module.\n", |
456 | module_name); | 456 | module_name); |
@@ -503,7 +503,7 @@ static void release_instance(me_device_t * device) | |||
503 | if (plugged != ME_PLUGGED_IN) { | 503 | if (plugged != ME_PLUGGED_IN) { |
504 | PDEBUG("release: medummy_constructor\n"); | 504 | PDEBUG("release: medummy_constructor\n"); |
505 | 505 | ||
506 | __symbol_put("medummy_constructor"); | 506 | symbol_put("medummy_constructor"); |
507 | } else { | 507 | } else { |
508 | if ((dev_id & 0xF000) == 0x6000) { // Exceptions: me61xx, me62xx, me63xx are handled by one driver. | 508 | if ((dev_id & 0xF000) == 0x6000) { // Exceptions: me61xx, me62xx, me63xx are handled by one driver. |
509 | dev_id &= 0xF0FF; | 509 | dev_id &= 0xF0FF; |
@@ -513,7 +513,7 @@ static void release_instance(me_device_t * device) | |||
513 | constructor_name[3] += (char)((dev_id >> 8) & 0x000F); | 513 | constructor_name[3] += (char)((dev_id >> 8) & 0x000F); |
514 | PDEBUG("release: %s\n", constructor_name); | 514 | PDEBUG("release: %s\n", constructor_name); |
515 | 515 | ||
516 | __symbol_put(constructor_name); | 516 | symbol_put(constructor_name); |
517 | } | 517 | } |
518 | } | 518 | } |
519 | 519 | ||