From 78ac8a939188a9433dfd72a53b1ae01f959636aa Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 14 Feb 2005 07:00:39 +0000 Subject: [PATCH] Remove card_get_function. It looks like it was intended to be a bridge between OLDCARD and NEWCARD for drivers to inquire after the function number (eg, 0, 1, 2). Nobody ever used it, so retire it with honors. NEWCARD never implemented it, and the same information can be obtained by the pccard_get_function_number(). MFC After: 3 days --- sys/dev/pccard/card_if.m | 9 --------- sys/pccard/pccard_nbk.c | 8 -------- 2 files changed, 17 deletions(-) diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m index d5f34122ace..71c07d9e1cb 100644 --- a/sys/dev/pccard/card_if.m +++ b/sys/dev/pccard/card_if.m @@ -93,15 +93,6 @@ METHOD int detach_card { device_t dev; } -# -# Returns the function number for this device. -# -METHOD int get_function { - device_t dev; - device_t child; - int *func; -} - # # Activates (and powers up if necessary) the card's nth function # since each function gets its own device, there is no need to diff --git a/sys/pccard/pccard_nbk.c b/sys/pccard/pccard_nbk.c index f5c97a8bc44..99b21226b11 100644 --- a/sys/pccard/pccard_nbk.c +++ b/sys/pccard/pccard_nbk.c @@ -381,13 +381,6 @@ pccard_get_memory_offset(device_t bus, device_t child, int rid, } #if __FreeBSD_version >= 500000 -static int -pccard_get_function_num(device_t bus, device_t child, int *function) -{ - *function = 0; - return (0); -} - static int pccard_activate_function(device_t bus, device_t child) { @@ -439,7 +432,6 @@ static device_method_t pccard_methods[] = { DEVMETHOD(card_set_memory_offset, pccard_set_memory_offset), DEVMETHOD(card_get_memory_offset, pccard_get_memory_offset), #if __FreeBSD_version >= 500000 - DEVMETHOD(card_get_function, pccard_get_function_num), DEVMETHOD(card_activate_function, pccard_activate_function), DEVMETHOD(card_deactivate_function, pccard_deactivate_function), DEVMETHOD(card_compat_do_probe, pccard_compat_do_probe),