Commit 292888c8 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky

[S390] cio: kernel stack overflow.

Use different kind of assignment to make sure gcc doesn't create code
that creates temp variables on the stack, assigns values to it and
copies the content of the whole temp variable to the destination.
This reduces stack usage of e.g. ccwgroup_driver_register from 976
to 48 bytes instead.
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 8f61701b
...@@ -183,11 +183,9 @@ ccwgroup_create(struct device *root, ...@@ -183,11 +183,9 @@ ccwgroup_create(struct device *root,
gdev->creator_id = creator_id; gdev->creator_id = creator_id;
gdev->count = argc; gdev->count = argc;
gdev->dev = (struct device ) { gdev->dev.bus = &ccwgroup_bus_type;
.bus = &ccwgroup_bus_type, gdev->dev.parent = root;
.parent = root, gdev->dev.release = ccwgroup_release;
.release = ccwgroup_release,
};
snprintf (gdev->dev.bus_id, BUS_ID_SIZE, "%s", snprintf (gdev->dev.bus_id, BUS_ID_SIZE, "%s",
gdev->cdev[0]->dev.bus_id); gdev->cdev[0]->dev.bus_id);
...@@ -391,10 +389,8 @@ int ...@@ -391,10 +389,8 @@ int
ccwgroup_driver_register (struct ccwgroup_driver *cdriver) ccwgroup_driver_register (struct ccwgroup_driver *cdriver)
{ {
/* register our new driver with the core */ /* register our new driver with the core */
cdriver->driver = (struct device_driver) { cdriver->driver.bus = &ccwgroup_bus_type;
.bus = &ccwgroup_bus_type, cdriver->driver.name = cdriver->name;
.name = cdriver->name,
};
return driver_register(&cdriver->driver); return driver_register(&cdriver->driver);
} }
......
...@@ -1391,10 +1391,8 @@ new_channel_path(int chpid) ...@@ -1391,10 +1391,8 @@ new_channel_path(int chpid)
/* fill in status, etc. */ /* fill in status, etc. */
chp->id = chpid; chp->id = chpid;
chp->state = 1; chp->state = 1;
chp->dev = (struct device) { chp->dev.parent = &css[0]->device;
.parent = &css[0]->device, chp->dev.release = chp_release;
.release = chp_release,
};
snprintf(chp->dev.bus_id, BUS_ID_SIZE, "chp0.%x", chpid); snprintf(chp->dev.bus_id, BUS_ID_SIZE, "chp0.%x", chpid);
/* Obtain channel path description and fill it in. */ /* Obtain channel path description and fill it in. */
......
...@@ -556,12 +556,11 @@ get_disc_ccwdev_by_devno(unsigned int devno, unsigned int ssid, ...@@ -556,12 +556,11 @@ get_disc_ccwdev_by_devno(unsigned int devno, unsigned int ssid,
struct ccw_device *sibling) struct ccw_device *sibling)
{ {
struct device *dev; struct device *dev;
struct match_data data = { struct match_data data;
.devno = devno,
.ssid = ssid,
.sibling = sibling,
};
data.devno = devno;
data.ssid = ssid;
data.sibling = sibling;
dev = bus_find_device(&ccw_bus_type, NULL, &data, match_devno); dev = bus_find_device(&ccw_bus_type, NULL, &data, match_devno);
return dev ? to_ccwdev(dev) : NULL; return dev ? to_ccwdev(dev) : NULL;
...@@ -835,10 +834,8 @@ io_subchannel_probe (struct subchannel *sch) ...@@ -835,10 +834,8 @@ io_subchannel_probe (struct subchannel *sch)
return -ENOMEM; return -ENOMEM;
} }
atomic_set(&cdev->private->onoff, 0); atomic_set(&cdev->private->onoff, 0);
cdev->dev = (struct device) { cdev->dev.parent = &sch->dev;
.parent = &sch->dev, cdev->dev.release = ccw_device_release;
.release = ccw_device_release,
};
INIT_LIST_HEAD(&cdev->private->kick_work.entry); INIT_LIST_HEAD(&cdev->private->kick_work.entry);
/* Do first half of device_register. */ /* Do first half of device_register. */
device_initialize(&cdev->dev); device_initialize(&cdev->dev);
...@@ -977,9 +974,7 @@ ccw_device_console_enable (struct ccw_device *cdev, struct subchannel *sch) ...@@ -977,9 +974,7 @@ ccw_device_console_enable (struct ccw_device *cdev, struct subchannel *sch)
int rc; int rc;
/* Initialize the ccw_device structure. */ /* Initialize the ccw_device structure. */
cdev->dev = (struct device) { cdev->dev.parent= &sch->dev;
.parent = &sch->dev,
};
rc = io_subchannel_recog(cdev, sch); rc = io_subchannel_recog(cdev, sch);
if (rc) if (rc)
return rc; return rc;
......
...@@ -267,12 +267,10 @@ ccw_device_recog_done(struct ccw_device *cdev, int state) ...@@ -267,12 +267,10 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
notify = 1; notify = 1;
} }
/* fill out sense information */ /* fill out sense information */
cdev->id = (struct ccw_device_id) { cdev->id.cu_type = cdev->private->senseid.cu_type;
.cu_type = cdev->private->senseid.cu_type, cdev->id.cu_model = cdev->private->senseid.cu_model;
.cu_model = cdev->private->senseid.cu_model, cdev->id.dev_type = cdev->private->senseid.dev_type;
.dev_type = cdev->private->senseid.dev_type, cdev->id.dev_model = cdev->private->senseid.dev_model;
.dev_model = cdev->private->senseid.dev_model,
};
if (notify) { if (notify) {
cdev->private->state = DEV_STATE_OFFLINE; cdev->private->state = DEV_STATE_OFFLINE;
if (same_dev) { if (same_dev) {
...@@ -566,12 +564,10 @@ ccw_device_verify_done(struct ccw_device *cdev, int err) ...@@ -566,12 +564,10 @@ ccw_device_verify_done(struct ccw_device *cdev, int err)
/* Deliver fake irb to device driver, if needed. */ /* Deliver fake irb to device driver, if needed. */
if (cdev->private->flags.fake_irb) { if (cdev->private->flags.fake_irb) {
memset(&cdev->private->irb, 0, sizeof(struct irb)); memset(&cdev->private->irb, 0, sizeof(struct irb));
cdev->private->irb.scsw = (struct scsw) { cdev->private->irb.scsw.cc = 1;
.cc = 1, cdev->private->irb.scsw.fctl = SCSW_FCTL_START_FUNC;
.fctl = SCSW_FCTL_START_FUNC, cdev->private->irb.scsw.actl = SCSW_ACTL_START_PEND;
.actl = SCSW_ACTL_START_PEND, cdev->private->irb.scsw.stctl = SCSW_STCTL_STATUS_PEND;
.stctl = SCSW_STCTL_STATUS_PEND,
};
cdev->private->flags.fake_irb = 0; cdev->private->flags.fake_irb = 0;
if (cdev->handler) if (cdev->handler)
cdev->handler(cdev, cdev->private->intparm, cdev->handler(cdev, cdev->private->intparm,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment