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

Commit 3b793060 authored by Cornelia Huck's avatar Cornelia Huck Committed by Linus Torvalds
Browse files

[PATCH] s390: Fix missing release function and cosmetic changes 



- Use kzalloc() in blacklist.c.
- Kill unwanted casts in blacklist.c.
- Provide release function for struct channel_subsystem.

Signed-off-by: default avatarCornelia Huck <huckc@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 88fbf183

drivers/s390/cio/blacklist.c

+3 −4
Original line number Diff line number Diff line
@@ -299,10 +299,9 @@ cio_ignore_proc_seq_start(struct seq_file *s, loff_t *offset) 


	if (*offset >= (__MAX_SUBCHANNEL + 1) * (__MAX_SSID + 1))

		return NULL;

	iter = kmalloc(sizeof(struct ccwdev_iter), GFP_KERNEL);

	iter = kzalloc(sizeof(struct ccwdev_iter), GFP_KERNEL);

	if (!iter)

		return ERR_PTR(-ENOMEM);

	memset(iter, 0, sizeof(struct ccwdev_iter));

	iter->ssid = *offset / (__MAX_SUBCHANNEL + 1);

	iter->devno = *offset % (__MAX_SUBCHANNEL + 1);

	return iter;
@@ -322,7 +321,7 @@ cio_ignore_proc_seq_next(struct seq_file *s, void *it, loff_t *offset) 


	if (*offset >= (__MAX_SUBCHANNEL + 1) * (__MAX_SSID + 1))

		return NULL;

	iter = (struct ccwdev_iter *)it;

	iter = it;

	if (iter->devno == __MAX_SUBCHANNEL) {

		iter->devno = 0;

		iter->ssid++;
@@ -339,7 +338,7 @@ cio_ignore_proc_seq_show(struct seq_file *s, void *it) 
{

	struct ccwdev_iter *iter;



	iter = (struct ccwdev_iter *)it;

	iter = it;

	if (!is_blacklisted(iter->ssid, iter->devno))

		/* Not blacklisted, nothing to output. */

		return 0;

drivers/s390/cio/css.c

+10 −0
Original line number Diff line number Diff line
@@ -444,6 +444,15 @@ css_generate_pgid(struct channel_subsystem *css, u32 tod_high) 


}



static void

channel_subsystem_release(struct device *dev)

{

	struct channel_subsystem *css;



	css = to_css(dev);

	kfree(css);

}



static inline void __init

setup_css(int nr)

{
@@ -453,6 +462,7 @@ setup_css(int nr) 
	css[nr]->valid = 1;

	css[nr]->cssid = nr;

	sprintf(css[nr]->device.bus_id, "css%x", nr);

	css[nr]->device.release = channel_subsystem_release;

	tod_high = (u32) (get_clock() >> 32);

	css_generate_pgid(css[nr], tod_high);

}