i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22249 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2007-09-18 19:54:12 +00:00
parent 15a2aa6842
commit d2fa634c8a
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/emuxki/emuxki.c
+9 -11
View File
@@ -66,9 +66,7 @@ void uninit_driver(void);
const char ** publish_devices(void); const char ** publish_devices(void);
device_hooks * find_device(const char *); device_hooks * find_device(const char *);
static char pci_name[] = B_PCI_MODULE_NAME;
pci_module_info *pci; pci_module_info *pci;
static char mpu401_name[] = B_MPU_401_MODULE_NAME;
generic_mpu401_module * mpu401; generic_mpu401_module * mpu401;
@@ -1996,7 +1994,7 @@ init_hardware(void)
PRINT(("init_hardware()\n")); PRINT(("init_hardware()\n"));
if (get_module(pci_name, (module_info **)&pci)) if (get_module(B_PCI_MODULE_NAME, (module_info **)&pci))
return ENOSYS; return ENOSYS;
while ((*pci->get_nth_pci_info)(ix, &info) == B_OK) { while ((*pci->get_nth_pci_info)(ix, &info) == B_OK) {
@@ -2011,7 +2009,7 @@ init_hardware(void)
ix++; ix++;
} }
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
return err; return err;
} }
@@ -2776,11 +2774,11 @@ init_driver(void)
unload_driver_settings (settings_handle); unload_driver_settings (settings_handle);
} }
if (get_module(pci_name, (module_info **) &pci)) if (get_module(B_PCI_MODULE_NAME, (module_info **) &pci))
return ENOSYS; return ENOSYS;
if (get_module(mpu401_name, (module_info **) &mpu401)) { if (get_module(B_MPU_401_MODULE_NAME, (module_info **) &mpu401)) {
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
return ENOSYS; return ENOSYS;
} }
@@ -2807,8 +2805,8 @@ init_driver(void)
ix++; ix++;
} }
if (!num_cards) { if (!num_cards) {
put_module(mpu401_name); put_module(B_MPU_401_MODULE_NAME);
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
PRINT(("emuxki: no suitable cards found\n")); PRINT(("emuxki: no suitable cards found\n"));
return ENODEV; return ENODEV;
} }
@@ -2895,8 +2893,8 @@ uninit_driver(void)
emuxki_shutdown(&cards[ix]); emuxki_shutdown(&cards[ix]);
} }
memset(&cards, 0, sizeof(cards)); memset(&cards, 0, sizeof(cards));
put_module(mpu401_name); put_module(B_MPU_401_MODULE_NAME);
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
num_cards = 0; num_cards = 0;
} }