Commit 287a0933 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390: use ccw_device_get_schid 



Let the dasd driver and qdio use ccw_device_get_schid and
get rid of other similar functions.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 9368dac4

arch/s390/include/asm/ccwdev.h

+0 −3
Original line number Diff line number Diff line
@@ -226,9 +226,6 @@ extern int ccw_device_force_console(void); 


int ccw_device_siosl(struct ccw_device *);



// FIXME: these have to go

extern int _ccw_device_get_subchannel_number(struct ccw_device *);



extern void ccw_device_get_schid(struct ccw_device *, struct subchannel_id *);



extern void *ccw_device_get_chp_desc(struct ccw_device *, int);

drivers/s390/block/dasd_ioctl.c

+7 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/slab.h>

#include <asm/compat.h>

#include <asm/ccwdev.h>

#include <asm/schid.h>

#include <asm/cmb.h>

#include <asm/uaccess.h>
@@ -308,11 +309,12 @@ static int dasd_ioctl_information(struct dasd_block *block, 
				  unsigned int cmd, void __user *argp)

{

	struct dasd_information2_t *dasd_info;

	unsigned long flags;

	int rc;

	struct subchannel_id sch_id;

	struct ccw_dev_id dev_id;

	struct dasd_device *base;

	struct ccw_device *cdev;

	struct ccw_dev_id dev_id;

	unsigned long flags;

	int rc;



	base = block->base;

	if (!base->discipline || !base->discipline->fill_info)
@@ -330,9 +332,10 @@ static int dasd_ioctl_information(struct dasd_block *block, 


	cdev = base->cdev;

	ccw_device_get_id(cdev, &dev_id);

	ccw_device_get_schid(cdev, &sch_id);



	dasd_info->devno = dev_id.devno;

	dasd_info->schid = _ccw_device_get_subchannel_number(base->cdev);

	dasd_info->schid = sch_id.sch_no;

	dasd_info->cu_type = cdev->id.cu_type;

	dasd_info->cu_model = cdev->id.cu_model;

	dasd_info->dev_type = cdev->id.dev_type;

drivers/s390/cio/device.c

+0 −11
Original line number Diff line number Diff line
@@ -2036,16 +2036,6 @@ void ccw_driver_unregister(struct ccw_driver *cdriver) 
	driver_unregister(&cdriver->driver);

}



/* Helper func for qdio. */

struct subchannel_id

ccw_device_get_subchannel_id(struct ccw_device *cdev)

{

	struct subchannel *sch;



	sch = to_subchannel(cdev->dev.parent);

	return sch->schid;

}



static void ccw_device_todo(struct work_struct *work)

{

	struct ccw_device_private *priv;
@@ -2138,4 +2128,3 @@ EXPORT_SYMBOL(ccw_device_set_offline); 
EXPORT_SYMBOL(ccw_driver_register);

EXPORT_SYMBOL(ccw_driver_unregister);

EXPORT_SYMBOL(get_ccwdev_by_busid);
 
EXPORT_SYMBOL_GPL(ccw_device_get_subchannel_id);

drivers/s390/cio/device.h

+0 −2
Original line number Diff line number Diff line
@@ -142,9 +142,7 @@ int ccw_device_notify(struct ccw_device *, int); 
void ccw_device_set_disconnected(struct ccw_device *cdev);

void ccw_device_set_notoper(struct ccw_device *cdev);



/* qdio needs this. */

void ccw_device_set_timeout(struct ccw_device *, int);

extern struct subchannel_id ccw_device_get_subchannel_id(struct ccw_device *);



/* Channel measurement facility related */

void retry_set_schib(struct ccw_device *cdev);

drivers/s390/cio/device_ops.c

+0 −9
Original line number Diff line number Diff line
@@ -755,14 +755,6 @@ int ccw_device_tm_intrg(struct ccw_device *cdev) 
}

EXPORT_SYMBOL(ccw_device_tm_intrg);



// FIXME: these have to go:



int

_ccw_device_get_subchannel_number(struct ccw_device *cdev)

{

	return cdev->private->schid.sch_no;

}



/**

 * ccw_device_get_schid - obtain a subchannel id

 * @cdev: device to obtain the id for
@@ -789,5 +781,4 @@ EXPORT_SYMBOL(ccw_device_start_timeout_key); 
EXPORT_SYMBOL(ccw_device_start_key);

EXPORT_SYMBOL(ccw_device_get_ciw);

EXPORT_SYMBOL(ccw_device_get_path_mask);

EXPORT_SYMBOL(_ccw_device_get_subchannel_number);

EXPORT_SYMBOL_GPL(ccw_device_get_chp_desc);