Skip to contentSkip to conversation

ARM: davinci: remove checks for CONFIG_USB_MUSB_PERIPHERAL

PATCH In review Paul Bolle 3 participants 3 messages May 15, 2014

Subsystems (3)
Arm (32-bit) Arm sub-architectures TI DaVinci machine support
lore
Share & tools
lore

Paul Bolle

author
#0 lore raw

PATCH 1/1 ARM: davinci: remove checks for CONFIG_USB_MUSB_PERIPHERAL

The Kconfig symbol USB_MUSB_PERIPHERAL was removed in v3.1. The last two checks for its macro now always evaluate to false. So remove these checks.

Signed-off-by Paul Bolle <[email protected]>

---
Eyeball tested only.

This is just a straightforward cleanup. It does remove a comment. Is that comment still useful? Anyhow, I do wonder whether a proper fix is possible here. Perhaps Greg or Felipe knows: it is their commit 622859634a66 ("usb: musb: drop a gigantic amount of ifdeferry") that removed USB_MUSB_PERIPHERAL. On the other hand I noticed that config USB_MUSB_DAVINCI depends on BROKEN. So maybe properly fixing just this small problem doesn't buy us much.

 arch/arm/mach-davinci/board-dm355-evm.c     | 4 ----
 arch/arm/mach-davinci/board-dm355-leopard.c | 4 ----
 2 files changed, 8 deletions(-)
arch/arm/mach-davinci/board-dm355-evm.c +0 -4
index ecdc7d44fa70..06d63d5651f3 100644
@@ -350,11 +350,7 @@ static struct davinci_mmc_config dm355evm_mmc_config = {
  * you have proper Mini-B or Mini-A cables (or Mini-A adapters)
  * the ID pin won't need any help.
  */
-#ifdef CONFIG_USB_MUSB_PERIPHERAL
-#define USB_ID_VALUE	0	/* ID pulled high; *should* float */
-#else
 #define USB_ID_VALUE	1	/* ID pulled low */
-#endif
 
 static struct spi_eeprom at25640a = {
 	.byte_len	= SZ_64K / 8,
arch/arm/mach-davinci/board-dm355-leopard.c +0 -4
index 43bacbf15314..680a7a2d9102 100644
@@ -208,11 +208,7 @@ static struct davinci_mmc_config dm355leopard_mmc_config = {
  * you have proper Mini-B or Mini-A cables (or Mini-A adapters)
  * the ID pin won't need any help.
  */
-#ifdef CONFIG_USB_MUSB_PERIPHERAL
-#define USB_ID_VALUE	0	/* ID pulled high; *should* float */
-#else
 #define USB_ID_VALUE	1	/* ID pulled low */
-#endif
 
 static struct spi_eeprom at25640a = {
 	.byte_len	= SZ_64K / 8,
Signature · 1 line
1.9.0
#1 lore raw
Quoted 8 lines · Paul Bolle

The Kconfig symbol USB_MUSB_PERIPHERAL was removed in v3.1. The last two checks for its macro now always evaluate to false. So remove these checks.

Signed-off-by Paul Bolle <[email protected]>

---
Eyeball tested only.

Quoted 7 lines

This is just a straightforward cleanup. It does remove a comment. Is that comment still useful? Anyhow, I do wonder whether a proper fix is possible here. Perhaps Greg or Felipe knows: it is their commit 622859634a66 ("usb: musb: drop a gigantic amount of ifdeferry") that removed USB_MUSB_PERIPHERAL. On the other hand I noticed that config USB_MUSB_DAVINCI depends on BROKEN. So maybe properly fixing just this small problem doesn't buy us much.

Yes, it doesn't buy us much. I will still apply this anyway. The next person can save time spent searching for non-existing symbols.

Thanks,
Sekhar

Acked-by on v1 1/1
#2 lore raw
In reply to Paul Bolle
Quoted 5 lines · Paul Bolle

The Kconfig symbol USB_MUSB_PERIPHERAL was removed in v3.1. The last two checks for its macro now always evaluate to false. So remove these checks.

Signed-off-by Paul Bolle <[email protected]>
Acked-by Felipe Balbi <[email protected]>
Quoted 50 lines

---
Eyeball tested only.

This is just a straightforward cleanup. It does remove a comment. Is that comment still useful? Anyhow, I do wonder whether a proper fix is possible here. Perhaps Greg or Felipe knows: it is their commit 622859634a66 ("usb: musb: drop a gigantic amount of ifdeferry") that removed USB_MUSB_PERIPHERAL. On the other hand I noticed that config USB_MUSB_DAVINCI depends on BROKEN. So maybe properly fixing just this small problem doesn't buy us much.

 arch/arm/mach-davinci/board-dm355-evm.c     | 4 ----
 arch/arm/mach-davinci/board-dm355-leopard.c | 4 ----
 2 files changed, 8 deletions(-)
arch/arm/mach-davinci/board-dm355-evm.c +0 -4
index ecdc7d44fa70..06d63d5651f3 100644
@@ -350,11 +350,7 @@ static struct davinci_mmc_config dm355evm_mmc_config = {
  * you have proper Mini-B or Mini-A cables (or Mini-A adapters)
  * the ID pin won't need any help.
  */
-#ifdef CONFIG_USB_MUSB_PERIPHERAL
-#define USB_ID_VALUE	0	/* ID pulled high; *should* float */
-#else
 #define USB_ID_VALUE	1	/* ID pulled low */
-#endif
 
 static struct spi_eeprom at25640a = {
 	.byte_len	= SZ_64K / 8,
arch/arm/mach-davinci/board-dm355-leopard.c +0 -4
index 43bacbf15314..680a7a2d9102 100644
@@ -208,11 +208,7 @@ static struct davinci_mmc_config dm355leopard_mmc_config = {
  * you have proper Mini-B or Mini-A cables (or Mini-A adapters)
  * the ID pin won't need any help.
  */
-#ifdef CONFIG_USB_MUSB_PERIPHERAL
-#define USB_ID_VALUE	0	/* ID pulled high; *should* float */
-#else
 #define USB_ID_VALUE	1	/* ID pulled low */
-#endif
 
 static struct spi_eeprom at25640a = {
 	.byte_len	= SZ_64K / 8,
Signature · 1 line
1.9.0
Signature · 8 lines
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140515/6dd2fd70/attachment.sig>