From a0a8a75a7545246735920ec91630b0de49da6567 Mon Sep 17 00:00:00 2001 From: Kamalesh Babulal Date: Thu, 20 Nov 2008 21:46:45 +0530 Subject: [PATCH] --- yaml --- r: 126739 b: refs/heads/master c: 18223a99e60787ce41159ed321c8f0a21c328ac1 h: refs/heads/master i: 126737: 540ecfee33dca40665db33f451804fa234565359 126735: acf473530a2edcec6457cd64efa118caa978d17f v: v3 --- [refs] | 2 +- trunk/drivers/staging/meilhaus/memain.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 4c4d1d317098..145ace7ee287 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fedd14818592016f7ffd84dfe134881b3896ecf +refs/heads/master: 18223a99e60787ce41159ed321c8f0a21c328ac1 diff --git a/trunk/drivers/staging/meilhaus/memain.c b/trunk/drivers/staging/meilhaus/memain.c index 6cdeb8582453..b09d1a6c766c 100644 --- a/trunk/drivers/staging/meilhaus/memain.c +++ b/trunk/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); } }