Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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: Cornelia Huck <huckc@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Cornelia Huck and committed by
Linus Torvalds
3b793060 88fbf183

+13 -4
+3 -4
drivers/s390/cio/blacklist.c
··· 299 299 300 300 if (*offset >= (__MAX_SUBCHANNEL + 1) * (__MAX_SSID + 1)) 301 301 return NULL; 302 - iter = kmalloc(sizeof(struct ccwdev_iter), GFP_KERNEL); 302 + iter = kzalloc(sizeof(struct ccwdev_iter), GFP_KERNEL); 303 303 if (!iter) 304 304 return ERR_PTR(-ENOMEM); 305 - memset(iter, 0, sizeof(struct ccwdev_iter)); 306 305 iter->ssid = *offset / (__MAX_SUBCHANNEL + 1); 307 306 iter->devno = *offset % (__MAX_SUBCHANNEL + 1); 308 307 return iter; ··· 321 322 322 323 if (*offset >= (__MAX_SUBCHANNEL + 1) * (__MAX_SSID + 1)) 323 324 return NULL; 324 - iter = (struct ccwdev_iter *)it; 325 + iter = it; 325 326 if (iter->devno == __MAX_SUBCHANNEL) { 326 327 iter->devno = 0; 327 328 iter->ssid++; ··· 338 339 { 339 340 struct ccwdev_iter *iter; 340 341 341 - iter = (struct ccwdev_iter *)it; 342 + iter = it; 342 343 if (!is_blacklisted(iter->ssid, iter->devno)) 343 344 /* Not blacklisted, nothing to output. */ 344 345 return 0;
+10
drivers/s390/cio/css.c
··· 444 444 445 445 } 446 446 447 + static void 448 + channel_subsystem_release(struct device *dev) 449 + { 450 + struct channel_subsystem *css; 451 + 452 + css = to_css(dev); 453 + kfree(css); 454 + } 455 + 447 456 static inline void __init 448 457 setup_css(int nr) 449 458 { ··· 462 453 css[nr]->valid = 1; 463 454 css[nr]->cssid = nr; 464 455 sprintf(css[nr]->device.bus_id, "css%x", nr); 456 + css[nr]->device.release = channel_subsystem_release; 465 457 tod_high = (u32) (get_clock() >> 32); 466 458 css_generate_pgid(css[nr], tod_high); 467 459 }