From 95dc112a5770dc670a1b45a3d9ee346fdd2b2697 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 20 Jun 2005 21:15:16 -0700 Subject: [PATCH] devfs: Remove devfs_mk_dir() function from the kernel tree Removes the devfs_mk_dir() function and all callers of it. Signed-off-by: Greg Kroah-Hartman --- drivers/block/swim3.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/block/swim3.c') diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index 01f042f6f1c..018b2921e8f 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c @@ -1019,8 +1019,6 @@ int swim3_init(void) int err = -ENOMEM; int i; - devfs_mk_dir("floppy"); - swim = find_devices("floppy"); while (swim && (floppy_count < MAX_FLOPPIES)) { -- cgit v1.2.3-70-g09d2 From ff23eca3e8f613034e0d20ff86f6a89b62f5a14e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 20 Jun 2005 21:15:16 -0700 Subject: [PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree Also fixes up all files that #include it. Signed-off-by: Greg Kroah-Hartman --- arch/sparc64/solaris/socksys.c | 1 - arch/um/drivers/line.c | 1 - arch/um/drivers/ubd_kern.c | 1 - drivers/block/acsi_slm.c | 1 - drivers/block/cpqarray.c | 1 - drivers/block/floppy.c | 1 - drivers/block/loop.c | 1 - drivers/block/nbd.c | 2 -- drivers/block/paride/pg.c | 1 - drivers/block/paride/pt.c | 1 - drivers/block/rd.c | 1 - drivers/block/swim3.c | 1 - drivers/block/sx8.c | 1 - drivers/block/ub.c | 1 - drivers/cdrom/cdu31a.c | 1 - drivers/cdrom/cm206.c | 1 - drivers/cdrom/mcdx.c | 1 - drivers/cdrom/sbpcd.c | 1 - drivers/char/dsp56k.c | 1 - drivers/char/dtlk.c | 1 - drivers/char/ftape/zftape/zftape-init.c | 1 - drivers/char/ip2/ip2main.c | 1 - drivers/char/ipmi/ipmi_devintf.c | 1 - drivers/char/istallion.c | 1 - drivers/char/lp.c | 1 - drivers/char/mem.c | 1 - drivers/char/misc.c | 1 - drivers/char/mmtimer.c | 1 - drivers/char/ppdev.c | 1 - drivers/char/pty.c | 1 - drivers/char/raw.c | 1 - drivers/char/stallion.c | 1 - drivers/char/tipar.c | 1 - drivers/char/tty_io.c | 1 - drivers/char/vc_screen.c | 1 - drivers/char/viotape.c | 1 - drivers/char/vt.c | 1 - drivers/input/serio/serio_raw.c | 1 - drivers/isdn/capi/capi.c | 1 - drivers/isdn/hardware/eicon/divamnt.c | 1 - drivers/isdn/hardware/eicon/divasi.c | 1 - drivers/isdn/hardware/eicon/divasmain.c | 1 - drivers/macintosh/adb.c | 1 - drivers/md/dm-ioctl.c | 1 - drivers/md/md.c | 1 - drivers/media/dvb/dvb-core/dvbdev.h | 1 - drivers/media/dvb/ttpci/av7110.h | 4 ---- drivers/media/video/arv.c | 1 - drivers/media/video/videodev.c | 1 - drivers/mmc/mmc_block.c | 1 - drivers/net/ppp_generic.c | 1 - drivers/net/wan/cosa.c | 1 - drivers/s390/block/dasd_int.h | 1 - drivers/s390/block/xpram.c | 1 - drivers/sbus/char/bpp.c | 1 - drivers/sbus/char/vfc.h | 2 -- drivers/telephony/phonedev.c | 1 - drivers/video/fbmem.c | 1 - fs/block_dev.c | 1 - fs/char_dev.c | 1 - fs/coda/psdev.c | 1 - fs/partitions/check.c | 1 - include/asm-ppc/ocp.h | 1 - include/linux/devfs_fs_kernel.h | 9 --------- include/linux/fb.h | 1 - init/do_mounts.h | 1 - init/main.c | 1 - mm/shmem.c | 1 - mm/tiny-shmem.c | 1 - net/irda/irnet/irnet.h | 1 - 70 files changed, 83 deletions(-) delete mode 100644 include/linux/devfs_fs_kernel.h (limited to 'drivers/block/swim3.c') diff --git a/arch/sparc64/solaris/socksys.c b/arch/sparc64/solaris/socksys.c index 09664ab124e..bc3df95bc05 100644 --- a/arch/sparc64/solaris/socksys.c +++ b/arch/sparc64/solaris/socksys.c @@ -26,7 +26,6 @@ #include #include #include -#include #include diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c index 6c2d4ccaf20..ee1fe6a2490 100644 --- a/arch/um/drivers/line.c +++ b/arch/um/drivers/line.c @@ -8,7 +8,6 @@ #include "linux/list.h" #include "linux/kd.h" #include "linux/interrupt.h" -#include "linux/devfs_fs_kernel.h" #include "asm/uaccess.h" #include "chan_kern.h" #include "irq_user.h" diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 3883c5e6a7d..5856a02fff5 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c @@ -25,7 +25,6 @@ #include "linux/blkdev.h" #include "linux/hdreg.h" #include "linux/init.h" -#include "linux/devfs_fs_kernel.h" #include "linux/cdrom.h" #include "linux/proc_fs.h" #include "linux/ctype.h" diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c index 7495fef2418..4030a8fd118 100644 --- a/drivers/block/acsi_slm.c +++ b/drivers/block/acsi_slm.c @@ -65,7 +65,6 @@ not be guaranteed. There are several ways to assure this: #include #include #include -#include #include #include diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index 2701ed734b2..f96e6c03593 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 8e101a9655b..0242cbb86a8 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -177,7 +177,6 @@ static int print_unex = 1; #include #include #include -#include #include #include /* for invalidate_buffers() */ #include diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 0319b096b55..dbf905ce024 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -63,7 +63,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index c24b349ae57..b164ee0ac79 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -29,8 +29,6 @@ #include #include -#include - #include #include #include diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c index e6f1614b69c..13f998aa1cd 100644 --- a/drivers/block/paride/pg.c +++ b/drivers/block/paride/pg.c @@ -156,7 +156,6 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY}; #include #include #include -#include #include #include #include diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c index ea12073c5fb..35fb2663672 100644 --- a/drivers/block/paride/pt.c +++ b/drivers/block/paride/pt.c @@ -141,7 +141,6 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3}; #include #include #include -#include #include #include #include diff --git a/drivers/block/rd.c b/drivers/block/rd.c index acaa2abf05a..536be2de989 100644 --- a/drivers/block/rd.c +++ b/drivers/block/rd.c @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index 018b2921e8f..ef557b1043d 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index a366ea8c6a4..3a481455156 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/block/ub.c b/drivers/block/ub.c index b68abc9d4c1..87ec6458bd1 100644 --- a/drivers/block/ub.c +++ b/drivers/block/ub.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c index 72ffd64e8b1..5f0f2027f29 100644 --- a/drivers/cdrom/cdu31a.c +++ b/drivers/cdrom/cdu31a.c @@ -161,7 +161,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c index f43a988dd41..4ee288688fe 100644 --- a/drivers/cdrom/cm206.c +++ b/drivers/cdrom/cm206.c @@ -187,7 +187,6 @@ History: #include #include #include -#include #include #include #include diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c index 0f6e7aab8d2..788c7a0b2fe 100644 --- a/drivers/cdrom/mcdx.c +++ b/drivers/cdrom/mcdx.c @@ -74,7 +74,6 @@ static const char *mcdx_c_version #include #define MAJOR_NR MITSUMI_X_CDROM_MAJOR #include -#include #include "mcdx.h" diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c index 55cbd23fd9c..a75b363b19c 100644 --- a/drivers/cdrom/sbpcd.c +++ b/drivers/cdrom/sbpcd.c @@ -371,7 +371,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c index ee32e58328a..09b413618b5 100644 --- a/drivers/char/dsp56k.c +++ b/drivers/char/dsp56k.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c index 6da88e292dc..da2c89f1b8b 100644 --- a/drivers/char/dtlk.c +++ b/drivers/char/dtlk.c @@ -62,7 +62,6 @@ #include /* for __init, module_{init,exit} */ #include /* for POLLIN, etc. */ #include /* local header file for DoubleTalk values */ -#include #include #ifdef TRACING diff --git a/drivers/char/ftape/zftape/zftape-init.c b/drivers/char/ftape/zftape/zftape-init.c index e09ad2b100b..3eeb869a9a1 100644 --- a/drivers/char/ftape/zftape/zftape-init.c +++ b/drivers/char/ftape/zftape/zftape-init.c @@ -33,7 +33,6 @@ #endif #include #include -#include #include #include diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index 5d2d5732d82..a273eef69a8 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c @@ -91,7 +91,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c index 3103ed8e3ad..da637adbbfa 100644 --- a/drivers/char/ipmi/ipmi_devintf.c +++ b/drivers/char/ipmi/ipmi_devintf.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c index 0a5808e15b7..1386d6a519d 100644 --- a/drivers/char/istallion.c +++ b/drivers/char/istallion.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include diff --git a/drivers/char/lp.c b/drivers/char/lp.c index 530b19de4a3..b11a390581b 100644 --- a/drivers/char/lp.c +++ b/drivers/char/lp.c @@ -120,7 +120,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/char/mem.c b/drivers/char/mem.c index e7aa71575aa..6fe7b6c6c46 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/char/misc.c b/drivers/char/misc.c index bf2e49e11cc..f1fdd84c5dc 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c index d65b3109318..f25168a9676 100644 --- a/drivers/char/mmtimer.c +++ b/drivers/char/mmtimer.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index c8a2eb1a558..24231d9743d 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/char/pty.c b/drivers/char/pty.c index 64d3d1d0b31..345f8b8d57c 100644 --- a/drivers/char/pty.c +++ b/drivers/char/pty.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/drivers/char/raw.c b/drivers/char/raw.c index 941a17ab219..9bf97c5e38c 100644 --- a/drivers/char/raw.c +++ b/drivers/char/raw.c @@ -10,7 +10,6 @@ #include #include -#include #include #include #include diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c index 7840eb16f17..36df18cd96d 100644 --- a/drivers/char/stallion.c +++ b/drivers/char/stallion.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include diff --git a/drivers/char/tipar.c b/drivers/char/tipar.c index 48476f8fcda..f7802e5bd7c 100644 --- a/drivers/char/tipar.c +++ b/drivers/char/tipar.c @@ -56,7 +56,6 @@ #include #include #include -#include /* DevFs support */ #include /* Our code depend on parport */ #include diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index b8e03a31a50..ebe1158e6c6 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -102,7 +102,6 @@ #include #include #include -#include #include diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c index 2266fbad62c..234d7f3fb11 100644 --- a/drivers/char/vc_screen.c +++ b/drivers/char/vc_screen.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index b101134a844..198f1505ae2 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 714d95ff2f1..42afe7cea04 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -79,7 +79,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c index 5a2703b536d..71a8eea816c 100644 --- a/drivers/input/serio/serio_raw.c +++ b/drivers/input/serio/serio_raw.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index 1200d1de1de..334402e96e1 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #if defined(CONFIG_ISDN_CAPI_CAPIFS) || defined(CONFIG_ISDN_CAPI_CAPIFS_MODULE) diff --git a/drivers/isdn/hardware/eicon/divamnt.c b/drivers/isdn/hardware/eicon/divamnt.c index 83841d16c35..b163c590918 100644 --- a/drivers/isdn/hardware/eicon/divamnt.c +++ b/drivers/isdn/hardware/eicon/divamnt.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include "platform.h" diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c index dcd5b650a00..6e7d89a31c1 100644 --- a/drivers/isdn/hardware/eicon/divasi.c +++ b/drivers/isdn/hardware/eicon/divasi.c @@ -19,7 +19,6 @@ #include #include #include -#include #include #include "platform.h" diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c index bbb7d8fc207..9dee6a39104 100644 --- a/drivers/isdn/hardware/eicon/divasmain.c +++ b/drivers/isdn/hardware/eicon/divasmain.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index a60e3abaa8e..9f1a049dc22 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 361d50b6469..3ad60caea77 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include diff --git a/drivers/md/md.c b/drivers/md/md.c index 9fc2314b58d..95c275d1931 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -39,7 +39,6 @@ #include #include #include -#include #include /* for invalidate_bdev */ #include #include diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h index d7a976d040d..7a7f75fd168 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.h +++ b/drivers/media/dvb/dvb-core/dvbdev.h @@ -27,7 +27,6 @@ #include #include #include -#include #include #define DVB_MAJOR 212 diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h index 3e2e12124ba..9c79696da08 100644 --- a/drivers/media/dvb/ttpci/av7110.h +++ b/drivers/media/dvb/ttpci/av7110.h @@ -6,10 +6,6 @@ #include #include -#ifdef CONFIG_DEVFS_FS -#include -#endif - #include #include #include diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c index 6e08e32346e..ae14f5f3203 100644 --- a/drivers/media/video/arv.c +++ b/drivers/media/video/arv.c @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 3178353787d..a802a7e0df7 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c @@ -37,7 +37,6 @@ #include #include #include -#include #include #include diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c index 2e5218b8d4a..46138f4e208 100644 --- a/drivers/mmc/mmc_block.c +++ b/drivers/mmc/mmc_block.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 16a59cafb8d..425ff5b117f 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c index 3d1e2b6700a..be5e33814cb 100644 --- a/drivers/net/wan/cosa.c +++ b/drivers/net/wan/cosa.c @@ -85,7 +85,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h index d4b13e300a7..1893797f2bf 100644 --- a/drivers/s390/block/dasd_int.h +++ b/drivers/s390/block/dasd_int.h @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index 15aad01bba0..f57a6c8816b 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c @@ -36,7 +36,6 @@ #include /* HDIO_GETGEO */ #include #include -#include #include #define XPRAM_NAME "xpram" diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c index 03ff5a3b121..385f4f76831 100644 --- a/drivers/sbus/char/bpp.c +++ b/drivers/sbus/char/bpp.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/drivers/sbus/char/vfc.h b/drivers/sbus/char/vfc.h index 8045cd5e7cb..63941a259b9 100644 --- a/drivers/sbus/char/vfc.h +++ b/drivers/sbus/char/vfc.h @@ -1,8 +1,6 @@ #ifndef _LINUX_VFC_H_ #define _LINUX_VFC_H_ -#include - /* * The control register for the vfc is at offset 0x4000 * The first field ram bank is located at offset 0x5000 diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c index bc5b1d245df..e41f49afd0f 100644 --- a/drivers/telephony/phonedev.c +++ b/drivers/telephony/phonedev.c @@ -28,7 +28,6 @@ #include #include -#include #include #define PHONE_NUM_DEVICES 256 diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index afa56a887fa..a171daab0ad 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c @@ -32,7 +32,6 @@ #ifdef CONFIG_KMOD #include #endif -#include #include #include #include diff --git a/fs/block_dev.c b/fs/block_dev.c index 028d9fb9c2d..ddb305eebf9 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/char_dev.c b/fs/char_dev.c index f3418f7a6e9..97986635b64 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c index aaf6462a942..803aacf0d49 100644 --- a/fs/coda/psdev.c +++ b/fs/coda/psdev.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 202f50acea8..839634026eb 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c @@ -18,7 +18,6 @@ #include #include #include -#include #include "check.h" diff --git a/include/asm-ppc/ocp.h b/include/asm-ppc/ocp.h index 3be5d760ffc..16dbc7d1745 100644 --- a/include/asm-ppc/ocp.h +++ b/include/asm-ppc/ocp.h @@ -26,7 +26,6 @@ #include #include -#include #include #include diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h deleted file mode 100644 index 2036d2e9098..00000000000 --- a/include/linux/devfs_fs_kernel.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _LINUX_DEVFS_FS_KERNEL_H -#define _LINUX_DEVFS_FS_KERNEL_H - -#include -#include -#include -#include - -#endif /* _LINUX_DEVFS_FS_KERNEL_H */ diff --git a/include/linux/fb.h b/include/linux/fb.h index 07a08e92bc7..b45928f5c63 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -380,7 +380,6 @@ struct fb_cursor { #include #include #include -#include #include #include #include diff --git a/init/do_mounts.h b/init/do_mounts.h index 66548efe4c3..e7f2e7fa066 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -1,6 +1,5 @@ #include #include -#include #include #include #include diff --git a/init/main.c b/init/main.c index 80af1a52485..acbb0b74913 100644 --- a/init/main.c +++ b/init/main.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/mm/shmem.c b/mm/shmem.c index a4161abb9e7..355904712a8 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c index 11ab99b8c61..5f2cbf0f153 100644 --- a/mm/tiny-shmem.c +++ b/mm/tiny-shmem.c @@ -12,7 +12,6 @@ #include #include -#include #include #include #include diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index e4fe1e80029..ad6caba02a7 100644 --- a/net/irda/irnet/irnet.h +++ b/net/irda/irnet/irnet.h @@ -244,7 +244,6 @@ #include #include #include -#include #include #include #include -- cgit v1.2.3-70-g09d2 From ce7b0f46bbf4bff8daab2dd3d878b9e72a623d09 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 20 Jun 2005 21:15:16 -0700 Subject: [PATCH] devfs: Remove the gendisk devfs_name field as it's no longer needed And remove the now unneeded number field. Also fixes all drivers that set these fields. Signed-off-by: Greg Kroah-Hartman --- arch/um/drivers/ubd_kern.c | 8 ++------ drivers/block/DAC960.c | 1 - drivers/block/acsi.c | 5 +---- drivers/block/cciss.c | 1 - drivers/block/cpqarray.c | 2 -- drivers/block/loop.c | 1 - drivers/block/nbd.c | 1 - drivers/block/ps2esdi.c | 1 - drivers/block/rd.c | 1 - drivers/block/swim3.c | 1 - drivers/block/sx8.c | 1 - drivers/block/ub.c | 2 -- drivers/block/umem.c | 1 - drivers/block/viodasd.c | 2 -- drivers/block/xd.c | 1 - drivers/block/z2ram.c | 1 - drivers/cdrom/aztcd.c | 1 - drivers/cdrom/gscd.c | 1 - drivers/cdrom/optcd.c | 1 - drivers/cdrom/sbpcd.c | 1 - drivers/cdrom/sjcd.c | 1 - drivers/cdrom/sonycd535.c | 1 - drivers/cdrom/viocd.c | 2 -- drivers/md/md.c | 7 ++----- drivers/message/i2o/i2o_block.c | 1 - drivers/mmc/mmc_block.c | 1 - drivers/s390/block/dasd_genhd.c | 2 -- drivers/s390/block/xpram.c | 1 - include/linux/genhd.h | 2 -- 29 files changed, 5 insertions(+), 47 deletions(-) (limited to 'drivers/block/swim3.c') diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 5856a02fff5..c3e205b6a4c 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c @@ -637,14 +637,10 @@ static int ubd_new_disk(int major, u64 size, int unit, disk->first_minor = unit << UBD_SHIFT; disk->fops = &ubd_blops; set_capacity(disk, size / 512); - if(major == MAJOR_NR){ + if(major == MAJOR_NR) sprintf(disk->disk_name, "ubd%c", 'a' + unit); - sprintf(disk->devfs_name, "ubd/disc%d", unit); - } - else { + else sprintf(disk->disk_name, "ubd_fake%d", unit); - sprintf(disk->devfs_name, "ubd_fake/disc%d", unit); - } /* sysfs register (not for ide fake devices) */ if (major == MAJOR_NR) { diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index dd8a1501142..50ca1aa4ee3 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c @@ -2530,7 +2530,6 @@ static boolean DAC960_RegisterBlockDevice(DAC960_Controller_T *Controller) blk_queue_max_sectors(RequestQueue, Controller->MaxBlocksPerCommand); disk->queue = RequestQueue; sprintf(disk->disk_name, "rd/c%dd%d", Controller->ControllerNumber, n); - sprintf(disk->devfs_name, "rd/host%d/target%d", Controller->ControllerNumber, n); disk->major = MajorNumber; disk->first_minor = n << DAC960_MaxPartitionsBits; disk->fops = &DAC960_BlockDeviceOperations; diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c index 196c0ec9cd5..a317e430395 100644 --- a/drivers/block/acsi.c +++ b/drivers/block/acsi.c @@ -1732,13 +1732,10 @@ int acsi_init( void ) struct gendisk *disk = acsi_gendisk[i]; sprintf(disk->disk_name, "ad%c", 'a'+i); aip = &acsi_info[NDevices]; - sprintf(disk->devfs_name, "ad/target%d/lun%d", aip->target, aip->lun); disk->major = ACSI_MAJOR; disk->first_minor = i << 4; - if (acsi_info[i].type != HARDDISK) { + if (acsi_info[i].type != HARDDISK) disk->minors = 1; - strcat(disk->devfs_name, "/disc"); - } disk->fops = &acsi_fops; disk->private_data = &acsi_info[i]; set_capacity(disk, acsi_info[i].size); diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 39b0f53186e..05fb08312c0 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -3248,7 +3248,6 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, q->queuedata = hba[i]; sprintf(disk->disk_name, "cciss/c%dd%d", i, j); - sprintf(disk->devfs_name, "cciss/host%d/target%d", i, j); disk->major = hba[i]->major; disk->first_minor = j << NWD_SHIFT; disk->fops = &cciss_fops; diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index f96e6c03593..bfd245df0a8 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c @@ -1805,8 +1805,6 @@ static void getgeometry(int ctlr) } - sprintf(disk->devfs_name, "ida/c%dd%d", ctlr, log_unit); - info_p->phys_drives = sense_config_buf->ctlr_phys_drv; info_p->drv_assign_map diff --git a/drivers/block/loop.c b/drivers/block/loop.c index dbf905ce024..9983e720021 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -1293,7 +1293,6 @@ static int __init loop_init(void) disk->first_minor = i; disk->fops = &lo_fops; sprintf(disk->disk_name, "loop%d", i); - sprintf(disk->devfs_name, "loop/%d", i); disk->private_data = lo; disk->queue = lo->lo_queue; } diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index b164ee0ac79..39662f0c9cc 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -657,7 +657,6 @@ static int __init nbd_init(void) disk->private_data = &nbd_dev[i]; disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO; sprintf(disk->disk_name, "nbd%d", i); - sprintf(disk->devfs_name, "nbd/%d", i); set_capacity(disk, 0x7ffffc00ULL << 1); /* 2 TB */ add_disk(disk); } diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c index bea75f2cb21..a729013a397 100644 --- a/drivers/block/ps2esdi.c +++ b/drivers/block/ps2esdi.c @@ -421,7 +421,6 @@ static int __init ps2esdi_geninit(void) disk->major = PS2ESDI_MAJOR; disk->first_minor = i<<6; sprintf(disk->disk_name, "ed%c", 'a'+i); - sprintf(disk->devfs_name, "ed/target%d", i); disk->fops = &ps2esdi_fops; ps2esdi_gendisk[i] = disk; } diff --git a/drivers/block/rd.c b/drivers/block/rd.c index 536be2de989..e64f26ec614 100644 --- a/drivers/block/rd.c +++ b/drivers/block/rd.c @@ -457,7 +457,6 @@ static int __init rd_init(void) disk->queue = rd_queue[i]; disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO; sprintf(disk->disk_name, "ram%d", i); - sprintf(disk->devfs_name, "rd/%d", i); set_capacity(disk, rd_size * 2); add_disk(rd_disks[i]); } diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index ef557b1043d..628877945f9 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c @@ -1061,7 +1061,6 @@ int swim3_init(void) disk->queue = swim3_queue; disk->flags |= GENHD_FL_REMOVABLE; sprintf(disk->disk_name, "fd%d", i); - sprintf(disk->devfs_name, "floppy/%d", i); set_capacity(disk, 2880); add_disk(disk); } diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index 3a481455156..fbddeb4b04a 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c @@ -1509,7 +1509,6 @@ static int carm_init_disks(struct carm_host *host) port->disk = disk; sprintf(disk->disk_name, DRV_NAME "/%u", (unsigned int) (host->id * CARM_MAX_PORTS) + i); - sprintf(disk->devfs_name, DRV_NAME "/%u_%u", host->id, i); disk->major = host->major; disk->first_minor = i * CARM_MINORS_PER_MAJOR; disk->fops = &carm_bd_ops; diff --git a/drivers/block/ub.c b/drivers/block/ub.c index 87ec6458bd1..d62b49fbf10 100644 --- a/drivers/block/ub.c +++ b/drivers/block/ub.c @@ -28,7 +28,6 @@ #include #define DRV_NAME "ub" -#define DEVFS_NAME DRV_NAME #define UB_MAJOR 180 @@ -2290,7 +2289,6 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum) goto err_diskalloc; sprintf(disk->disk_name, DRV_NAME "%c", lun->id + 'a'); - sprintf(disk->devfs_name, DEVFS_NAME "/%c", lun->id + 'a'); disk->major = UB_MAJOR; disk->first_minor = lun->id * UB_PARTS_PER_LUN; disk->fops = &ub_bd_fops; diff --git a/drivers/block/umem.c b/drivers/block/umem.c index f7d4c65a7b8..585197b95af 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c @@ -1192,7 +1192,6 @@ static int __init mm_init(void) for (i = 0; i < num_cards; i++) { struct gendisk *disk = mm_gendisk[i]; sprintf(disk->disk_name, "umem%c", 'a'+i); - sprintf(disk->devfs_name, "umem/card%d", i); spin_lock_init(&cards[i].lock); disk->major = major_nr; disk->first_minor = i << MM_SHIFT; diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index b0df4f5ab97..5cc7e671b03 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c @@ -523,8 +523,6 @@ retry: else snprintf(g->disk_name, sizeof(g->disk_name), VIOD_GENHD_NAME "%c", 'a' + (dev_no % 26)); - snprintf(g->devfs_name, sizeof(g->devfs_name), - "%s%d", VIOD_GENHD_DEVFS_NAME, dev_no); g->fops = &viodasd_fops; g->queue = q; g->private_data = d; diff --git a/drivers/block/xd.c b/drivers/block/xd.c index cbce7c5e944..e828e4cbd3e 100644 --- a/drivers/block/xd.c +++ b/drivers/block/xd.c @@ -215,7 +215,6 @@ static int __init xd_init(void) disk->major = XT_DISK_MAJOR; disk->first_minor = i<<6; sprintf(disk->disk_name, "xd%c", i+'a'); - sprintf(disk->devfs_name, "xd/target%d", i); disk->fops = &xd_fops; disk->private_data = p; disk->queue = xd_queue; diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index bb5e8d665a2..82ddbdd7bd4 100644 --- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c @@ -354,7 +354,6 @@ z2_init(void) z2ram_gendisk->first_minor = 0; z2ram_gendisk->fops = &z2_fops; sprintf(z2ram_gendisk->disk_name, "z2ram"); - strcpy(z2ram_gendisk->devfs_name, z2ram_gendisk->disk_name); z2ram_gendisk->queue = z2_queue; add_disk(z2ram_gendisk); diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c index ec004897b63..ec469497c10 100644 --- a/drivers/cdrom/aztcd.c +++ b/drivers/cdrom/aztcd.c @@ -1918,7 +1918,6 @@ static int __init aztcd_init(void) azt_disk->first_minor = 0; azt_disk->fops = &azt_fops; sprintf(azt_disk->disk_name, "aztcd"); - sprintf(azt_disk->devfs_name, "aztcd"); azt_disk->queue = azt_queue; add_disk(azt_disk); azt_invalidate_buffers(); diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c index ad5464ab99b..b6ee50a2916 100644 --- a/drivers/cdrom/gscd.c +++ b/drivers/cdrom/gscd.c @@ -955,7 +955,6 @@ static int __init gscd_init(void) gscd_disk->first_minor = 0; gscd_disk->fops = &gscd_fops; sprintf(gscd_disk->disk_name, "gscd"); - sprintf(gscd_disk->devfs_name, "gscd"); if (register_blkdev(MAJOR_NR, "gscd")) { ret = -EIO; diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c index 0b0eab4f40f..25032d7edc5 100644 --- a/drivers/cdrom/optcd.c +++ b/drivers/cdrom/optcd.c @@ -2033,7 +2033,6 @@ static int __init optcd_init(void) optcd_disk->first_minor = 0; optcd_disk->fops = &opt_fops; sprintf(optcd_disk->disk_name, "optcd"); - sprintf(optcd_disk->devfs_name, "optcd"); if (!request_region(optcd_port, 4, "optcd")) { printk(KERN_ERR "optcd: conflict, I/O port 0x%x already used\n", diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c index a75b363b19c..2fc966c65a0 100644 --- a/drivers/cdrom/sbpcd.c +++ b/drivers/cdrom/sbpcd.c @@ -5868,7 +5868,6 @@ int __init sbpcd_init(void) disk->fops = &sbpcd_bdops; strcpy(disk->disk_name, sbpcd_infop->name); disk->flags = GENHD_FL_CD; - sprintf(disk->devfs_name, "sbp/c0t%d", p->drv_id); p->disk = disk; if (register_cdrom(sbpcd_infop)) { diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c index 74b1cadbf16..bf5aef4e555 100644 --- a/drivers/cdrom/sjcd.c +++ b/drivers/cdrom/sjcd.c @@ -1695,7 +1695,6 @@ static int __init sjcd_init(void) sjcd_disk->first_minor = 0, sjcd_disk->fops = &sjcd_fops, sprintf(sjcd_disk->disk_name, "sjcd"); - sprintf(sjcd_disk->devfs_name, "sjcd"); if (!request_region(sjcd_base, 4,"sjcd")) { printk diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c index e6565992643..8f7cc452af8 100644 --- a/drivers/cdrom/sonycd535.c +++ b/drivers/cdrom/sonycd535.c @@ -1589,7 +1589,6 @@ static int __init sony535_init(void) cdu_disk->first_minor = 0; cdu_disk->fops = &cdu_fops; sprintf(cdu_disk->disk_name, "cdu"); - sprintf(cdu_disk->devfs_name, "cdu535"); if (!request_region(sony535_cd_base_io, 4, CDU535_HANDLE)) { printk(KERN_WARNING"sonycd535: Unable to request region 0x%x\n", diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index af6b3bfd169..f6559708117 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c @@ -688,8 +688,6 @@ static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id) gendisk->first_minor = deviceno; strncpy(gendisk->disk_name, c->name, sizeof(gendisk->disk_name)); - snprintf(gendisk->devfs_name, sizeof(gendisk->devfs_name), - VIOCD_DEVICE_DEVFS "%d", deviceno); blk_queue_max_hw_segments(q, 1); blk_queue_max_phys_segments(q, 1); blk_queue_max_sectors(q, 4096 / 512); diff --git a/drivers/md/md.c b/drivers/md/md.c index 95c275d1931..2ec1b3520a0 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2910,13 +2910,10 @@ static struct kobject *md_probe(dev_t dev, int *part, void *data) } disk->major = MAJOR(dev); disk->first_minor = unit << shift; - if (partitioned) { + if (partitioned) sprintf(disk->disk_name, "md_d%d", unit); - sprintf(disk->devfs_name, "md/d%d", unit); - } else { + else sprintf(disk->disk_name, "md%d", unit); - sprintf(disk->devfs_name, "md/%d", unit); - } disk->fops = &md_fops; disk->private_data = mddev; disk->queue = mddev->queue; diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index 7d4c5497785..1ddc2fb429d 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c @@ -1089,7 +1089,6 @@ static int i2o_block_probe(struct device *dev) gd = i2o_blk_dev->gd; gd->first_minor = unit << 4; sprintf(gd->disk_name, "i2o/hd%c", 'a' + unit); - sprintf(gd->devfs_name, "i2o/hd%c", 'a' + unit); gd->driverfs_dev = &i2o_dev->device; /* setup request queue */ diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c index 46138f4e208..115cc21094b 100644 --- a/drivers/mmc/mmc_block.c +++ b/drivers/mmc/mmc_block.c @@ -408,7 +408,6 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) */ sprintf(md->disk->disk_name, "mmcblk%d", devidx); - sprintf(md->disk->devfs_name, "mmc/blk%d", devidx); blk_queue_hardsect_size(md->queue.queue, 1 << md->block_bits); diff --git a/drivers/s390/block/dasd_genhd.c b/drivers/s390/block/dasd_genhd.c index fce2835e7d1..61ffde718a7 100644 --- a/drivers/s390/block/dasd_genhd.c +++ b/drivers/s390/block/dasd_genhd.c @@ -68,8 +68,6 @@ dasd_gendisk_alloc(struct dasd_device *device) } len += sprintf(gdp->disk_name + len, "%c", 'a'+(device->devindex%26)); - sprintf(gdp->devfs_name, "dasd/%s", device->cdev->dev.bus_id); - if (device->features & DASD_FEATURE_READONLY) set_disk_ro(gdp, 1); gdp->private_data = device; diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index f57a6c8816b..4c1e56b9b98 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c @@ -466,7 +466,6 @@ static int __init xpram_setup_blkdev(void) disk->private_data = &xpram_devices[i]; disk->queue = xpram_queue; sprintf(disk->disk_name, "slram%d", i); - sprintf(disk->devfs_name, "slram/%d", i); set_capacity(disk, xpram_sizes[i] << 1); add_disk(disk); } diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 3498a0c6818..e4af57e87c1 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -112,8 +112,6 @@ struct gendisk { sector_t capacity; int flags; - char devfs_name[64]; /* devfs crap */ - int number; /* more of the same */ struct device *driverfs_dev; struct kobject kobj; struct kobject *holder_dir; -- cgit v1.2.3-70-g09d2