Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 035da16f authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Greg Kroah-Hartman
Browse files

s390: remove s390_root_dev_*() 



Replace s390_root_dev_register() with root_device_register() etc.

[Includes fix from Cornelia Huck]

Signed-off-by: default avatarMark McLoughlin <markmc@redhat.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ff8561c4

arch/s390/include/asm/s390_rdev.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
/*

 *  include/asm-s390/ccwdev.h

 *

 *    Copyright (C) 2002,2005 IBM Deutschland Entwicklung GmbH, IBM Corporation

 *    Author(s): Cornelia Huck <cornelia.huck@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_ */

drivers/s390/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


CFLAGS_sysinfo.o += -Iinclude/math-emu -Iarch/s390/math-emu -w



obj-y += s390mach.o sysinfo.o s390_rdev.o

obj-y += s390mach.o sysinfo.o

obj-y += cio/ block/ char/ crypto/ net/ scsi/ kvm/



drivers-y += drivers/s390/built-in.o

drivers/s390/block/dcssblk.c

+5 −6
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <asm/io.h>

#include <linux/completion.h>

#include <linux/interrupt.h>

#include <asm/s390_rdev.h>



#define DCSSBLK_NAME "dcssblk"

#define DCSSBLK_MINORS_PER_DISK 1
@@ -946,7 +945,7 @@ dcssblk_check_params(void) 
static void __exit

dcssblk_exit(void)

{

	s390_root_dev_unregister(dcssblk_root_dev);

	root_device_unregister(dcssblk_root_dev);

	unregister_blkdev(dcssblk_major, DCSSBLK_NAME);

}
@@ -955,22 +954,22 @@ dcssblk_init(void) 
{

	int rc;



	dcssblk_root_dev = s390_root_dev_register("dcssblk");

	dcssblk_root_dev = root_device_register("dcssblk");

	if (IS_ERR(dcssblk_root_dev))

		return PTR_ERR(dcssblk_root_dev);

	rc = device_create_file(dcssblk_root_dev, &dev_attr_add);

	if (rc) {

		s390_root_dev_unregister(dcssblk_root_dev);

		root_device_unregister(dcssblk_root_dev);

		return rc;

	}

	rc = device_create_file(dcssblk_root_dev, &dev_attr_remove);

	if (rc) {

		s390_root_dev_unregister(dcssblk_root_dev);

		root_device_unregister(dcssblk_root_dev);

		return rc;

	}

	rc = register_blkdev(0, DCSSBLK_NAME);

	if (rc < 0) {

		s390_root_dev_unregister(dcssblk_root_dev);

		root_device_unregister(dcssblk_root_dev);

		return rc;

	}

	dcssblk_major = rc;

drivers/s390/crypto/ap_bus.c

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

#include <linux/kthread.h>

#include <linux/mutex.h>

#include <asm/s390_rdev.h>

#include <asm/reset.h>

#include <asm/airq.h>

#include <asm/atomic.h>
@@ -1522,7 +1521,7 @@ int __init ap_module_init(void) 
	}



	/* Create /sys/devices/ap. */

	ap_root_device = s390_root_dev_register("ap");

	ap_root_device = root_device_register("ap");

	rc = IS_ERR(ap_root_device) ? PTR_ERR(ap_root_device) : 0;

	if (rc)

		goto out_bus;
@@ -1565,7 +1564,7 @@ int __init ap_module_init(void) 
	hrtimer_cancel(&ap_poll_timer);

	destroy_workqueue(ap_work_queue);

out_root:

	s390_root_dev_unregister(ap_root_device);

	root_device_unregister(ap_root_device);

out_bus:

	while (i--)

		bus_remove_file(&ap_bus_type, ap_bus_attrs[i]);
@@ -1600,7 +1599,7 @@ void ap_module_exit(void) 
	hrtimer_cancel(&ap_poll_timer);

	destroy_workqueue(ap_work_queue);

	tasklet_kill(&ap_tasklet);

	s390_root_dev_unregister(ap_root_device);

	root_device_unregister(ap_root_device);

	while ((dev = bus_find_device(&ap_bus_type, NULL, NULL,

		    __ap_match_all)))

	{

drivers/s390/kvm/kvm_virtio.c

+2 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <asm/kvm_virtio.h>

#include <asm/setup.h>

#include <asm/s390_ext.h>

#include <asm/s390_rdev.h>



#define VIRTIO_SUBCODE_64 0x0D00
@@ -335,7 +334,7 @@ static int __init kvm_devices_init(void) 
	if (!MACHINE_IS_KVM)

		return -ENODEV;



	kvm_root = s390_root_dev_register("kvm_s390");

	kvm_root = root_device_register("kvm_s390");

	if (IS_ERR(kvm_root)) {

		rc = PTR_ERR(kvm_root);

		printk(KERN_ERR "Could not register kvm_s390 root device");
@@ -344,7 +343,7 @@ static int __init kvm_devices_init(void) 


	rc = vmem_add_mapping(real_memory_size, PAGE_SIZE);

	if (rc) {

		s390_root_dev_unregister(kvm_root);

		root_device_unregister(kvm_root);

		return rc;

	}