summaryrefslogtreecommitdiffstats
path: root/sys/pccard
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-08-23 20:59:21 +0000
committerphk <phk@FreeBSD.org>1999-08-23 20:59:21 +0000
commit663cbe4fc26065f7af7d10faaee492a626156145 (patch)
tree32e619fadb473bfb85ff8e06044176f2ff323cce /sys/pccard
parent2a5ff1f726f814a9e4717afe3f14250f8030cace (diff)
downloadFreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.zip
FreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.tar.gz
Convert DEVFS hooks in (most) drivers to make_dev().
Diskslice/label code not yet handled. Vinum, i4b, alpha, pc98 not dealt with (left to respective Maintainers) Add the correct hook for devfs to kern_conf.c The net result of this excercise is that a lot less files depends on DEVFS, and devtoname() gets more sensible output in many cases. A few drivers had minor additional cleanups performed relating to cdevsw registration. A few drivers don't register a cdevsw{} anymore, but only use make_dev().
Diffstat (limited to 'sys/pccard')
-rw-r--r--sys/pccard/pccard.c11
-rw-r--r--sys/pccard/slot.h4
2 files changed, 2 insertions, 13 deletions
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index c450951..07be6c1 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -28,10 +28,9 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: pccard.c,v 1.80 1999/05/31 11:28:48 phk Exp $
+ * $Id: pccard.c,v 1.81 1999/08/01 18:12:50 imp Exp $
*/
-#include "opt_devfs.h"
#include "opt_pcic.h"
#include <sys/param.h>
@@ -42,9 +41,6 @@
#include <sys/select.h>
#include <sys/sysctl.h>
#include <sys/conf.h>
-#ifdef DEVFS
-#include <sys/devfsext.h>
-#endif /*DEVFS*/
#include <sys/uio.h>
#include <sys/poll.h>
#include <sys/interrupt.h>
@@ -477,10 +473,7 @@ pccard_alloc_slot(struct slot_ctrl *ctrl)
MALLOC(slt, struct slot *, sizeof(*slt), M_DEVBUF, M_WAITOK);
bzero(slt, sizeof(*slt));
-#ifdef DEVFS
- slt->devfs_token = devfs_add_devswf(&crd_cdevsw,
- slotno, DV_CHR, 0, 0, 0600, "card%d", slotno);
-#endif
+ make_dev(&crd_cdevsw, slotno, 0, 0, 0600, "card%d", slotno);
if (ctrl->extra) {
MALLOC(slt->cdata, void *, ctrl->extra, M_DEVBUF, M_WAITOK);
bzero(slt->cdata, ctrl->extra);
diff --git a/sys/pccard/slot.h b/sys/pccard/slot.h
index 396b967..619d6f5 100644
--- a/sys/pccard/slot.h
+++ b/sys/pccard/slot.h
@@ -149,10 +149,6 @@ struct slot {
struct slot_ctrl *ctrl; /* Per-controller data */
void *cdata; /* Controller specific data */
int pwr_off_pending;/* Power status of slot */
-#ifdef DEVFS
- void *devfs_token;
-#endif /* DEVFS*/
-
struct slot *next; /* Master list */
};
OpenPOWER on IntegriCloud