mfd: twl6030-irq: Remove unused twl6030_mmc_card_detect*
Subsystems (2)
PATCH 1/1 mfd: twl6030-irq: Remove unused twl6030_mmc_card_detect*
From: "Dr. David Alan Gilbert" <[email protected]>
twl6030_mmc_card_detect() and twl6030_mmc_card_detect_config() have been unused since 2013's
commit b2ff4790612b ("ARM: OMAP2+: Remove legacy omap4_twl6030_hsmmc_init")
Remove them.
--- drivers/mfd/twl6030-irq.c | 74 --------------------------------------- include/linux/mfd/twl.h | 21 ----------- 2 files changed, 95 deletions(-)
drivers/mfd/twl6030-irq.c +0 -74
@@ -256,80 +256,6 @@ int twl6030_interrupt_mask(u8 bit_mask, u8 offset) }EXPORT_SYMBOL (twl6030_interrupt_mask); -int twl6030_mmc_card_detect_config (void ) -{ -int ret; -u8 reg_val =0 ; - -/* Unmasking the Card detect Interrupt line for MMC1 from Phoenix */ -twl6030_interrupt_unmask (TWL6030_MMCDETECT_INT_MASK , -REG_INT_MSK_LINE_B ); -twl6030_interrupt_unmask (TWL6030_MMCDETECT_INT_MASK , -REG_INT_MSK_STS_B ); -/* -* Initially Configuring MMC_CTRL for receiving interrupts & -* Card status on TWL6030 for MMC1 -*/ - ret =twl_i2c_read_u8 (TWL6030_MODULE_ID0 , ®_val,TWL6030_MMCCTRL ); -if (ret <0 ) { -pr_err ("twl6030: Failed to read MMCCTRL, error %d\n" , ret); -return ret; - } - reg_val &= ~VMMC_AUTO_OFF ; - reg_val |=SW_FC ; - ret =twl_i2c_write_u8 (TWL6030_MODULE_ID0 , reg_val,TWL6030_MMCCTRL ); -if (ret <0 ) { -pr_err ("twl6030: Failed to write MMCCTRL, error %d\n" , ret); -return ret; - } - -/* Configuring PullUp-PullDown register */ - ret =twl_i2c_read_u8 (TWL6030_MODULE_ID0 , ®_val, -TWL6030_CFG_INPUT_PUPD3 ); -if (ret <0 ) { -pr_err ("twl6030: Failed to read CFG_INPUT_PUPD3, error %d\n" , - ret); -return ret; - } - reg_val &= ~(MMC_PU |MMC_PD ); - ret =twl_i2c_write_u8 (TWL6030_MODULE_ID0 , reg_val, -TWL6030_CFG_INPUT_PUPD3 ); -if (ret <0 ) { -pr_err ("twl6030: Failed to write CFG_INPUT_PUPD3, error %d\n" , - ret); -return ret; - } - -return irq_find_mapping (twl6030_irq->irq_domain, -MMCDETECT_INTR_OFFSET ); -} -EXPORT_SYMBOL (twl6030_mmc_card_detect_config); - -int twl6030_mmc_card_detect (struct device *dev,int slot) -{ -int ret = -EIO ; -u8 read_reg =0 ; -struct platform_device *pdev =to_platform_device (dev); - -if (pdev->id) { -/* TWL6030 provide's Card detect support for -* only MMC1 controller. -*/ -pr_err ("Unknown MMC controller %d in %s\n" , pdev->id, __func__); -return ret; - } -/* -* BIT0 of MMC_CTRL on TWL6030 provides card status for MMC1 -* 0 - Card not present ,1 - Card present -*/ - ret =twl_i2c_read_u8 (TWL6030_MODULE_ID0 , &read_reg, -TWL6030_MMCCTRL ); -if (ret >=0 ) - ret = read_reg &STS_MMC ; -return ret; -} -EXPORT_SYMBOL (twl6030_mmc_card_detect); -static int twl6030_irq_map (struct irq_domain *d,unsigned int virq,irq_hw_number_t hwirq) {
include/linux/mfd/twl.h +0 -21
@@ -205,27 +205,6 @@ int twl_get_hfclk_rate(void);int twl6030_interrupt_unmask (u8 bit_mask,u8 offset);int twl6030_interrupt_mask (u8 bit_mask,u8 offset); -/* Card detect Configuration for MMC1 Controller on OMAP4 */ -#ifdef CONFIG_TWL4030_CORE -int twl6030_mmc_card_detect_config (void ); -#else -static inline int twl6030_mmc_card_detect_config (void ) -{ -pr_debug ("twl6030_mmc_card_detect_config not supported\n" ); -return 0 ; -} -#endif - -/* MMC1 Controller on OMAP4 uses Phoenix irq for Card detect */ -#ifdef CONFIG_TWL4030_CORE -int twl6030_mmc_card_detect (struct device *dev,int slot); -#else -static inline int twl6030_mmc_card_detect (struct device *dev,int slot) -{ -pr_debug ("Call back twl6030_mmc_card_detect not supported\n" ); -return -EIO ; -} -#endif /*----------------------------------------------------------------------*/ /*
Signature · 1 line
2.49.0
Lee Jones
maintainerQuoted 6 lines · On Sat, 07 Jun 2025, [email protected] wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
twl6030_mmc_card_detect()andtwl6030_mmc_card_detect_config()have been unused since 2013's
commitb2ff4790612b("ARM: OMAP2+: Remove legacyomap4_twl6030_hsmmc_init")
This formatting is driving the little OCD being that lives on my shoulder crazy! I'll fix-up and apply the patch. Bear with.
Quoted 128 lines
Remove them.
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- drivers/mfd/twl6030-irq.c | 74 --------------------------------------- include/linux/mfd/twl.h | 21 ----------- 2 files changed, 95 deletions(-)drivers/mfd/twl6030-irq.c +0
-74@@ -256,80 +256,6 @@ int twl6030_interrupt_mask(u8 bit_mask, u8 offset) }EXPORT_SYMBOL (twl6030_interrupt_mask); -int twl6030_mmc_card_detect_config (void ) -{ -int ret; -u8 reg_val =0 ; - -/* Unmasking the Card detect Interrupt line for MMC1 from Phoenix */ -twl6030_interrupt_unmask (TWL6030_MMCDETECT_INT_MASK , -REG_INT_MSK_LINE_B ); -twl6030_interrupt_unmask (TWL6030_MMCDETECT_INT_MASK , -REG_INT_MSK_STS_B ); -/* -* Initially Configuring MMC_CTRL for receiving interrupts & -* Card status on TWL6030 for MMC1 -*/ - ret =twl_i2c_read_u8 (TWL6030_MODULE_ID0 , ®_val,TWL6030_MMCCTRL ); -if (ret <0 ) { -pr_err ("twl6030: Failed to read MMCCTRL, error %d\n" , ret); -return ret; - } - reg_val &= ~VMMC_AUTO_OFF ; - reg_val |=SW_FC ; - ret =twl_i2c_write_u8 (TWL6030_MODULE_ID0 , reg_val,TWL6030_MMCCTRL ); -if (ret <0 ) { -pr_err ("twl6030: Failed to write MMCCTRL, error %d\n" , ret); -return ret; - } - -/* Configuring PullUp-PullDown register */ - ret =twl_i2c_read_u8 (TWL6030_MODULE_ID0 , ®_val, -TWL6030_CFG_INPUT_PUPD3 ); -if (ret <0 ) { -pr_err ("twl6030: Failed to read CFG_INPUT_PUPD3, error %d\n" , - ret); -return ret; - } - reg_val &= ~(MMC_PU |MMC_PD ); - ret =twl_i2c_write_u8 (TWL6030_MODULE_ID0 , reg_val, -TWL6030_CFG_INPUT_PUPD3 ); -if (ret <0 ) { -pr_err ("twl6030: Failed to write CFG_INPUT_PUPD3, error %d\n" , - ret); -return ret; - } - -return irq_find_mapping (twl6030_irq->irq_domain, -MMCDETECT_INTR_OFFSET ); -} -EXPORT_SYMBOL (twl6030_mmc_card_detect_config); - -int twl6030_mmc_card_detect (struct device *dev,int slot) -{ -int ret = -EIO ; -u8 read_reg =0 ; -struct platform_device *pdev =to_platform_device (dev); - -if (pdev->id) { -/* TWL6030 provide's Card detect support for -* only MMC1 controller. -*/ -pr_err ("Unknown MMC controller %d in %s\n" , pdev->id, __func__); -return ret; - } -/* -* BIT0 of MMC_CTRL on TWL6030 provides card status for MMC1 -* 0 - Card not present ,1 - Card present -*/ - ret =twl_i2c_read_u8 (TWL6030_MODULE_ID0 , &read_reg, -TWL6030_MMCCTRL ); -if (ret >=0 ) - ret = read_reg &STS_MMC ; -return ret; -} -EXPORT_SYMBOL (twl6030_mmc_card_detect); -static int twl6030_irq_map (struct irq_domain *d,unsigned int virq,irq_hw_number_t hwirq) {include/linux/mfd/twl.h +0
-21@@ -205,27 +205,6 @@ int twl_get_hfclk_rate(void);int twl6030_interrupt_unmask (u8 bit_mask,u8 offset);int twl6030_interrupt_mask (u8 bit_mask,u8 offset); -/* Card detect Configuration for MMC1 Controller on OMAP4 */ -#ifdef CONFIG_TWL4030_CORE -int twl6030_mmc_card_detect_config (void ); -#else -static inline int twl6030_mmc_card_detect_config (void ) -{ -pr_debug ("twl6030_mmc_card_detect_config not supported\n" ); -return 0 ; -} -#endif - -/* MMC1 Controller on OMAP4 uses Phoenix irq for Card detect */ -#ifdef CONFIG_TWL4030_CORE -int twl6030_mmc_card_detect (struct device *dev,int slot); -#else -static inline int twl6030_mmc_card_detect (struct device *dev,int slot) -{ -pr_debug ("Call back twl6030_mmc_card_detect not supported\n" ); -return -EIO ; -} -#endif /*----------------------------------------------------------------------*/ /* Signature · 1 line
2.49.0
Signature · 1 line
Lee Jones [李琼斯]
Quoted 11 lines · * Lee Jones ([email protected]) wrote:
Quoted 6 lines · On Sat, 07 Jun 2025, [email protected] wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
twl6030_mmc_card_detect()andtwl6030_mmc_card_detect_config()have been unused since 2013's
commitb2ff4790612b("ARM: OMAP2+: Remove legacyomap4_twl6030_hsmmc_init")This formatting is driving the little OCD being that lives on my shoulder crazy!
Thanks, which bit? I tend to put the commit .... on it's own line, but then checkpatch really doesn't like long lines so I wrap any word that starts after col 75.
Quoted 1 line
I'll fix-up and apply the patch. Bear with.
Thanks!
Dave
Quoted 132 lines
Quoted 129 lines
Remove them.
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- drivers/mfd/twl6030-irq.c | 74 --------------------------------------- include/linux/mfd/twl.h | 21 ----------- 2 files changed, 95 deletions(-)drivers/mfd/twl6030-irq.c +0
-74@@ -256,80 +256,6 @@ int twl6030_interrupt_mask(u8 bit_mask, u8 offset) }EXPORT_SYMBOL (twl6030_interrupt_mask); -int twl6030_mmc_card_detect_config (void ) -{ -int ret; -u8 reg_val =0 ; - -/* Unmasking the Card detect Interrupt line for MMC1 from Phoenix */ -twl6030_interrupt_unmask (TWL6030_MMCDETECT_INT_MASK , -REG_INT_MSK_LINE_B ); -twl6030_interrupt_unmask (TWL6030_MMCDETECT_INT_MASK , -REG_INT_MSK_STS_B ); -/* -* Initially Configuring MMC_CTRL for receiving interrupts & -* Card status on TWL6030 for MMC1 -*/ - ret =twl_i2c_read_u8 (TWL6030_MODULE_ID0 , ®_val,TWL6030_MMCCTRL ); -if (ret <0 ) { -pr_err ("twl6030: Failed to read MMCCTRL, error %d\n" , ret); -return ret; - } - reg_val &= ~VMMC_AUTO_OFF ; - reg_val |=SW_FC ; - ret =twl_i2c_write_u8 (TWL6030_MODULE_ID0 , reg_val,TWL6030_MMCCTRL ); -if (ret <0 ) { -pr_err ("twl6030: Failed to write MMCCTRL, error %d\n" , ret); -return ret; - } - -/* Configuring PullUp-PullDown register */ - ret =twl_i2c_read_u8 (TWL6030_MODULE_ID0 , ®_val, -TWL6030_CFG_INPUT_PUPD3 ); -if (ret <0 ) { -pr_err ("twl6030: Failed to read CFG_INPUT_PUPD3, error %d\n" , - ret); -return ret; - } - reg_val &= ~(MMC_PU |MMC_PD ); - ret =twl_i2c_write_u8 (TWL6030_MODULE_ID0 , reg_val, -TWL6030_CFG_INPUT_PUPD3 ); -if (ret <0 ) { -pr_err ("twl6030: Failed to write CFG_INPUT_PUPD3, error %d\n" , - ret); -return ret; - } - -return irq_find_mapping (twl6030_irq->irq_domain, -MMCDETECT_INTR_OFFSET ); -} -EXPORT_SYMBOL (twl6030_mmc_card_detect_config); - -int twl6030_mmc_card_detect (struct device *dev,int slot) -{ -int ret = -EIO ; -u8 read_reg =0 ; -struct platform_device *pdev =to_platform_device (dev); - -if (pdev->id) { -/* TWL6030 provide's Card detect support for -* only MMC1 controller. -*/ -pr_err ("Unknown MMC controller %d in %s\n" , pdev->id, __func__); -return ret; - } -/* -* BIT0 of MMC_CTRL on TWL6030 provides card status for MMC1 -* 0 - Card not present ,1 - Card present -*/ - ret =twl_i2c_read_u8 (TWL6030_MODULE_ID0 , &read_reg, -TWL6030_MMCCTRL ); -if (ret >=0 ) - ret = read_reg &STS_MMC ; -return ret; -} -EXPORT_SYMBOL (twl6030_mmc_card_detect); -static int twl6030_irq_map (struct irq_domain *d,unsigned int virq,irq_hw_number_t hwirq) {include/linux/mfd/twl.h +0
-21@@ -205,27 +205,6 @@ int twl_get_hfclk_rate(void);int twl6030_interrupt_unmask (u8 bit_mask,u8 offset);int twl6030_interrupt_mask (u8 bit_mask,u8 offset); -/* Card detect Configuration for MMC1 Controller on OMAP4 */ -#ifdef CONFIG_TWL4030_CORE -int twl6030_mmc_card_detect_config (void ); -#else -static inline int twl6030_mmc_card_detect_config (void ) -{ -pr_debug ("twl6030_mmc_card_detect_config not supported\n" ); -return 0 ; -} -#endif - -/* MMC1 Controller on OMAP4 uses Phoenix irq for Card detect */ -#ifdef CONFIG_TWL4030_CORE -int twl6030_mmc_card_detect (struct device *dev,int slot); -#else -static inline int twl6030_mmc_card_detect (struct device *dev,int slot) -{ -pr_debug ("Call back twl6030_mmc_card_detect not supported\n" ); -return -EIO ; -} -#endif /*----------------------------------------------------------------------*/ /* Signature · 1 line
2.49.0Signature · 1 line
Lee Jones [李琼斯]
Signature · 4 lines
-----Open up your eyes, open up your mind, open up your code ------- / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ \ dave @ treblig.org | | In Hex / \ _________________________|_____ http://www.treblig.org |_______/
Lee Jones
maintainerQuoted 10 lines · Dr. David Alan Gilbert
Quoted 9 lines · * Lee Jones ([email protected]) wrote:
Quoted 6 lines · On Sat, 07 Jun 2025, [email protected] wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
twl6030_mmc_card_detect()andtwl6030_mmc_card_detect_config()have been unused since 2013's
commitb2ff4790612b("ARM: OMAP2+: Remove legacyomap4_twl6030_hsmmc_init")
Quoted 6 lines
Quoted 2 lines
This formatting is driving the little OCD being that lives on my shoulder crazy!
Thanks, which bit? I tend to put the commit .... on it's own line, but then checkpatch really doesn't like long lines so I wrap any word that starts after col 75.
No need to put the commit on a new line.
Quoted 3 lines
Quoted 1 line
I'll fix-up and apply the patch. Bear with.
Thanks!
NP
Signature · 1 line
Lee Jones [李琼斯]
Re: (subset) [PATCH] mfd: twl6030-irq: Remove unused twl6030_mmc_card_detect*
In reply to [email protected]Quoted 8 lines · On Sat, 07 Jun 2025 21:22:32 +0100, [email protected] wrote:
twl6030_mmc_card_detect()andtwl6030_mmc_card_detect_config()have been unused since 2013's
commitb2ff4790612b("ARM: OMAP2+: Remove legacyomap4_twl6030_hsmmc_init")Remove them.
[...]
Applied, thanks!
[1/1] mfd: twl6030-irq: Remove unused twl6030_mmc_card_detect*
commit: 3d5341b17ca242fbf1dc78d642c36af0a510c758
--
Lee Jones [李琼斯]