From 3033e71f4b78dd463cf2f2abcd7dbcf81cb0ed0e Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sun, 7 Nov 2010 15:26:17 +0000 Subject: [PATCH] Removed ifdef __HAIKU__ for drivers that do not call the Package rule in their Jamfiles. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39344 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/audio/ac97/ali5451/driver.c | 4 ---- src/add-ons/kernel/drivers/audio/ice1712/ice1712.c | 6 ------ 2 files changed, 10 deletions(-) diff --git a/src/add-ons/kernel/drivers/audio/ac97/ali5451/driver.c b/src/add-ons/kernel/drivers/audio/ac97/ali5451/driver.c index 5d88b71bc1..0d367b0560 100644 --- a/src/add-ons/kernel/drivers/audio/ac97/ali5451/driver.c +++ b/src/add-ons/kernel/drivers/audio/ac97/ali5451/driver.c @@ -386,7 +386,6 @@ init_driver(void) memset(&gCards[gCardsCount], 0, sizeof(ali_dev)); gCards[gCardsCount].info = info; -#ifdef __HAIKU__ if ((err = (*gPCI->reserve_device)(info.bus, info.device, info.function, DRIVER_NAME, &gCards[gCardsCount])) < B_OK) { dprintf("%s: failed to reserve_device(%d, %d, %d,): %s\n", @@ -394,13 +393,10 @@ init_driver(void) strerror(err)); continue; } -#endif if (ali_setup(&gCards[gCardsCount])) { TRACE("init_driver: setup of ali %ld failed\n", gCardsCount + 1); -#ifdef __HAIKU__ (*gPCI->unreserve_device)(info.bus, info.device, info.function, DRIVER_NAME, &gCards[gCardsCount]); -#endif } else gCardsCount++; diff --git a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c index c2b5bfdfff..8fef66f58c 100644 --- a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c +++ b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c @@ -378,7 +378,6 @@ init_driver(void) break; } -#ifdef __HAIKU__ if ((err = (*pci->reserve_device)(cards[num_cards].info.bus, cards[num_cards].info.device, cards[num_cards].info.function, DRIVER_NAME, &cards[num_cards])) < B_OK) { @@ -388,16 +387,13 @@ init_driver(void) cards[num_cards].info.function, strerror(err)); continue; } -#endif if (ice1712_setup(&cards[num_cards]) != B_OK) { //Vendor_ID and Device_ID has been modified TRACE("Setup of ice1712 %d failed\n", (int)(num_cards + 1)); -#ifdef __HAIKU__ (*pci->unreserve_device)(cards[num_cards].info.bus, cards[num_cards].info.device, cards[num_cards].info.function, DRIVER_NAME, &cards[num_cards]); -#endif } else { num_cards++; } @@ -439,10 +435,8 @@ ice_1712_shutdown(ice1712 *ice) save_settings(ice); -#ifdef __HAIKU__ (*pci->unreserve_device)(ice->info.bus, ice->info.device, ice->info.function, DRIVER_NAME, ice); -#endif }