On Fri, Aug 05, 2022 at 10:52:22AM -0700, Matthias Kaehlcke wrote:
> On Fri, Aug 05, 2022 at 09:45:00AM +0200, Johan Hovold wrote:
> > Clean up the interconnect-initialisation helper by increasing
> > indentation of (or merging) continuation lines and adding brackets
> > around multi-line blocks in order to improve readability.
> >
> > Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
> > ---
> > drivers/usb/dwc3/dwc3-qcom.c | 15 +++++++--------
> > 1 file changed, 7 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
> > index 196efa9f2545..f2ff4fe1490a 100644
> > --- a/drivers/usb/dwc3/dwc3-qcom.c
> > +++ b/drivers/usb/dwc3/dwc3-qcom.c
> > @@ -253,7 +253,7 @@ static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom)
> > qcom->icc_path_ddr = of_icc_get(dev, "usb-ddr");
> > if (IS_ERR(qcom->icc_path_ddr)) {
> > dev_err(dev, "failed to get usb-ddr path: %ld\n",
> > - PTR_ERR(qcom->icc_path_ddr));
> > + PTR_ERR(qcom->icc_path_ddr));
>
> What's wrong with the existing indentation? It looks similar to the indentation
> changes you do below for icc_set_bw().
The indentation of continuation lines in this driver is a bit
inconsistent, but the above change matches the next conditional and the
rest of the function (which does not use open-parenthesis alignment).
> Maybe your preference is double indentation for continuation lines rather than
> aligning them roughly with the opening parenthesis of the calling function?
I generally prefer two tabs over excessive indentation involving space
characters that need to be added or removed in continuation lines just
because a symbol name is updated.
> > return PTR_ERR(qcom->icc_path_ddr);
> > }
> >
> > @@ -265,20 +265,19 @@ static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom)
> > }
> >
> > max_speed = usb_get_maximum_speed(&qcom->dwc3->dev);
> > - if (max_speed >= USB_SPEED_SUPER || max_speed == USB_SPEED_UNKNOWN)
> > + if (max_speed >= USB_SPEED_SUPER || max_speed == USB_SPEED_UNKNOWN) {
> > ret = icc_set_bw(qcom->icc_path_ddr,
> > - USB_MEMORY_AVG_SS_BW, USB_MEMORY_PEAK_SS_BW);
> > - else
> > + USB_MEMORY_AVG_SS_BW, USB_MEMORY_PEAK_SS_BW);
> > + } else {
> > ret = icc_set_bw(qcom->icc_path_ddr,
> > - USB_MEMORY_AVG_HS_BW, USB_MEMORY_PEAK_HS_BW);
> > -
> > + USB_MEMORY_AVG_HS_BW, USB_MEMORY_PEAK_HS_BW);
> > + }
> > if (ret) {
> > dev_err(dev, "failed to set bandwidth for usb-ddr path: %d\n", ret);
> > return ret;
> > }
> >
> > - ret = icc_set_bw(qcom->icc_path_apps,
> > - APPS_USB_AVG_BW, APPS_USB_PEAK_BW);
> > + ret = icc_set_bw(qcom->icc_path_apps, APPS_USB_AVG_BW, APPS_USB_PEAK_BW);
> > if (ret) {
> > dev_err(dev, "failed to set bandwidth for apps-usb path: %d\n", ret);
> > return ret;
Johan
