From: Carsten Otte Extract the s390_root_dev_* functions from the common I/O layer as they are also used by non-ccw device drivers. Signed-off-by: Carsten Otte Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton --- drivers/s390/Makefile | 2 - drivers/s390/block/dcssblk.c | 2 - drivers/s390/cio/css.c | 41 --------------------------------- drivers/s390/net/cu3088.c | 3 +- drivers/s390/net/iucv.c | 2 - drivers/s390/net/qeth_main.c | 1 drivers/s390/s390_rdev.c | 53 +++++++++++++++++++++++++++++++++++++++++++ include/asm-s390/ccwdev.h | 3 -- include/asm-s390/s390_rdev.h | 15 ++++++++++++ 9 files changed, 74 insertions(+), 48 deletions(-) diff -puN drivers/s390/block/dcssblk.c~s390-move-s390_root_dev_-out-of-the-cio-layer drivers/s390/block/dcssblk.c --- devel/drivers/s390/block/dcssblk.c~s390-move-s390_root_dev_-out-of-the-cio-layer 2005-12-09 23:47:34.000000000 -0800 +++ devel-akpm/drivers/s390/block/dcssblk.c 2005-12-09 23:47:34.000000000 -0800 @@ -15,7 +15,7 @@ #include #include #include -#include // for s390_root_dev_(un)register() +#include //#define DCSSBLK_DEBUG /* Debug messages on/off */ #define DCSSBLK_NAME "dcssblk" diff -puN drivers/s390/cio/css.c~s390-move-s390_root_dev_-out-of-the-cio-layer drivers/s390/cio/css.c --- devel/drivers/s390/cio/css.c~s390-move-s390_root_dev_-out-of-the-cio-layer 2005-12-09 23:47:34.000000000 -0800 +++ devel-akpm/drivers/s390/cio/css.c 2005-12-09 23:47:34.000000000 -0800 @@ -481,45 +481,6 @@ struct bus_type css_bus_type = { subsys_initcall(init_channel_subsystem); -/* - * Register root devices for some drivers. The release function must not be - * in the device drivers, so we do it here. - */ -static void -s390_root_dev_release(struct device *dev) -{ - kfree(dev); -} - -struct device * -s390_root_dev_register(const char *name) -{ - struct device *dev; - int ret; - - if (!strlen(name)) - return ERR_PTR(-EINVAL); - dev = kmalloc(sizeof(struct device), GFP_KERNEL); - if (!dev) - return ERR_PTR(-ENOMEM); - memset(dev, 0, sizeof(struct device)); - strncpy(dev->bus_id, name, min(strlen(name), (size_t)BUS_ID_SIZE)); - dev->release = s390_root_dev_release; - ret = device_register(dev); - if (ret) { - kfree(dev); - return ERR_PTR(ret); - } - return dev; -} - -void -s390_root_dev_unregister(struct device *dev) -{ - if (dev) - device_unregister(dev); -} - int css_enqueue_subchannel_slow(unsigned long schid) { @@ -564,6 +525,4 @@ css_slow_subchannels_exist(void) MODULE_LICENSE("GPL"); EXPORT_SYMBOL(css_bus_type); -EXPORT_SYMBOL(s390_root_dev_register); -EXPORT_SYMBOL(s390_root_dev_unregister); EXPORT_SYMBOL_GPL(css_characteristics_avail); diff -puN drivers/s390/Makefile~s390-move-s390_root_dev_-out-of-the-cio-layer drivers/s390/Makefile --- devel/drivers/s390/Makefile~s390-move-s390_root_dev_-out-of-the-cio-layer 2005-12-09 23:47:34.000000000 -0800 +++ devel-akpm/drivers/s390/Makefile 2005-12-09 23:47:34.000000000 -0800 @@ -2,7 +2,7 @@ # Makefile for the S/390 specific device drivers # -obj-y += s390mach.o sysinfo.o +obj-y += s390mach.o sysinfo.o s390_rdev.o obj-y += cio/ block/ char/ crypto/ net/ scsi/ drivers-y += drivers/s390/built-in.o diff -puN drivers/s390/net/cu3088.c~s390-move-s390_root_dev_-out-of-the-cio-layer drivers/s390/net/cu3088.c --- devel/drivers/s390/net/cu3088.c~s390-move-s390_root_dev_-out-of-the-cio-layer 2005-12-09 23:47:34.000000000 -0800 +++ devel-akpm/drivers/s390/net/cu3088.c 2005-12-09 23:47:34.000000000 -0800 @@ -1,5 +1,5 @@ /* - * $Id: cu3088.c,v 1.35 2005/03/30 19:28:52 richtera Exp $ + * $Id: cu3088.c,v 1.36 2005/10/25 14:37:17 cohuck Exp $ * * CTC / LCS ccw_device driver * @@ -27,6 +27,7 @@ #include #include +#include #include #include diff -puN drivers/s390/net/iucv.c~s390-move-s390_root_dev_-out-of-the-cio-layer drivers/s390/net/iucv.c --- devel/drivers/s390/net/iucv.c~s390-move-s390_root_dev_-out-of-the-cio-layer 2005-12-09 23:47:34.000000000 -0800 +++ devel-akpm/drivers/s390/net/iucv.c 2005-12-09 23:47:34.000000000 -0800 @@ -54,7 +54,7 @@ #include #include #include -#include //for root device stuff +#include /* FLAGS: * All flags are defined in the field IPFLAGS1 of each function diff -puN drivers/s390/net/qeth_main.c~s390-move-s390_root_dev_-out-of-the-cio-layer drivers/s390/net/qeth_main.c --- devel/drivers/s390/net/qeth_main.c~s390-move-s390_root_dev_-out-of-the-cio-layer 2005-12-09 23:47:34.000000000 -0800 +++ devel-akpm/drivers/s390/net/qeth_main.c 2005-12-09 23:47:34.000000000 -0800 @@ -65,6 +65,7 @@ #include #include #include +#include #include "qeth.h" #include "qeth_mpc.h" diff -puN /dev/null drivers/s390/s390_rdev.c --- /dev/null 2003-09-15 06:40:47.000000000 -0700 +++ devel-akpm/drivers/s390/s390_rdev.c 2005-12-09 23:47:34.000000000 -0800 @@ -0,0 +1,53 @@ +/* + * drivers/s390/s390_rdev.c + * s390 root device + * $Revision: 1.2 $ + * + * Copyright (C) 2002, 2005 IBM Deutschland Entwicklung GmbH, + * IBM Corporation + * Author(s): Cornelia Huck (cohuck@de.ibm.com) + * Carsten Otte (cotte@de.ibm.com) + */ + +#include +#include +#include +#include + +static void +s390_root_dev_release(struct device *dev) +{ + kfree(dev); +} + +struct device * +s390_root_dev_register(const char *name) +{ + struct device *dev; + int ret; + + if (!strlen(name)) + return ERR_PTR(-EINVAL); + dev = kmalloc(sizeof(struct device), GFP_KERNEL); + if (!dev) + return ERR_PTR(-ENOMEM); + memset(dev, 0, sizeof(struct device)); + strncpy(dev->bus_id, name, min(strlen(name), (size_t)BUS_ID_SIZE)); + dev->release = s390_root_dev_release; + ret = device_register(dev); + if (ret) { + kfree(dev); + return ERR_PTR(ret); + } + return dev; +} + +void +s390_root_dev_unregister(struct device *dev) +{ + if (dev) + device_unregister(dev); +} + +EXPORT_SYMBOL(s390_root_dev_register); +EXPORT_SYMBOL(s390_root_dev_unregister); diff -puN include/asm-s390/ccwdev.h~s390-move-s390_root_dev_-out-of-the-cio-layer include/asm-s390/ccwdev.h --- devel/include/asm-s390/ccwdev.h~s390-move-s390_root_dev_-out-of-the-cio-layer 2005-12-09 23:47:34.000000000 -0800 +++ devel-akpm/include/asm-s390/ccwdev.h 2005-12-09 23:47:34.000000000 -0800 @@ -185,8 +185,5 @@ extern struct ccw_device *ccw_device_pro extern int _ccw_device_get_device_number(struct ccw_device *); extern int _ccw_device_get_subchannel_number(struct ccw_device *); -extern struct device *s390_root_dev_register(const char *); -extern void s390_root_dev_unregister(struct device *); - extern void *ccw_device_get_chp_desc(struct ccw_device *, int); #endif /* _S390_CCWDEV_H_ */ diff -puN /dev/null include/asm-s390/s390_rdev.h --- /dev/null 2003-09-15 06:40:47.000000000 -0700 +++ devel-akpm/include/asm-s390/s390_rdev.h 2005-12-09 23:47:34.000000000 -0800 @@ -0,0 +1,15 @@ +/* + * include/asm-s390/ccwdev.h + * + * Copyright (C) 2002,2005 IBM Deutschland Entwicklung GmbH, IBM Corporation + * Author(s): Cornelia Huck + * Carsten Otte + * + * Interface for s390 root device + */ + +#ifndef _S390_RDEV_H_ +#define _S390_RDEV_H_ +extern struct device *s390_root_dev_register(const char *); +extern void s390_root_dev_unregister(struct device *); +#endif /* _S390_RDEV_H_ */ _