Commit fc8ebe82 authored by Peter Oberparleiter's avatar Peter Oberparleiter Committed by Vasily Gorbik
Browse files

s390/sclp: Remove memory hotplug power management support 



Power management support was removed for s390 with
commit 39421627 ("s390: remove broken hibernate / power management
support").

Remove leftover sclp memory hotplug-related power management code.

Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarPeter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 2f554d8b

drivers/s390/char/sclp_cmd.c

+0 −34
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/mmzone.h>

#include <linux/memory.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <asm/ctl_reg.h>

#include <asm/chpid.h>

#include <asm/setup.h>
@@ -168,7 +167,6 @@ static DEFINE_MUTEX(sclp_mem_mutex); 
static LIST_HEAD(sclp_mem_list);

static u8 sclp_max_storage_id;

static DECLARE_BITMAP(sclp_storage_ids, 256);

static int sclp_mem_state_changed;



struct memory_increment {

	struct list_head list;
@@ -359,8 +357,6 @@ static int sclp_mem_notifier(struct notifier_block *nb, 
		rc = -EINVAL;

		break;

	}

	if (!rc)

		sclp_mem_state_changed = 1;

	mutex_unlock(&sclp_mem_mutex);

	return rc ? NOTIFY_BAD : NOTIFY_OK;

}
@@ -456,28 +452,8 @@ static void __init insert_increment(u16 rn, int standby, int assigned) 
	list_add(&new_incr->list, prev);

}



static int sclp_mem_freeze(struct device *dev)

{

	if (!sclp_mem_state_changed)

		return 0;

	pr_err("Memory hotplug state changed, suspend refused.\n");

	return -EPERM;

}



static const struct dev_pm_ops sclp_mem_pm_ops = {

	.freeze		= sclp_mem_freeze,

};



static struct platform_driver sclp_mem_pdrv = {

	.driver = {

		.name	= "sclp_mem",

		.pm	= &sclp_mem_pm_ops,

	},

};



static int __init sclp_detect_standby_memory(void)

{

	struct platform_device *sclp_pdev;

	struct read_storage_sccb *sccb;

	int i, id, assigned, rc;
@@ -530,17 +506,7 @@ static int __init sclp_detect_standby_memory(void) 
	rc = register_memory_notifier(&sclp_mem_nb);

	if (rc)

		goto out;

	rc = platform_driver_register(&sclp_mem_pdrv);

	if (rc)

		goto out;

	sclp_pdev = platform_device_register_simple("sclp_mem", -1, NULL, 0);

	rc = PTR_ERR_OR_ZERO(sclp_pdev);

	if (rc)

		goto out_driver;

	sclp_add_standby_memory();

	goto out;

out_driver:

	platform_driver_unregister(&sclp_mem_pdrv);

out:

	free_page((unsigned long) sccb);

	return rc;