| Message ID | 20191213174623.GA20267@dtor-ws (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 5eb5afb07853d6e90d3a2b230c825e028e948f79 |
| Headers | show |
| Series | usb: dwc3: use proper initializers for property entries | expand |
Hi, On 13-12-2019 18:46, Dmitry Torokhov wrote: > We should not be reaching into property entries and initialize them by > hand, but rather use proper initializer macros. This way we can alter > internal representation of property entries with no visible changes to > their users. > > Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> > Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > > It would be good if this could go through Rafael's tree as it is needed > for the rest of my software_node/property_entry rework patch series > which I would love not to delay till 5.6. Patch looks good to me: Acked-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > > Thanks! > > drivers/usb/dwc3/host.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c > index 5567ed2cddbec..fa252870c926f 100644 > --- a/drivers/usb/dwc3/host.c > +++ b/drivers/usb/dwc3/host.c > @@ -88,10 +88,10 @@ int dwc3_host_init(struct dwc3 *dwc) > memset(props, 0, sizeof(struct property_entry) * ARRAY_SIZE(props)); > > if (dwc->usb3_lpm_capable) > - props[prop_idx++].name = "usb3-lpm-capable"; > + props[prop_idx++] = PROPERTY_ENTRY_BOOL("usb3-lpm-capable"); > > if (dwc->usb2_lpm_disable) > - props[prop_idx++].name = "usb2-lpm-disable"; > + props[prop_idx++] = PROPERTY_ENTRY_BOOL("usb2-lpm-disable"); > > /** > * WORKAROUND: dwc3 revisions <=3.00a have a limitation > @@ -103,7 +103,7 @@ int dwc3_host_init(struct dwc3 *dwc) > * This following flag tells XHCI to do just that. > */ > if (dwc->revision <= DWC3_REVISION_300A) > - props[prop_idx++].name = "quirk-broken-port-ped"; > + props[prop_idx++] = PROPERTY_ENTRY_BOOL("quirk-broken-port-ped"); > > if (prop_idx) { > ret = platform_device_add_properties(xhci, props); >
Hi All, On 15.12.2019 17:41, Hans de Goede wrote: > Hi, > > On 13-12-2019 18:46, Dmitry Torokhov wrote: >> We should not be reaching into property entries and initialize them by >> hand, but rather use proper initializer macros. This way we can alter >> internal representation of property entries with no visible changes to >> their users. >> >> Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> >> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> >> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> >> --- >> >> It would be good if this could go through Rafael's tree as it is needed >> for the rest of my software_node/property_entry rework patch series >> which I would love not to delay till 5.6. > > Patch looks good to me: > > Acked-by: Hans de Goede <hdegoede@redhat.com> This patch is instantly needed as the issue it fixes is again triggered in current (20200107) linux-next by commit e6bff4665c59 "software node: replace is_array with is_inline". Felipe: could You ack it, so it could be merged via Rafael's tree together with related device property changes? >> >> drivers/usb/dwc3/host.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c >> index 5567ed2cddbec..fa252870c926f 100644 >> --- a/drivers/usb/dwc3/host.c >> +++ b/drivers/usb/dwc3/host.c >> @@ -88,10 +88,10 @@ int dwc3_host_init(struct dwc3 *dwc) >> memset(props, 0, sizeof(struct property_entry) * >> ARRAY_SIZE(props)); >> if (dwc->usb3_lpm_capable) >> - props[prop_idx++].name = "usb3-lpm-capable"; >> + props[prop_idx++] = PROPERTY_ENTRY_BOOL("usb3-lpm-capable"); >> if (dwc->usb2_lpm_disable) >> - props[prop_idx++].name = "usb2-lpm-disable"; >> + props[prop_idx++] = PROPERTY_ENTRY_BOOL("usb2-lpm-disable"); >> /** >> * WORKAROUND: dwc3 revisions <=3.00a have a limitation >> @@ -103,7 +103,7 @@ int dwc3_host_init(struct dwc3 *dwc) >> * This following flag tells XHCI to do just that. >> */ >> if (dwc->revision <= DWC3_REVISION_300A) >> - props[prop_idx++].name = "quirk-broken-port-ped"; >> + props[prop_idx++] = >> PROPERTY_ENTRY_BOOL("quirk-broken-port-ped"); >> if (prop_idx) { >> ret = platform_device_add_properties(xhci, props); >> > Best regards
Hi, Marek Szyprowski <m.szyprowski@samsung.com> writes: > Hi All, > > On 15.12.2019 17:41, Hans de Goede wrote: >> Hi, >> >> On 13-12-2019 18:46, Dmitry Torokhov wrote: >>> We should not be reaching into property entries and initialize them by >>> hand, but rather use proper initializer macros. This way we can alter >>> internal representation of property entries with no visible changes to >>> their users. >>> >>> Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> >>> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> >>> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> >>> --- >>> >>> It would be good if this could go through Rafael's tree as it is needed >>> for the rest of my software_node/property_entry rework patch series >>> which I would love not to delay till 5.6. >> >> Patch looks good to me: >> >> Acked-by: Hans de Goede <hdegoede@redhat.com> > > This patch is instantly needed as the issue it fixes is again triggered > in current (20200107) linux-next by commit e6bff4665c59 "software node: > replace is_array with is_inline". > > Felipe: could You ack it, so it could be merged via Rafael's tree > together with related device property changes? Here you go: Acked-by: Felipe Balbi <balbi@kernel.org> cheers
On Thu, Jan 9, 2020 at 10:07 AM Felipe Balbi <balbi@kernel.org> wrote: > > > Hi, > > Marek Szyprowski <m.szyprowski@samsung.com> writes: > > > Hi All, > > > > On 15.12.2019 17:41, Hans de Goede wrote: > >> Hi, > >> > >> On 13-12-2019 18:46, Dmitry Torokhov wrote: > >>> We should not be reaching into property entries and initialize them by > >>> hand, but rather use proper initializer macros. This way we can alter > >>> internal representation of property entries with no visible changes to > >>> their users. > >>> > >>> Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> > >>> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> > >>> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > >>> --- > >>> > >>> It would be good if this could go through Rafael's tree as it is needed > >>> for the rest of my software_node/property_entry rework patch series > >>> which I would love not to delay till 5.6. > >> > >> Patch looks good to me: > >> > >> Acked-by: Hans de Goede <hdegoede@redhat.com> > > > > This patch is instantly needed as the issue it fixes is again triggered > > in current (20200107) linux-next by commit e6bff4665c59 "software node: > > replace is_array with is_inline". > > > > Felipe: could You ack it, so it could be merged via Rafael's tree > > together with related device property changes? > > Here you go: > > Acked-by: Felipe Balbi <balbi@kernel.org> Thanks, applied.
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index 5567ed2cddbec..fa252870c926f 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -88,10 +88,10 @@ int dwc3_host_init(struct dwc3 *dwc) memset(props, 0, sizeof(struct property_entry) * ARRAY_SIZE(props)); if (dwc->usb3_lpm_capable) - props[prop_idx++].name = "usb3-lpm-capable"; + props[prop_idx++] = PROPERTY_ENTRY_BOOL("usb3-lpm-capable"); if (dwc->usb2_lpm_disable) - props[prop_idx++].name = "usb2-lpm-disable"; + props[prop_idx++] = PROPERTY_ENTRY_BOOL("usb2-lpm-disable"); /** * WORKAROUND: dwc3 revisions <=3.00a have a limitation @@ -103,7 +103,7 @@ int dwc3_host_init(struct dwc3 *dwc) * This following flag tells XHCI to do just that. */ if (dwc->revision <= DWC3_REVISION_300A) - props[prop_idx++].name = "quirk-broken-port-ped"; + props[prop_idx++] = PROPERTY_ENTRY_BOOL("quirk-broken-port-ped"); if (prop_idx) { ret = platform_device_add_properties(xhci, props);