From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Wed, 20 Jun 2001 15:58:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Wed, 20 Jun 2001 15:58:39 -0400 Received: from hera.cwi.nl ([192.16.191.8]:46734 "EHLO hera.cwi.nl") by vger.kernel.org with ESMTP id ; Wed, 20 Jun 2001 15:58:30 -0400 Date: Wed, 20 Jun 2001 21:58:24 +0200 (MET DST) From: Andries.Brouwer@cwi.nl Message-Id: To: alan@lxorguk.ukuu.org.uk, torvalds@transmeta.com Subject: [PATCH] remove null register_disk Cc: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org In fs/partitions/check.c we read void register_disk(struct gendisk *gdev, kdev_t dev, unsigned minors, struct block_device_operations *ops, long size) { if (!gdev) return; grok_partitions(gdev, MINOR(dev)>>gdev->minor_shift, minors, size); } showing that register_disk is void when its first argument is NULL. This allows one to remove some dead code. Can be applied to 2.4. No behaviour is changed. (I sent patch 01, adding set blocksize ioctls - hope you applied it. And patch 02, adding blkdev_get_size_in_bytes - hope you didnt, ftp.kernel.org has the right version but I mailed a version with typo. This is patch 05, independent of earlier ones, an attempt to break 1+MB of patch into meaningful small fragments that each improve something.) Andries diff -u --recursive --new-file ../linux-2.4.6-pre3/linux/arch/m68k/atari/stram.c ./linux/arch/m68k/atari/stram.c --- ../linux-2.4.6-pre3/linux/arch/m68k/atari/stram.c Fri Feb 9 20:29:44 2001 +++ ./linux/arch/m68k/atari/stram.c Wed Jun 20 21:35:56 2001 @@ -1067,8 +1067,6 @@ blksize_size[STRAM_MAJOR] = stram_blocksizes; stram_sizes[STRAM_MINOR] = (swap_end - swap_start)/1024; blk_size[STRAM_MAJOR] = stram_sizes; - register_disk(NULL, MKDEV(STRAM_MAJOR, STRAM_MINOR), 1, &stram_fops, - (swap_end-swap_start)>>9); return( 0 ); } diff -u --recursive --new-file ../linux-2.4.6-pre3/linux/drivers/block/floppy.c ./linux/drivers/block/floppy.c --- ../linux-2.4.6-pre3/linux/drivers/block/floppy.c Fri Feb 9 20:30:22 2001 +++ ./linux/drivers/block/floppy.c Wed Jun 20 21:35:56 2001 @@ -4268,15 +4268,6 @@ devfs_unregister_blkdev(MAJOR_NR,"fd"); } - for (drive = 0; drive < N_DRIVE; drive++) { - if (!(allowed_drive_mask & (1 << drive))) - continue; - if (fdc_state[FDC(drive)].version == FDC_NONE) - continue; - for (i = 0; i> BLOCK_SIZE_BITS; - register_disk(NULL, MKDEV(MAJOR_NR,i), 1, &nbd_fops, - nbd_bytesizes[i]>>9); } devfs_handle = devfs_mk_dir (NULL, "nbd", NULL); devfs_register_series (devfs_handle, "%u", MAX_NBD, diff -u --recursive --new-file ../linux-2.4.6-pre3/linux/drivers/block/paride/pf.c ./linux/drivers/block/paride/pf.c --- ../linux-2.4.6-pre3/linux/drivers/block/paride/pf.c Sun Feb 4 19:05:29 2001 +++ ./linux/drivers/block/paride/pf.c Wed Jun 20 21:35:56 2001 @@ -415,8 +415,6 @@ for (i=0;idsize; jsfd_sizes[i] = jsfd_bytesizes[i] >> 10; - register_disk(NULL, MKDEV(JSFD_MAJOR, i), 1, &jsfd_fops, - jsfd_bytesizes[i] >> 9); set_device_ro(MKDEV(JSFD_MAJOR, i), 1); } return 0;