aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sbus/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/sbus/char')
-rw-r--r--drivers/sbus/char/bpp.c9
-rw-r--r--drivers/sbus/char/vfc.h2
-rw-r--r--drivers/sbus/char/vfc_dev.c7
3 files changed, 0 insertions, 18 deletions
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c
index ccb20a6f5f36..385f4f768311 100644
--- a/drivers/sbus/char/bpp.c
+++ b/drivers/sbus/char/bpp.c
@@ -20,7 +20,6 @@
20#include <linux/timer.h> 20#include <linux/timer.h>
21#include <linux/ioport.h> 21#include <linux/ioport.h>
22#include <linux/major.h> 22#include <linux/major.h>
23#include <linux/devfs_fs_kernel.h>
24 23
25#include <asm/uaccess.h> 24#include <asm/uaccess.h>
26#include <asm/io.h> 25#include <asm/io.h>
@@ -1031,11 +1030,6 @@ static int __init bpp_init(void)
1031 instances[idx].opened = 0; 1030 instances[idx].opened = 0;
1032 probeLptPort(idx); 1031 probeLptPort(idx);
1033 } 1032 }
1034 devfs_mk_dir("bpp");
1035 for (idx = 0; idx < BPP_NO; idx++) {
1036 devfs_mk_cdev(MKDEV(BPP_MAJOR, idx),
1037 S_IFCHR | S_IRUSR | S_IWUSR, "bpp/%d", idx);
1038 }
1039 1033
1040 return 0; 1034 return 0;
1041} 1035}
@@ -1044,9 +1038,6 @@ static void __exit bpp_cleanup(void)
1044{ 1038{
1045 unsigned idx; 1039 unsigned idx;
1046 1040
1047 for (idx = 0; idx < BPP_NO; idx++)
1048 devfs_remove("bpp/%d", idx);
1049 devfs_remove("bpp");
1050 unregister_chrdev(BPP_MAJOR, dev_name); 1041 unregister_chrdev(BPP_MAJOR, dev_name);
1051 1042
1052 for (idx = 0; idx < BPP_NO; idx++) { 1043 for (idx = 0; idx < BPP_NO; idx++) {
diff --git a/drivers/sbus/char/vfc.h b/drivers/sbus/char/vfc.h
index 8045cd5e7cb3..63941a259b92 100644
--- a/drivers/sbus/char/vfc.h
+++ b/drivers/sbus/char/vfc.h
@@ -1,8 +1,6 @@
1#ifndef _LINUX_VFC_H_ 1#ifndef _LINUX_VFC_H_
2#define _LINUX_VFC_H_ 2#define _LINUX_VFC_H_
3 3
4#include <linux/devfs_fs_kernel.h>
5
6/* 4/*
7 * The control register for the vfc is at offset 0x4000 5 * The control register for the vfc is at offset 0x4000
8 * The first field ram bank is located at offset 0x5000 6 * The first field ram bank is located at offset 0x5000
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c
index ddcd330b9e89..55b2b31bd7ab 100644
--- a/drivers/sbus/char/vfc_dev.c
+++ b/drivers/sbus/char/vfc_dev.c
@@ -164,10 +164,6 @@ int init_vfc_device(struct sbus_dev *sdev,struct vfc_dev *dev, int instance)
164 return -EINVAL; 164 return -EINVAL;
165 if (init_vfc_hw(dev)) 165 if (init_vfc_hw(dev))
166 return -EIO; 166 return -EIO;
167
168 devfs_mk_cdev(MKDEV(VFC_MAJOR, instance),
169 S_IFCHR | S_IRUSR | S_IWUSR,
170 "vfc/%d", instance);
171 return 0; 167 return 0;
172} 168}
173 169
@@ -677,7 +673,6 @@ static int vfc_probe(void)
677 kfree(vfc_dev_lst); 673 kfree(vfc_dev_lst);
678 return -EIO; 674 return -EIO;
679 } 675 }
680 devfs_mk_dir("vfc");
681 instance = 0; 676 instance = 0;
682 for_all_sbusdev(sdev, sbus) { 677 for_all_sbusdev(sdev, sbus) {
683 if (strcmp(sdev->prom_name, "vfc") == 0) { 678 if (strcmp(sdev->prom_name, "vfc") == 0) {
@@ -717,7 +712,6 @@ static void deinit_vfc_device(struct vfc_dev *dev)
717{ 712{
718 if(dev == NULL) 713 if(dev == NULL)
719 return; 714 return;
720 devfs_remove("vfc/%d", dev->instance);
721 sbus_iounmap(dev->regs, sizeof(struct vfc_regs)); 715 sbus_iounmap(dev->regs, sizeof(struct vfc_regs));
722 kfree(dev); 716 kfree(dev);
723} 717}
@@ -731,7 +725,6 @@ void cleanup_module(void)
731 for (devp = vfc_dev_lst; *devp; devp++) 725 for (devp = vfc_dev_lst; *devp; devp++)
732 deinit_vfc_device(*devp); 726 deinit_vfc_device(*devp);
733 727
734 devfs_remove("vfc");
735 kfree(vfc_dev_lst); 728 kfree(vfc_dev_lst);
736 return; 729 return;
737} 730}