usb: dwc3: qcom: clean up icc init
Subsystems (3)
cover usb: dwc3: qcom: clean up icc init
This series clean up the interconnect-initialisation helper somewhat in order to improve readability.
Johan
Johan Hovold (2):
usb: dwc3: qcom: only parse 'maximum-speed' once
usb: dwc3: qcom: clean up icc init
drivers/usb/dwc3/dwc3-qcom.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/2 usb: dwc3: qcom: only parse 'maximum-speed' once
Add a temporary variable to the interconnect-initialisation helper to avoid parsing and decoding the 'maximum-speed' devicetree property twice.
--- drivers/usb/dwc3/dwc3-qcom.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +3 -2
@@ -243,6 +243,7 @@ static int dwc3_qcom_interconnect_disable(struct dwc3_qcom *qcom)*/ static int dwc3_qcom_interconnect_init (struct dwc3_qcom *qcom) { +enum usb_device_speed max_speed;struct device *dev = qcom->dev;int ret;
@@ -263,8 +264,8 @@ static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom)return PTR_ERR (qcom->icc_path_apps); } -if (usb_get_maximum_speed (&qcom->dwc3->dev) >=USB_SPEED_SUPER || -usb_get_maximum_speed (&qcom->dwc3->dev) ==USB_SPEED_UNKNOWN ) + max_speed =usb_get_maximum_speed (&qcom->dwc3->dev); +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
Signature · 1 line
2.35.1
Re: [PATCH 1/2] usb: dwc3: qcom: only parse 'maximum-speed' once
Quoted 5 lines · Johan Hovold
Add a temporary variable to the interconnect-initialisation helper to avoid parsing and decoding the 'maximum-speed' devicetree property twice.
Signed-off-by Johan Hovold <[email protected]>
Re: [PATCH 1/2] usb: dwc3: qcom: only parse 'maximum-speed' once
In reply to Johan HovoldQuoted 5 lines · Johan Hovold
Add a temporary variable to the interconnect-initialisation helper to avoid parsing and decoding the 'maximum-speed' devicetree property twice.
Signed-off-by Johan Hovold <[email protected]>
Quoted 30 lines
--- drivers/usb/dwc3/dwc3-qcom.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/usb/dwc3/dwc3-qcom.c +3
-2@@ -243,6 +243,7 @@ static int dwc3_qcom_interconnect_disable(struct dwc3_qcom *qcom)*/ static int dwc3_qcom_interconnect_init (struct dwc3_qcom *qcom) { +enum usb_device_speed max_speed;struct device *dev = qcom->dev;int ret;@@ -263,8 +264,8 @@ static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom)return PTR_ERR (qcom->icc_path_apps); } -if (usb_get_maximum_speed (&qcom->dwc3->dev) >=USB_SPEED_SUPER || -usb_get_maximum_speed (&qcom->dwc3->dev) ==USB_SPEED_UNKNOWN ) + max_speed =usb_get_maximum_speed (&qcom->dwc3->dev); +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 Signature · 1 line
2.35.1
PATCH 2/2 usb: dwc3: qcom: clean up icc init
In reply to Johan HovoldClean 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.
--- drivers/usb/dwc3/dwc3-qcom.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/usb/dwc3/dwc3-qcom.c +7 -8
@@ -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));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;
Signature · 1 line
2.35.1
Quoted 14 lines · Johan Hovold
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 <[email protected]>--- drivers/usb/dwc3/dwc3-qcom.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)drivers/usb/dwc3/dwc3-qcom.c +0
-0
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom) · line 256
Quoted 5 lines
drivers/usb/dwc3/dwc3-qcom.c +1
-1@@ -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().
Maybe your preference is double indentation for continuation lines rather than aligning them roughly with the opening parenthesis of the calling function?
Quoted 20 lines
drivers/usb/dwc3/dwc3-qcom.c +5
-5return 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) {
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom) · line 283
Quoted 10 lines
drivers/usb/dwc3/dwc3-qcom.c +1
-2dev_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;
Quoted 10 lines · Matthias Kaehlcke
Quoted 9 lines · Johan Hovold
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 <[email protected]>--- drivers/usb/dwc3/dwc3-qcom.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
Quoted 13 lines
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom) · line 256
Quoted 10 lines
drivers/usb/dwc3/dwc3-qcom.c +1
-1@@ -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).
Quoted 2 lines
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.
Quoted 24 lines
Quoted 24 lines
drivers/usb/dwc3/dwc3-qcom.c +5
-5return 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; }
Quoted 6 lines
drivers/usb/dwc3/dwc3-qcom.c static int dwc3_qcom_interconnect_init(struct dwc3_qcom *qcom) · line 283
Quoted 6 lines
drivers/usb/dwc3/dwc3-qcom.c +1
-2- 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