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@22261 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2007-09-19 21:47:00 +00:00
parent 696eddc837
commit 595998812e
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/ac97/auich/auich.c
+5 -6
View File
@@ -56,7 +56,6 @@ device_hooks * find_device(const char *);
int32 auich_int(void *arg); int32 auich_int(void *arg);
status_t auich_init(auich_dev * card); status_t auich_init(auich_dev * card);
static char pci_name[] = B_PCI_MODULE_NAME;
pci_module_info *pci; pci_module_info *pci;
int32 num_cards; int32 num_cards;
@@ -528,7 +527,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) {
@@ -567,7 +566,7 @@ init_hardware(void)
ix++; ix++;
} }
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
return err; return err;
} }
@@ -773,7 +772,7 @@ 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;
while ((*pci->get_nth_pci_info)(ix, &info) == B_OK) { while ((*pci->get_nth_pci_info)(ix, &info) == B_OK) {
@@ -823,7 +822,7 @@ init_driver(void)
} }
if (!num_cards) { if (!num_cards) {
PRINT(("no cards\n")); PRINT(("no cards\n"));
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
PRINT(("no suitable cards found\n")); PRINT(("no suitable cards found\n"));
return ENODEV; return ENODEV;
} }
@@ -867,7 +866,7 @@ uninit_driver(void)
auich_shutdown(&cards[ix]); auich_shutdown(&cards[ix]);
} }
memset(&cards, 0, sizeof(cards)); memset(&cards, 0, sizeof(cards));
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
} }
src/add-ons/kernel/drivers/audio/ac97/auvia/auvia.c
+5 -5
View File
@@ -413,7 +413,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) {
@@ -426,7 +426,7 @@ init_hardware(void)
ix++; ix++;
} }
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
return err; return err;
} }
@@ -575,7 +575,7 @@ init_driver(void)
PRINT(("init_driver()\n")); PRINT(("init_driver()\n"));
load_driver_symbols("auvia"); load_driver_symbols("auvia");
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) {
@@ -600,7 +600,7 @@ init_driver(void)
} }
if (!num_cards) { if (!num_cards) {
PRINT(("no cards\n")); PRINT(("no cards\n"));
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
PRINT(("no suitable cards found\n")); PRINT(("no suitable cards found\n"));
return ENODEV; return ENODEV;
} }
@@ -634,7 +634,7 @@ uninit_driver(void)
auvia_shutdown(&cards[ix]); auvia_shutdown(&cards[ix]);
} }
memset(&cards, 0, sizeof(cards)); memset(&cards, 0, sizeof(cards));
put_module(pci_name); put_module(B_PCI_MODULE_NAME);
} }