[PATCH] s390: move s390_root_dev_* out of the cio layer
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 <cotte@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
6810a2bce3
commit
cfb1b55595
9 changed files with 74 additions and 48 deletions
|
@ -2,7 +2,7 @@
|
||||||
# Makefile for the S/390 specific device drivers
|
# 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/
|
obj-y += cio/ block/ char/ crypto/ net/ scsi/
|
||||||
|
|
||||||
drivers-y += drivers/s390/built-in.o
|
drivers-y += drivers/s390/built-in.o
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <linux/completion.h>
|
#include <linux/completion.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <asm/ccwdev.h> // for s390_root_dev_(un)register()
|
#include <asm/s390_rdev.h>
|
||||||
|
|
||||||
//#define DCSSBLK_DEBUG /* Debug messages on/off */
|
//#define DCSSBLK_DEBUG /* Debug messages on/off */
|
||||||
#define DCSSBLK_NAME "dcssblk"
|
#define DCSSBLK_NAME "dcssblk"
|
||||||
|
|
|
@ -481,45 +481,6 @@ struct bus_type css_bus_type = {
|
||||||
|
|
||||||
subsys_initcall(init_channel_subsystem);
|
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
|
int
|
||||||
css_enqueue_subchannel_slow(unsigned long schid)
|
css_enqueue_subchannel_slow(unsigned long schid)
|
||||||
{
|
{
|
||||||
|
@ -564,6 +525,4 @@ css_slow_subchannels_exist(void)
|
||||||
|
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
EXPORT_SYMBOL(css_bus_type);
|
EXPORT_SYMBOL(css_bus_type);
|
||||||
EXPORT_SYMBOL(s390_root_dev_register);
|
|
||||||
EXPORT_SYMBOL(s390_root_dev_unregister);
|
|
||||||
EXPORT_SYMBOL_GPL(css_characteristics_avail);
|
EXPORT_SYMBOL_GPL(css_characteristics_avail);
|
||||||
|
|
|
@ -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
|
* CTC / LCS ccw_device driver
|
||||||
*
|
*
|
||||||
|
@ -27,6 +27,7 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
|
|
||||||
|
#include <asm/s390_rdev.h>
|
||||||
#include <asm/ccwdev.h>
|
#include <asm/ccwdev.h>
|
||||||
#include <asm/ccwgroup.h>
|
#include <asm/ccwgroup.h>
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
#include <asm/s390_ext.h>
|
#include <asm/s390_ext.h>
|
||||||
#include <asm/ebcdic.h>
|
#include <asm/ebcdic.h>
|
||||||
#include <asm/smp.h>
|
#include <asm/smp.h>
|
||||||
#include <asm/ccwdev.h> //for root device stuff
|
#include <asm/s390_rdev.h>
|
||||||
|
|
||||||
/* FLAGS:
|
/* FLAGS:
|
||||||
* All flags are defined in the field IPFLAGS1 of each function
|
* All flags are defined in the field IPFLAGS1 of each function
|
||||||
|
|
|
@ -65,6 +65,7 @@
|
||||||
#include <asm/timex.h>
|
#include <asm/timex.h>
|
||||||
#include <asm/semaphore.h>
|
#include <asm/semaphore.h>
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
|
#include <asm/s390_rdev.h>
|
||||||
|
|
||||||
#include "qeth.h"
|
#include "qeth.h"
|
||||||
#include "qeth_mpc.h"
|
#include "qeth_mpc.h"
|
||||||
|
|
53
drivers/s390/s390_rdev.c
Normal file
53
drivers/s390/s390_rdev.c
Normal file
|
@ -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 <linux/slab.h>
|
||||||
|
#include <linux/err.h>
|
||||||
|
#include <linux/device.h>
|
||||||
|
#include <asm/s390_rdev.h>
|
||||||
|
|
||||||
|
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);
|
|
@ -185,8 +185,5 @@ extern struct ccw_device *ccw_device_probe_console(void);
|
||||||
extern int _ccw_device_get_device_number(struct ccw_device *);
|
extern int _ccw_device_get_device_number(struct ccw_device *);
|
||||||
extern int _ccw_device_get_subchannel_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);
|
extern void *ccw_device_get_chp_desc(struct ccw_device *, int);
|
||||||
#endif /* _S390_CCWDEV_H_ */
|
#endif /* _S390_CCWDEV_H_ */
|
||||||
|
|
15
include/asm-s390/s390_rdev.h
Normal file
15
include/asm-s390/s390_rdev.h
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
/*
|
||||||
|
* include/asm-s390/ccwdev.h
|
||||||
|
*
|
||||||
|
* Copyright (C) 2002,2005 IBM Deutschland Entwicklung GmbH, IBM Corporation
|
||||||
|
* Author(s): Cornelia Huck <cohuck@de.ibm.com>
|
||||||
|
* Carsten Otte <cotte@de.ibm.com>
|
||||||
|
*
|
||||||
|
* 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_ */
|
Loading…
Reference in a new issue