Rename macronix_quad_enable() to a generic name: spi_nor_sr1_bit6_quad_enable(). Prepend "spi_nor_" to "sr2_bit7_quad_enable". All SPI NOR generic methods should be prepended by "spi_nor_".
Showing the changes to include/linux (1 of 2 files). Show all
Unified · Split
| @@ -133,7 +133,7 @@ · 132 unmodified lines | |||
| 133 | #define SR_E_ERR BIT(5) | 133 | #define SR_E_ERR BIT(5) |
| 134 | #define SR_P_ERR BIT(6) | 134 | #define SR_P_ERR BIT(6) |
| 135 | 135 | ||
| 136 | #define SR_QUAD_EN_MX BIT(6) /* Macronix Quad I/O */ | 136 | #define SR1_QUAD_EN_BIT6 BIT(6) |
| 137 | 137 | ||
| 138 | /* Enhanced Volatile Configuration Register bits */ | 138 | /* Enhanced Volatile Configuration Register bits */ |
| 139 | #define EVCR_QUAD_EN_MICRON BIT(7) /* Micron Quad I/O */ | 139 | #define EVCR_QUAD_EN_MICRON BIT(7) /* Micron Quad I/O */ |