| Message ID | 1453663322-14474-12-git-send-email-mans@mansr.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Sun, 2016-01-24 at 19:21 +0000, Mans Rullgard wrote: > From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > This is a simple stylish change that allows to use less lines of > code. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > I'm a little ambivalent on this one. While the patch is correct as > such, > the change means that if struct dw_dma_slave gains new members in > future, > these will not be initialised. This added fragility seems an > unnecesary > price to pay for saving one line of code. We may use struct dw_dma_slave slave = {0}; if it makes someone happier. > --- > drivers/dma/dw/platform.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c > index 808bafdd7d48..0fd5a49311a2 100644 > --- a/drivers/dma/dw/platform.c > +++ b/drivers/dma/dw/platform.c > @@ -32,14 +32,13 @@ static struct dma_chan *dw_dma_of_xlate(struct > of_phandle_args *dma_spec, > struct of_dma *ofdma) > { > struct dw_dma *dw = ofdma->of_dma_data; > - struct dw_dma_slave slave = { > - .dma_dev = dw->dma.dev, > - }; > + struct dw_dma_slave slave; > dma_cap_mask_t cap; > > if (dma_spec->args_count != 3) > return NULL; > > + slave.dma_dev = dw->dma.dev; > slave.src_id = dma_spec->args[0]; > slave.dst_id = dma_spec->args[0]; > slave.m_master = dma_spec->args[1]; > @@ -62,13 +61,13 @@ static struct dma_chan *dw_dma_of_xlate(struct > of_phandle_args *dma_spec, > static bool dw_dma_acpi_filter(struct dma_chan *chan, void *param) > { > struct acpi_dma_spec *dma_spec = param; > - struct dw_dma_slave slave = { > - .dma_dev = dma_spec->dev, > - .src_id = dma_spec->slave_id, > - .dst_id = dma_spec->slave_id, > - .m_master = 1, > - .p_master = 0, > - }; > + struct dw_dma_slave slave; > + > + slave.dma_dev = dma_spec->dev; > + slave.src_id = dma_spec->slave_id; > + slave.dst_id = dma_spec->slave_id; > + slave.m_master = 1; > + slave.p_master = 0; > > return dw_dma_filter(chan, &slave); > }
diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c index 808bafdd7d48..0fd5a49311a2 100644 --- a/drivers/dma/dw/platform.c +++ b/drivers/dma/dw/platform.c @@ -32,14 +32,13 @@ static struct dma_chan *dw_dma_of_xlate(struct of_phandle_args *dma_spec, struct of_dma *ofdma) { struct dw_dma *dw = ofdma->of_dma_data; - struct dw_dma_slave slave = { - .dma_dev = dw->dma.dev, - }; + struct dw_dma_slave slave; dma_cap_mask_t cap; if (dma_spec->args_count != 3) return NULL; + slave.dma_dev = dw->dma.dev; slave.src_id = dma_spec->args[0]; slave.dst_id = dma_spec->args[0]; slave.m_master = dma_spec->args[1]; @@ -62,13 +61,13 @@ static struct dma_chan *dw_dma_of_xlate(struct of_phandle_args *dma_spec, static bool dw_dma_acpi_filter(struct dma_chan *chan, void *param) { struct acpi_dma_spec *dma_spec = param; - struct dw_dma_slave slave = { - .dma_dev = dma_spec->dev, - .src_id = dma_spec->slave_id, - .dst_id = dma_spec->slave_id, - .m_master = 1, - .p_master = 0, - }; + struct dw_dma_slave slave; + + slave.dma_dev = dma_spec->dev; + slave.src_id = dma_spec->slave_id; + slave.dst_id = dma_spec->slave_id; + slave.m_master = 1; + slave.p_master = 0; return dw_dma_filter(chan, &slave); }