On 04-11-19, 17:27, Elliot Berman wrote: > - Rename legacy-specific structures and macros with "legacy_" prefix. > - Rename smccc-specific structures and macros with "smccc_" prefix. > - Flip calculation of SMCCC_N_EXT_ARGS to be a function of N_REG_ARGS > (not the other way around). N_REG_ARGS is fixed based off the SMC > instruction and shouldn't be computed from the SCM abstraction. > - Move SMCCC_FUNCNUM closer to other smccc-specific macros. > - Add LEGACY_FUNCNUM macro to qcom_scm-32.c My preference is one change per patch :) That also makes it easier to review! > +#define LEGACY_FUNCNUM(s, c) (((s) << 10) | ((c) & 0x3ff)) > + > /** > - * struct qcom_scm_command - one SCM command buffer > + * struct legacy_command - one SCM command buffer can we keep the qcom_ tag in this? > /** > - * struct qcom_scm_response - one SCM response buffer > + * struct legacy_response - one SCM response buffer > * @len: total available memory for response > - * @buf_offset: start of response data relative to start of qcom_scm_response > + * @buf_offset: start of response data relative to start of legacy_response > * @is_complete: indicates if the command has finished processing > */ > -struct qcom_scm_response { > +struct legacy_response { here as well > diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c > index a729e05..40222b1 100644 > --- a/drivers/firmware/qcom_scm.c > +++ b/drivers/firmware/qcom_scm.c > @@ -1,8 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0-only > /* > - * Qualcomm SCM driver > - * > - * Copyright (c) 2010,2015, The Linux Foundation. All rights reserved. > + * Copyright (c) 2010,2015,2019 The Linux Foundation. All rights reserved. > * Copyright (C) 2015 Linaro Ltd. I don't feel this belongs to this patch, please move it to patch touching this file -- ~Vinod