Skip to contentSkip to conversation

2.6.18-mm2 pktcdvd: restructure code

PATCH In review Thomas Maier 2 participants 3 messages Oct 1, 2006 – Oct 2, 2006 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 3/4 2.6.18-mm2 pktcdvd: restructure code

Hi,

this patch 3/4 for pktcdvd against Linux 2.6.18 (stable) or 2.6.18-mm2 restructures the code for better readability and prepares it for the sysfs interface code following in patch 4/4.

You must first apply patch 1/4 and 2/4 !

Sorry, my mail client damages the patch, so please use the (text) attachment or get the patch from
http://people.freenet.de/BalaGi/download/3-restruct-pktcdvd-patch-2.6.18

The merged patch (parts 1 to 4) is available at:
http://people.freenet.de/BalaGi/download/pktcdvd-patch-2.6.18

#1 lore raw
Quoted 3 lines · Thomas Maier

this patch 3/4 for pktcdvd against Linux 2.6.18 (stable) or 2.6.18-mm2 restructures the code for better readability and prepares it for the sysfs interface code following in patch 4/4.

This part looks good. Andrew, please apply:

From: Thomas Maier <[email protected]>

pktcdvd: Rename a variable for better readability.

---

 drivers/block/pktcdvd.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
drivers/block/pktcdvd.c +7 -7
index 8a73a05..f2904f6 100644
@@ -82,7 +82,7 @@ #define ZONE(sector, pd) (((sector) + (p
 
 static struct pktcdvd_device *pkt_devs[MAX_WRITERS];
 static struct proc_dir_entry *pkt_proc;
-static int pkt_major;
+static int pktdev_major;
 static struct mutex ctl_mutex;	/* Serialize open/close/setup/teardown */
 static mempool_t *psd_pool;
 
@@ -2476,7 +2476,7 @@ static int pkt_setup_dev(struct pkt_ctrl
 	init_waitqueue_head(&pd->wqueue);
 	pd->bio_queue = RB_ROOT;
 
-	disk->major = pkt_major;
+	disk->major = pktdev_major;
 	disk->first_minor = idx;
 	disk->fops = &pktcdvd_ops;
 	disk->flags = GENHD_FL_REMOVABLE;
@@ -2625,13 +2625,13 @@ static int __init pkt_init(void)
 	if (!psd_pool)
 		return -ENOMEM;
 
-	ret = register_blkdev(pkt_major, DRIVER_NAME);
+	ret = register_blkdev(pktdev_major, DRIVER_NAME);
 	if (ret < 0) {
 		printk(DRIVER_NAME": Unable to register block device\n");
 		goto out2;
 	}
-	if (!pkt_major)
-		pkt_major = ret;
+	if (!pktdev_major)
+		pktdev_major = ret;
 
 	ret = misc_register(&pkt_misc);
 	if (ret) {
@@ -2646,7 +2646,7 @@ static int __init pkt_init(void)
 	return 0;
 
 out:
-	unregister_blkdev(pkt_major, DRIVER_NAME);
+	unregister_blkdev(pktdev_major, DRIVER_NAME);
 out2:
 	mempool_destroy(psd_pool);
 	return ret;
@@ -2656,7 +2656,7 @@ static void __exit pkt_exit(void)
 {
 	remove_proc_entry(DRIVER_NAME, proc_root_driver);
 	misc_deregister(&pkt_misc);
-	unregister_blkdev(pkt_major, DRIVER_NAME);
+	unregister_blkdev(pktdev_major, DRIVER_NAME);
 	mempool_destroy(psd_pool);
 }
 
Signature · 2 lines
Peter Osterlund - [email protected]
http://web.telia.com/~u89404340
#2 lore raw
In reply to Thomas Maier
Quoted 3 lines · Thomas Maier

this patch 3/4 for pktcdvd against Linux 2.6.18 (stable) or 2.6.18-mm2 restructures the code for better readability and prepares it for the sysfs interface code following in patch 4/4.

This is still kind of hard to review. It would be much better if it was split in two parts, where the first part only moved existing functions around, and the second part added other neat things, such as the pkt_find_dev() and pkt_find_dev_bdev() functions.

Signature · 2 lines
Peter Osterlund - [email protected]
http://web.telia.com/~u89404340