Re: [PATCH v2 7/9] mfd/extcon: max77843: Rename defines to allow inclusion with max77693

From: Chanwoo Choi
Date: Fri May 29 2015 - 07:06:30 EST

Next message: Jason A. Donenfeld: "[PATCH v3 0/4] ozwpan: Four remote packet-of-death vulnerabilities"
Previous message: Petr Mladek: "Re: [PATCH 02/10] printk: Try harder to get logbuf_lock on NMI"
In reply to: Krzysztof KozÅowski: "Re: [PATCH v2 7/9] mfd/extcon: max77843: Rename defines to allow inclusion with max77693"
Next in thread: Krzysztof Kozlowski: "[PATCH v2 9/9] regulator: Remove the max77843 driver"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On 05/28/2015 08:42 AM, Krzysztof KozÅowski wrote:
> 2015-05-27 22:50 GMT+09:00 Chanwoo Choi <cwchoi00@xxxxxxxxx>:
>> On Sun, May 24, 2015 at 2:43 PM, Krzysztof Kozlowski
>> <k.kozlowski.k@xxxxxxxxx> wrote:
>>> Add MAX77843_MUIC prefix to some of the defines used in max77843 extcon
>>> driver so the max77693-private.h can be included simultaneously with
>>> max77843-private.h.
>>>
>>> Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k@xxxxxxxxx>
>>> Acked-by: Lee Jones <lee.jones@xxxxxxxxxx>
>>> ---
>>> drivers/extcon/extcon-max77843.c | 49 +++++++----
>>> include/linux/mfd/max77843-private.h | 154 +++++++++++++++++------------------
>>> 2 files changed, 109 insertions(+), 94 deletions(-)
>>>
>>> diff --git a/drivers/extcon/extcon-max77843.c b/drivers/extcon/extcon-max77843.c
>>> index 0f5910dcccb7..8a38d4acf026 100644
>>> --- a/drivers/extcon/extcon-max77843.c
>>> +++ b/drivers/extcon/extcon-max77843.c
>>> @@ -206,11 +206,11 @@ static int max77843_muic_set_path(struct max77843_muic_info *info,
>>> if (attached)
>>> ctrl1 = val;
>>> else
>>> - ctrl1 = CONTROL1_SW_OPEN;
>>> + ctrl1 = MAX77843_MUIC_CONTROL1_SW_OPEN;
>>>
>>> ret = regmap_update_bits(max77843->regmap_muic,
>>> MAX77843_MUIC_REG_CONTROL1,
>>> - CONTROL1_COM_SW, ctrl1);
>>> + MAX77843_MUIC_CONTROL1_COM_SW, ctrl1);
>>> if (ret < 0) {
>>> dev_err(info->dev, "Cannot switch MUIC port\n");
>>> return ret;
>>> @@ -244,7 +244,7 @@ static int max77843_muic_get_cable_type(struct max77843_muic_info *info,
>>>
>>> adc = info->status[MAX77843_MUIC_STATUS1] &
>>> MAX77843_MUIC_STATUS1_ADC_MASK;
>>> - adc >>= STATUS1_ADC_SHIFT;
>>> + adc >>= MAX77843_MUIC_STATUS1_ADC_SHIFT;
>>>
>>> switch (group) {
>>> case MAX77843_CABLE_GROUP_ADC:
>>> @@ -310,7 +310,7 @@ static int max77843_muic_get_cable_type(struct max77843_muic_info *info,
>>> /* Get VBVolt register bit */
>>> gnd_type |= (info->status[MAX77843_MUIC_STATUS2] &
>>> MAX77843_MUIC_STATUS2_VBVOLT_MASK);
>>> - gnd_type >>= STATUS2_VBVOLT_SHIFT;
>>> + gnd_type >>= MAX77843_MUIC_STATUS2_VBVOLT_SHIFT;
>>>
>>> /* Offset of GND cable */
>>> gnd_type |= MAX77843_MUIC_GND_USB_HOST;
>>> @@ -339,7 +339,9 @@ static int max77843_muic_adc_gnd_handler(struct max77843_muic_info *info)
>>> switch (gnd_cable_type) {
>>> case MAX77843_MUIC_GND_USB_HOST:
>>> case MAX77843_MUIC_GND_USB_HOST_VB:
>>> - ret = max77843_muic_set_path(info, CONTROL1_SW_USB, attached);
>>> + ret = max77843_muic_set_path(info,
>>> + MAX77843_MUIC_CONTROL1_SW_USB,
>>> + attached);
>>> if (ret < 0)
>>> return ret;
>>>
>>> @@ -347,7 +349,9 @@ static int max77843_muic_adc_gnd_handler(struct max77843_muic_info *info)
>>> break;
>>> case MAX77843_MUIC_GND_MHL_VB:
>>> case MAX77843_MUIC_GND_MHL:
>>> - ret = max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached);
>>> + ret = max77843_muic_set_path(info,
>>> + MAX77843_MUIC_CONTROL1_SW_OPEN,
>>> + attached);
>>> if (ret < 0)
>>> return ret;
>>>
>>> @@ -366,7 +370,7 @@ static int max77843_muic_jig_handler(struct max77843_muic_info *info,
>>> int cable_type, bool attached)
>>> {
>>> int ret;
>>> - u8 path = CONTROL1_SW_OPEN;
>>> + u8 path = MAX77843_MUIC_CONTROL1_SW_OPEN;
>>>
>>> dev_dbg(info->dev, "external connector is %s (adc:0x%02x)\n",
>>> attached ? "attached" : "detached", cable_type);
>>> @@ -374,10 +378,10 @@ static int max77843_muic_jig_handler(struct max77843_muic_info *info,
>>> switch (cable_type) {
>>> case MAX77843_MUIC_ADC_FACTORY_MODE_USB_OFF:
>>> case MAX77843_MUIC_ADC_FACTORY_MODE_USB_ON:
>>> - path = CONTROL1_SW_USB;
>>> + path = MAX77843_MUIC_CONTROL1_SW_USB;
>>> break;
>>> case MAX77843_MUIC_ADC_FACTORY_MODE_UART_OFF:
>>> - path = CONTROL1_SW_UART;
>>> + path = MAX77843_MUIC_CONTROL1_SW_UART;
>>> break;
>>> default:
>>> return -EINVAL;
>>> @@ -475,14 +479,18 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
>>>
>>> switch (chg_type) {
>>> case MAX77843_MUIC_CHG_USB:
>>> - ret = max77843_muic_set_path(info, CONTROL1_SW_USB, attached);
>>> + ret = max77843_muic_set_path(info,
>>> + MAX77843_MUIC_CONTROL1_SW_USB,
>>> + attached);
>>> if (ret < 0)
>>> return ret;
>>>
>>> extcon_set_cable_state_(info->edev, EXTCON_USB, attached);
>>> break;
>>> case MAX77843_MUIC_CHG_DOWNSTREAM:
>>> - ret = max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached);
>>> + ret = max77843_muic_set_path(info,
>>> + MAX77843_MUIC_CONTROL1_SW_OPEN,
>>> + attached);
>>> if (ret < 0)
>>> return ret;
>>>
>>> @@ -490,14 +498,18 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
>>> attached);
>>> break;
>>> case MAX77843_MUIC_CHG_DEDICATED:
>>> - ret = max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached);
>>> + ret = max77843_muic_set_path(info,
>>> + MAX77843_MUIC_CONTROL1_SW_OPEN,
>>> + attached);
>>> if (ret < 0)
>>> return ret;
>>>
>>> extcon_set_cable_state_(info->edev, EXTCON_TA, attached);
>>> break;
>>> case MAX77843_MUIC_CHG_SPECIAL_500MA:
>>> - ret = max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached);
>>> + ret = max77843_muic_set_path(info,
>>> + MAX77843_MUIC_CONTROL1_SW_OPEN,
>>> + attached);
>>> if (ret < 0)
>>> return ret;
>>>
>>> @@ -505,7 +517,9 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
>>> attached);
>>> break;
>>> case MAX77843_MUIC_CHG_SPECIAL_1A:
>>> - ret = max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached);
>>> + ret = max77843_muic_set_path(info,
>>> + MAX77843_MUIC_CONTROL1_SW_OPEN,
>>> + attached);
>>> if (ret < 0)
>>> return ret;
>>>
>>> @@ -529,7 +543,8 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
>>> "failed to detect %s accessory (chg_type:0x%x)\n",
>>> attached ? "attached" : "detached", chg_type);
>>>
>>> - max77843_muic_set_path(info, CONTROL1_SW_OPEN, attached);
>>> + max77843_muic_set_path(info, MAX77843_MUIC_CONTROL1_SW_OPEN,
>>> + attached);
>>> return -EINVAL;
>>> }
>>>
>>> @@ -668,7 +683,7 @@ static int max77843_muic_set_debounce_time(struct max77843_muic_info *info,
>>> ret = regmap_update_bits(max77843->regmap_muic,
>>> MAX77843_MUIC_REG_CONTROL4,
>>> MAX77843_MUIC_CONTROL4_ADCDBSET_MASK,
>>> - time << CONTROL4_ADCDBSET_SHIFT);
>>> + time << MAX77843_MUIC_CONTROL4_ADCDBSET_SHIFT);
>>> if (ret < 0) {
>>> dev_err(info->dev, "Cannot write MUIC regmap\n");
>>> return ret;
>>> @@ -769,7 +784,7 @@ static int max77843_muic_probe(struct platform_device *pdev)
>>> max77843_muic_set_debounce_time(info, MAX77843_DEBOUNCE_TIME_25MS);
>>>
>>> /* Set initial path for UART */
>>> - max77843_muic_set_path(info, CONTROL1_SW_UART, true);
>>> + max77843_muic_set_path(info, MAX77843_MUIC_CONTROL1_SW_UART, true);
>>>
>>> /* Check revision number of MUIC device */
>>> ret = regmap_read(max77843->regmap_muic, MAX77843_MUIC_REG_ID, &id);
>>> diff --git a/include/linux/mfd/max77843-private.h b/include/linux/mfd/max77843-private.h
>>> index 0121d9440340..c19303b0ccfd 100644
>>> --- a/include/linux/mfd/max77843-private.h
>>> +++ b/include/linux/mfd/max77843-private.h
>>> @@ -318,62 +318,62 @@ enum max77843_irq_muic {
>>> MAX77843_INTSRCMASK_SYS_MASK | MAX77843_INTSRCMASK_CHGR_MASK)
>>>
>>> /* MAX77843 STATUS register*/
>>> -#define STATUS1_ADC_SHIFT 0
>>> -#define STATUS1_ADCERROR_SHIFT 6
>>> -#define STATUS1_ADC1K_SHIFT 7
>>> -#define STATUS2_CHGTYP_SHIFT 0
>>> -#define STATUS2_CHGDETRUN_SHIFT 3
>>> -#define STATUS2_DCDTMR_SHIFT 4
>>> -#define STATUS2_DXOVP_SHIFT 5
>>> -#define STATUS2_VBVOLT_SHIFT 6
>>> -#define STATUS3_VBADC_SHIFT 0
>>> -#define STATUS3_VDNMON_SHIFT 4
>>> -#define STATUS3_DNRES_SHIFT 5
>>> -#define STATUS3_MPNACK_SHIFT 6
>>> -
>>> -#define MAX77843_MUIC_STATUS1_ADC_MASK (0x1f << STATUS1_ADC_SHIFT)
>>> -#define MAX77843_MUIC_STATUS1_ADCERROR_MASK BIT(STATUS1_ADCERROR_SHIFT)
>>> -#define MAX77843_MUIC_STATUS1_ADC1K_MASK BIT(STATUS1_ADC1K_SHIFT)
>>> -#define MAX77843_MUIC_STATUS2_CHGTYP_MASK (0x7 << STATUS2_CHGTYP_SHIFT)
>>> -#define MAX77843_MUIC_STATUS2_CHGDETRUN_MASK BIT(STATUS2_CHGDETRUN_SHIFT)
>>> -#define MAX77843_MUIC_STATUS2_DCDTMR_MASK BIT(STATUS2_DCDTMR_SHIFT)
>>> -#define MAX77843_MUIC_STATUS2_DXOVP_MASK BIT(STATUS2_DXOVP_SHIFT)
>>> -#define MAX77843_MUIC_STATUS2_VBVOLT_MASK BIT(STATUS2_VBVOLT_SHIFT)
>>> -#define MAX77843_MUIC_STATUS3_VBADC_MASK (0xf << STATUS3_VBADC_SHIFT)
>>> -#define MAX77843_MUIC_STATUS3_VDNMON_MASK BIT(STATUS3_VDNMON_SHIFT)
>>> -#define MAX77843_MUIC_STATUS3_DNRES_MASK BIT(STATUS3_DNRES_SHIFT)
>>> -#define MAX77843_MUIC_STATUS3_MPNACK_MASK BIT(STATUS3_MPNACK_SHIFT)
>>> +#define MAX77843_MUIC_STATUS1_ADC_SHIFT 0
>>> +#define MAX77843_MUIC_STATUS1_ADCERROR_SHIFT 6
>>> +#define MAX77843_MUIC_STATUS1_ADC1K_SHIFT 7
>>> +#define MAX77843_MUIC_STATUS2_CHGTYP_SHIFT 0
>>> +#define MAX77843_MUIC_STATUS2_CHGDETRUN_SHIFT 3
>>> +#define MAX77843_MUIC_STATUS2_DCDTMR_SHIFT 4
>>> +#define MAX77843_MUIC_STATUS2_DXOVP_SHIFT 5
>>> +#define MAX77843_MUIC_STATUS2_VBVOLT_SHIFT 6
>>> +#define MAX77843_MUIC_STATUS3_VBADC_SHIFT 0
>>> +#define MAX77843_MUIC_STATUS3_VDNMON_SHIFT 4
>>> +#define MAX77843_MUIC_STATUS3_DNRES_SHIFT 5
>>> +#define MAX77843_MUIC_STATUS3_MPNACK_SHIFT 6
>>> +
>>> +#define MAX77843_MUIC_STATUS1_ADC_MASK (0x1f << MAX77843_MUIC_STATUS1_ADC_SHIFT)
>>> +#define MAX77843_MUIC_STATUS1_ADCERROR_MASK BIT(MAX77843_MUIC_STATUS1_ADCERROR_SHIFT)
>>> +#define MAX77843_MUIC_STATUS1_ADC1K_MASK BIT(MAX77843_MUIC_STATUS1_ADC1K_SHIFT)
>>> +#define MAX77843_MUIC_STATUS2_CHGTYP_MASK (0x7 << MAX77843_MUIC_STATUS2_CHGTYP_SHIFT)
>>> +#define MAX77843_MUIC_STATUS2_CHGDETRUN_MASK BIT(MAX77843_MUIC_STATUS2_CHGDETRUN_SHIFT)
>>> +#define MAX77843_MUIC_STATUS2_DCDTMR_MASK BIT(MAX77843_MUIC_STATUS2_DCDTMR_SHIFT)
>>> +#define MAX77843_MUIC_STATUS2_DXOVP_MASK BIT(MAX77843_MUIC_STATUS2_DXOVP_SHIFT)
>>> +#define MAX77843_MUIC_STATUS2_VBVOLT_MASK BIT(MAX77843_MUIC_STATUS2_VBVOLT_SHIFT)
>>> +#define MAX77843_MUIC_STATUS3_VBADC_MASK (0xf << MAX77843_MUIC_STATUS3_VBADC_SHIFT)
>>> +#define MAX77843_MUIC_STATUS3_VDNMON_MASK BIT(MAX77843_MUIC_STATUS3_VDNMON_SHIFT)
>>> +#define MAX77843_MUIC_STATUS3_DNRES_MASK BIT(MAX77843_MUIC_STATUS3_DNRES_SHIFT)
>>> +#define MAX77843_MUIC_STATUS3_MPNACK_MASK BIT(MAX77843_MUIC_STATUS3_MPNACK_SHIFT)
>>>
>>> /* MAX77843 CONTROL register */
>>> -#define CONTROL1_COMP1SW_SHIFT 0
>>> -#define CONTROL1_COMP2SW_SHIFT 3
>>> -#define CONTROL1_IDBEN_SHIFT 7
>>> -#define CONTROL2_LOWPWR_SHIFT 0
>>> -#define CONTROL2_ADCEN_SHIFT 1
>>> -#define CONTROL2_CPEN_SHIFT 2
>>> -#define CONTROL2_ACC_DET_SHIFT 5
>>> -#define CONTROL2_USBCPINT_SHIFT 6
>>> -#define CONTROL2_RCPS_SHIFT 7
>>> -#define CONTROL3_JIGSET_SHIFT 0
>>> -#define CONTROL4_ADCDBSET_SHIFT 0
>>> -#define CONTROL4_USBAUTO_SHIFT 4
>>> -#define CONTROL4_FCTAUTO_SHIFT 5
>>> -#define CONTROL4_ADCMODE_SHIFT 6
>>> -
>>> -#define MAX77843_MUIC_CONTROL1_COMP1SW_MASK (0x7 << CONTROL1_COMP1SW_SHIFT)
>>> -#define MAX77843_MUIC_CONTROL1_COMP2SW_MASK (0x7 << CONTROL1_COMP2SW_SHIFT)
>>> -#define MAX77843_MUIC_CONTROL1_IDBEN_MASK BIT(CONTROL1_IDBEN_SHIFT)
>>> -#define MAX77843_MUIC_CONTROL2_LOWPWR_MASK BIT(CONTROL2_LOWPWR_SHIFT)
>>> -#define MAX77843_MUIC_CONTROL2_ADCEN_MASK BIT(CONTROL2_ADCEN_SHIFT)
>>> -#define MAX77843_MUIC_CONTROL2_CPEN_MASK BIT(CONTROL2_CPEN_SHIFT)
>>> -#define MAX77843_MUIC_CONTROL2_ACC_DET_MASK BIT(CONTROL2_ACC_DET_SHIFT)
>>> -#define MAX77843_MUIC_CONTROL2_USBCPINT_MASK BIT(CONTROL2_USBCPINT_SHIFT)
>>> -#define MAX77843_MUIC_CONTROL2_RCPS_MASK BIT(CONTROL2_RCPS_SHIFT)
>>> -#define MAX77843_MUIC_CONTROL3_JIGSET_MASK (0x3 << CONTROL3_JIGSET_SHIFT)
>>> -#define MAX77843_MUIC_CONTROL4_ADCDBSET_MASK (0x3 << CONTROL4_ADCDBSET_SHIFT)
>>> -#define MAX77843_MUIC_CONTROL4_USBAUTO_MASK BIT(CONTROL4_USBAUTO_SHIFT)
>>> -#define MAX77843_MUIC_CONTROL4_FCTAUTO_MASK BIT(CONTROL4_FCTAUTO_SHIFT)
>>> -#define MAX77843_MUIC_CONTROL4_ADCMODE_MASK (0x3 << CONTROL4_ADCMODE_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT 0
>>> +#define MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT 3
>>> +#define MAX77843_MUIC_CONTROL1_IDBEN_SHIFT 7
>>> +#define MAX77843_MUIC_CONTROL2_LOWPWR_SHIFT 0
>>> +#define MAX77843_MUIC_CONTROL2_ADCEN_SHIFT 1
>>> +#define MAX77843_MUIC_CONTROL2_CPEN_SHIFT 2
>>> +#define MAX77843_MUIC_CONTROL2_ACC_DET_SHIFT 5
>>> +#define MAX77843_MUIC_CONTROL2_USBCPINT_SHIFT 6
>>> +#define MAX77843_MUIC_CONTROL2_RCPS_SHIFT 7
>>> +#define MAX77843_MUIC_CONTROL3_JIGSET_SHIFT 0
>>> +#define MAX77843_MUIC_CONTROL4_ADCDBSET_SHIFT 0
>>> +#define MAX77843_MUIC_CONTROL4_USBAUTO_SHIFT 4
>>> +#define MAX77843_MUIC_CONTROL4_FCTAUTO_SHIFT 5
>>> +#define MAX77843_MUIC_CONTROL4_ADCMODE_SHIFT 6
>>> +
>>> +#define MAX77843_MUIC_CONTROL1_COMP1SW_MASK (0x7 << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL1_COMP2SW_MASK (0x7 << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL1_IDBEN_MASK BIT(MAX77843_MUIC_CONTROL1_IDBEN_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL2_LOWPWR_MASK BIT(MAX77843_MUIC_CONTROL2_LOWPWR_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL2_ADCEN_MASK BIT(MAX77843_MUIC_CONTROL2_ADCEN_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL2_CPEN_MASK BIT(MAX77843_MUIC_CONTROL2_CPEN_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL2_ACC_DET_MASK BIT(MAX77843_MUIC_CONTROL2_ACC_DET_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL2_USBCPINT_MASK BIT(MAX77843_MUIC_CONTROL2_USBCPINT_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL2_RCPS_MASK BIT(MAX77843_MUIC_CONTROL2_RCPS_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL3_JIGSET_MASK (0x3 << MAX77843_MUIC_CONTROL3_JIGSET_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL4_ADCDBSET_MASK (0x3 << MAX77843_MUIC_CONTROL4_ADCDBSET_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL4_USBAUTO_MASK BIT(MAX77843_MUIC_CONTROL4_USBAUTO_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL4_FCTAUTO_MASK BIT(MAX77843_MUIC_CONTROL4_FCTAUTO_SHIFT)
>>> +#define MAX77843_MUIC_CONTROL4_ADCMODE_MASK (0x3 << MAX77843_MUIC_CONTROL4_ADCMODE_SHIFT)
>>>
>>> /* MAX77843 switch port */
>>> #define COM_OPEN 0
>>> @@ -383,38 +383,38 @@ enum max77843_irq_muic {
>>> #define COM_AUX_USB 4
>>> #define COM_AUX_UART 5
>>>
>>> -#define CONTROL1_COM_SW \
>>> +#define MAX77843_MUIC_CONTROL1_COM_SW \
>>> ((MAX77843_MUIC_CONTROL1_COMP1SW_MASK | \
>>> MAX77843_MUIC_CONTROL1_COMP2SW_MASK))
>>>
>>> -#define CONTROL1_SW_OPEN \
>>> - ((COM_OPEN << CONTROL1_COMP1SW_SHIFT | \
>>> - COM_OPEN << CONTROL1_COMP2SW_SHIFT))
>>> -#define CONTROL1_SW_USB \
>>> - ((COM_USB << CONTROL1_COMP1SW_SHIFT | \
>>> - COM_USB << CONTROL1_COMP2SW_SHIFT))
>>> -#define CONTROL1_SW_AUDIO \
>>> - ((COM_AUDIO << CONTROL1_COMP1SW_SHIFT | \
>>> - COM_AUDIO << CONTROL1_COMP2SW_SHIFT))
>>> -#define CONTROL1_SW_UART \
>>> - ((COM_UART << CONTROL1_COMP1SW_SHIFT | \
>>> - COM_UART << CONTROL1_COMP2SW_SHIFT))
>>> -#define CONTROL1_SW_AUX_USB \
>>> - ((COM_AUX_USB << CONTROL1_COMP1SW_SHIFT | \
>>> - COM_AUX_USB << CONTROL1_COMP2SW_SHIFT))
>>> -#define CONTROL1_SW_AUX_UART \
>>> - ((COM_AUX_UART << CONTROL1_COMP1SW_SHIFT | \
>>> - COM_AUX_UART << CONTROL1_COMP2SW_SHIFT))
>>> +#define MAX77843_MUIC_CONTROL1_SW_OPEN \
>>> + ((COM_OPEN << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT | \
>>> + COM_OPEN << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT))
>>> +#define MAX77843_MUIC_CONTROL1_SW_USB \
>>> + ((COM_USB << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT | \
>>> + COM_USB << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT))
>>> +#define MAX77843_MUIC_CONTROL1_SW_AUDIO \
>>> + ((COM_AUDIO << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT | \
>>> + COM_AUDIO << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT))
>>> +#define MAX77843_MUIC_CONTROL1_SW_UART \
>>> + ((COM_UART << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT | \
>>> + COM_UART << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT))
>>> +#define MAX77843_MUIC_CONTROL1_SW_AUX_USB \
>>> + ((COM_AUX_USB << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT | \
>>> + COM_AUX_USB << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT))
>>> +#define MAX77843_MUIC_CONTROL1_SW_AUX_UART \
>>> + ((COM_AUX_UART << MAX77843_MUIC_CONTROL1_COMP1SW_SHIFT | \
>>> + COM_AUX_UART << MAX77843_MUIC_CONTROL1_COMP2SW_SHIFT))
>>
>> You add "MAX77843_MUIC_" prefix but, I think that "MUIC_" prefix is
>> not necessary.
>> You don't add the "MUIC_" prefix on similar patch6.
>
> The MAX77843_MUIC_ prefix is already used in that file, e.g.:
> MAX77843_MUIC_STATUS1_ADC_MASK
>
> Adding only "MAX77843_" makes sense but it would make the file
> inconsistent. Do you want me to add such inconsistent MAX77843_
> prefix?

OK, I understand why you add "MAX77843_MUIC_" prefix unlike the patch6.

Acked-by: Chanwoo Choi <cw00.choi@xxxxxxxxxxx>

Thanks,
Chanwoo Choi

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Next message: Jason A. Donenfeld: "[PATCH v3 0/4] ozwpan: Four remote packet-of-death vulnerabilities"
Previous message: Petr Mladek: "Re: [PATCH 02/10] printk: Try harder to get logbuf_lock on NMI"
In reply to: Krzysztof KozÅowski: "Re: [PATCH v2 7/9] mfd/extcon: max77843: Rename defines to allow inclusion with max77693"
Next in thread: Krzysztof Kozlowski: "[PATCH v2 9/9] regulator: Remove the max77843 driver"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]