s390: xpram system device class.

PATCH In review Martin Schwidefsky 2 participants 3 messages Aug 7, 2006

Subsystems (3)

Network drivers s390 s390 network drivers

lore

Share & tools

lore

Martin Schwidefsky

author

2006-08-07 15:06 UTC #0 lore raw

PATCH 1/1 s390: xpram system device class.

From: Martin Schwidefsky <[email protected]>

[S390] xpram system device class.

Remove system device class for xpram. It creates the directory hierarchy under /sys/devices/system/xpram/xpram0. The xpram0 directory is empty and it is always created while xpram1 and following devices are always missing, independent if the devices exist or not. Since the xpram devices are listed in /proc/partitions and /sys/block/ as slram<x> the system device class for xpram is meaningless.

Signed-off-by Martin Schwidefsky <[email protected]>

---

 drivers/s390/block/xpram.c   |   25 ---------------
 drivers/s390/net/qeth.h      |    3 +
 drivers/s390/net/qeth_main.c |   69 ++++++++++++++++++++++++++-----------------
 3 files changed, 45 insertions(+), 52 deletions(-)

drivers/s390/block/xpram.c +1 ~~-24~~

diff -urpN linux-2.6/drivers/s390/block/xpram.c linux-2.6-patched/drivers/s390/block/xpram.c
@@ -48,15 +48,6 @@
 #define PRINT_ERR(x...)		printk(KERN_ERR XPRAM_NAME " error:" x)
 
 
-static struct sysdev_class xpram_sysclass = {
-	set_kset_name("xpram"),
-};
-
-static struct sys_device xpram_sys_device = {
-	.id	= 0,
-	.cls	= &xpram_sysclass,
-}; 
-
 typedef struct {
 	unsigned int	size;		/* size of xpram segment in pages */
 	unsigned int	offset;		/* start page of xpram segment */

@@ -451,8 +442,6 @@ static void __exit xpram_exit(void)
 	}
 	unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME);
 	blk_cleanup_queue(xpram_queue);
-	sysdev_unregister(&xpram_sys_device);
-	sysdev_class_unregister(&xpram_sysclass);
 }
 
 static int __init xpram_init(void)

@@ -470,19 +459,7 @@ static int __init xpram_init(void)
 	rc = xpram_setup_sizes(xpram_pages);
 	if (rc)
 		return rc;
-	rc = sysdev_class_register(&xpram_sysclass);
-	if (rc)
-		return rc;
-
-	rc = sysdev_register(&xpram_sys_device);
-	if (rc) {
-		sysdev_class_unregister(&xpram_sysclass);
-		return rc;
-	}
-	rc = xpram_setup_blkdev();
-	if (rc)
-		sysdev_unregister(&xpram_sys_device);
-	return rc;
+	return xpram_setup_blkdev();
 }
 
 module_init(xpram_init);

drivers/s390/net/qeth.h +2 -1

diff -urpN linux-2.6/drivers/s390/net/qeth.h linux-2.6-patched/drivers/s390/net/qeth.h
@@ -462,6 +462,7 @@ enum qeth_qdio_info_states {
 	QETH_QDIO_UNINITIALIZED,
 	QETH_QDIO_ALLOCATED,
 	QETH_QDIO_ESTABLISHED,
+	QETH_QDIO_CLEANING
 };
 
 struct qeth_buffer_pool_entry {

@@ -536,7 +537,7 @@ struct qeth_qdio_out_q {
 } __attribute__ ((aligned(256)));
 
 struct qeth_qdio_info {
-	volatile enum qeth_qdio_info_states state;
+	atomic_t state;
 	/* input */
 	struct qeth_qdio_q *in_q;
 	struct qeth_qdio_buffer_pool in_buf_pool;

drivers/s390/net/qeth_main.c +42 ~~-27~~

140 lines not on this page · raw message

Alan Cox

2006-08-07 15:21 UTC #1 lore raw

Ar Llu, 2006-08-07 am 17:06 +0200, ysgrifennodd Martin Schwidefsky:

Quoted 6 lines

From: Martin Schwidefsky <[email protected]>
[S390] xpram system device class.
Remove system device class for xpram.

This seems to have various other changes in it - switches to atomic operations and the like which aren't explained..

Martin Schwidefsky

author

2006-08-07 16:00 UTC #2 lore raw

Quoted 10 lines · Alan Cox

Ar Llu, 2006-08-07 am 17:06 +0200, ysgrifennodd Martin Schwidefsky:
Quoted 6 lines
From: Martin Schwidefsky <[email protected]>
[S390] xpram system device class.
Remove system device class for xpram.
This seems to have various other changes in it - switches to atomic operations and the like which aren't explained..

Yes you are right. There is another patch mixed with this one. Thanks for the hint.

Signature · 8 lines

blue skies,
  Martin.

Martin Schwidefsky
Linux for zSeries Development & Services
IBM Deutschland Entwicklung GmbH

"Reality continues to ruin my life." - Calvin.