Skip to content

drivers: imx: fix checkpatch styling error #7334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 1 commit into from
Apr 24, 2023
Merged

drivers: imx: fix checkpatch styling error #7334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/drivers/imx/ipc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ int ipc_platform_send_msg(const struct ipc_msg *msg)

Comment thread
jiande-my marked this conversation as resolved.
Resolved
/* can't send notification when one is in progress */
Comment thread
iuliana-prodan marked this conversation as resolved.
Resolved
if (ipc->is_notification_pending ||
imx_mu_read(IMX_MU_xCR(IMX_MU_VERSION, IMX_MU_GCR)) & IMX_MU_xCR_GIRn(IMX_MU_VERSION, 1)) {
imx_mu_read(IMX_MU_xCR(IMX_MU_VERSION, IMX_MU_GCR)) &
IMX_MU_xCR_GIRn(IMX_MU_VERSION, 1)) {
return -EBUSY;
}

Expand Down Expand Up @@ -223,8 +224,7 @@ int platform_ipc_init(struct ipc *ipc)
* enable GP #0 for Host -> DSP message notification
Comment thread
jiande-my marked this conversation as resolved.
Resolved
* enable GP #1 for DSP -> Host message confirmation
*/
imx_mu_xcr_rmw(IMX_MU_VERSION, IMX_MU_GIER,
IMX_MU_xCR_GIEn(IMX_MU_VERSION, 0) |
imx_mu_xcr_rmw(IMX_MU_VERSION, IMX_MU_GIER, IMX_MU_xCR_GIEn(IMX_MU_VERSION, 0) |
IMX_MU_xCR_GIEn(IMX_MU_VERSION, 1), 0);

return 0;
Expand Down Expand Up @@ -257,7 +257,6 @@ int ipc_platform_poll_is_cmd_pending(void)

/* new message from host */
if (status & IMX_MU_xSR_GIPn(IMX_MU_VERSION, 0)) {

/* Disable GP interrupt #0 */
imx_mu_xcr_rmw(IMX_MU_VERSION, IMX_MU_GIER, 0, IMX_MU_xCR_GIEn(IMX_MU_VERSION, 0));

Expand Down Expand Up @@ -307,7 +306,8 @@ int ipc_platform_poll_is_host_ready(void)
int ipc_platform_poll_tx_host_msg(struct ipc_msg *msg)
{
/* can't send notification when one is in progress */
if (imx_mu_read(IMX_MU_xCR(IMX_MU_VERSION, IMX_MU_GCR)) & IMX_MU_xCR_GIRn(IMX_MU_VERSION, 1))
if (imx_mu_read(IMX_MU_xCR(IMX_MU_VERSION, IMX_MU_GCR)) &
IMX_MU_xCR_GIRn(IMX_MU_VERSION, 1))
return 0;

/* now send the message */
Expand Down
3 changes: 1 addition & 2 deletions src/drivers/imx/sai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,7 @@ static inline int sai_set_config(struct dai *dai, struct ipc_config_dai *common_
dai_update_bits(dai, REG_SAI_XCR4(REG_TX_DIR), mask_cr4, val_cr4);
dai_update_bits(dai, REG_SAI_XCR5(REG_TX_DIR), mask_cr5, val_cr5);
/* turn on (set to zero) stereo slot */
dai_update_bits(dai, REG_SAI_XMR(REG_TX_DIR), REG_SAI_XMR_MASK,
twm);
dai_update_bits(dai, REG_SAI_XMR(REG_TX_DIR), REG_SAI_XMR_MASK, twm);

val_cr2 |= REG_SAI_CR2_SYNC;
mask_cr2 |= REG_SAI_CR2_SYNC_MASK;
Expand Down