Commit b33b4407 authored by Florian Fainelli's avatar Florian Fainelli Committed by Ralf Baechle

MIPS: TXX9: use IS_ENABLED() macro

Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3334/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c1d7f41c
...@@ -632,7 +632,7 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr, ...@@ -632,7 +632,7 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr,
unsigned long size, unsigned long size,
const struct physmap_flash_data *pdata) const struct physmap_flash_data *pdata)
{ {
#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) #if IS_ENABLED(CONFIG_MTD_PHYSMAP)
struct resource res = { struct resource res = {
.start = addr, .start = addr,
.end = addr + size - 1, .end = addr + size - 1,
...@@ -670,8 +670,7 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr, ...@@ -670,8 +670,7 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr,
void __init txx9_ndfmc_init(unsigned long baseaddr, void __init txx9_ndfmc_init(unsigned long baseaddr,
const struct txx9ndfmc_platform_data *pdata) const struct txx9ndfmc_platform_data *pdata)
{ {
#if defined(CONFIG_MTD_NAND_TXX9NDFMC) || \ #if IS_ENABLED(CONFIG_MTD_NAND_TXX9NDFMC)
defined(CONFIG_MTD_NAND_TXX9NDFMC_MODULE)
struct resource res = { struct resource res = {
.start = baseaddr, .start = baseaddr,
.end = baseaddr + 0x1000 - 1, .end = baseaddr + 0x1000 - 1,
...@@ -687,7 +686,7 @@ void __init txx9_ndfmc_init(unsigned long baseaddr, ...@@ -687,7 +686,7 @@ void __init txx9_ndfmc_init(unsigned long baseaddr,
#endif #endif
} }
#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) #if IS_ENABLED(CONFIG_LEDS_GPIO)
static DEFINE_SPINLOCK(txx9_iocled_lock); static DEFINE_SPINLOCK(txx9_iocled_lock);
#define TXX9_IOCLED_MAXLEDS 8 #define TXX9_IOCLED_MAXLEDS 8
...@@ -810,7 +809,7 @@ void __init txx9_iocled_init(unsigned long baseaddr, ...@@ -810,7 +809,7 @@ void __init txx9_iocled_init(unsigned long baseaddr,
void __init txx9_dmac_init(int id, unsigned long baseaddr, int irq, void __init txx9_dmac_init(int id, unsigned long baseaddr, int irq,
const struct txx9dmac_platform_data *pdata) const struct txx9dmac_platform_data *pdata)
{ {
#if defined(CONFIG_TXX9_DMAC) || defined(CONFIG_TXX9_DMAC_MODULE) #if IS_ENABLED(CONFIG_TXX9_DMAC)
struct resource res[] = { struct resource res[] = {
{ {
.start = baseaddr, .start = baseaddr,
...@@ -866,8 +865,7 @@ void __init txx9_aclc_init(unsigned long baseaddr, int irq, ...@@ -866,8 +865,7 @@ void __init txx9_aclc_init(unsigned long baseaddr, int irq,
unsigned int dma_chan_out, unsigned int dma_chan_out,
unsigned int dma_chan_in) unsigned int dma_chan_in)
{ {
#if defined(CONFIG_SND_SOC_TXX9ACLC) || \ #if IS_ENABLED(CONFIG_SND_SOC_TXX9ACLC)
defined(CONFIG_SND_SOC_TXX9ACLC_MODULE)
unsigned int dma_base = dmac_id * TXX9_DMA_MAX_NR_CHANNELS; unsigned int dma_base = dmac_id * TXX9_DMA_MAX_NR_CHANNELS;
struct resource res[] = { struct resource res[] = {
{ {
......
...@@ -317,7 +317,7 @@ void __init tx4939_sio_init(unsigned int sclk, unsigned int cts_mask) ...@@ -317,7 +317,7 @@ void __init tx4939_sio_init(unsigned int sclk, unsigned int cts_mask)
} }
} }
#if defined(CONFIG_TC35815) || defined(CONFIG_TC35815_MODULE) #if IS_ENABLED(CONFIG_TC35815)
static u32 tx4939_get_eth_speed(struct net_device *dev) static u32 tx4939_get_eth_speed(struct net_device *dev)
{ {
struct ethtool_cmd cmd; struct ethtool_cmd cmd;
......
...@@ -40,8 +40,7 @@ static void __init rbtx4939_time_init(void) ...@@ -40,8 +40,7 @@ static void __init rbtx4939_time_init(void)
tx4939_time_init(0); tx4939_time_init(0);
} }
#if defined(__BIG_ENDIAN) && \ #if defined(__BIG_ENDIAN) && IS_ENABLED(CONFIG_SMC91X)
(defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE))
#define HAVE_RBTX4939_IOSWAB #define HAVE_RBTX4939_IOSWAB
#define IS_CE1_ADDR(addr) \ #define IS_CE1_ADDR(addr) \
((((unsigned long)(addr) - IO_BASE) & 0xfff00000) == TXX9_CE(1)) ((((unsigned long)(addr) - IO_BASE) & 0xfff00000) == TXX9_CE(1))
...@@ -187,7 +186,7 @@ static void __init rbtx4939_update_ioc_pen(void) ...@@ -187,7 +186,7 @@ static void __init rbtx4939_update_ioc_pen(void)
#define RBTX4939_MAX_7SEGLEDS 8 #define RBTX4939_MAX_7SEGLEDS 8
#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) #if IS_ENABLED(CONFIG_LEDS_CLASS)
static u8 led_val[RBTX4939_MAX_7SEGLEDS]; static u8 led_val[RBTX4939_MAX_7SEGLEDS];
struct rbtx4939_led_data { struct rbtx4939_led_data {
struct led_classdev cdev; struct led_classdev cdev;
...@@ -263,7 +262,7 @@ static inline void rbtx4939_led_setup(void) ...@@ -263,7 +262,7 @@ static inline void rbtx4939_led_setup(void)
static void __rbtx4939_7segled_putc(unsigned int pos, unsigned char val) static void __rbtx4939_7segled_putc(unsigned int pos, unsigned char val)
{ {
#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) #if IS_ENABLED(CONFIG_LEDS_CLASS)
unsigned long flags; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);
/* bit7: reserved for LED class */ /* bit7: reserved for LED class */
...@@ -287,7 +286,7 @@ static void rbtx4939_7segled_putc(unsigned int pos, unsigned char val) ...@@ -287,7 +286,7 @@ static void rbtx4939_7segled_putc(unsigned int pos, unsigned char val)
__rbtx4939_7segled_putc(pos, val); __rbtx4939_7segled_putc(pos, val);
} }
#if defined(CONFIG_MTD_RBTX4939) || defined(CONFIG_MTD_RBTX4939_MODULE) #if IS_ENABLED(CONFIG_MTD_RBTX4939)
/* special mapping for boot rom */ /* special mapping for boot rom */
static unsigned long rbtx4939_flash_fixup_ofs(unsigned long ofs) static unsigned long rbtx4939_flash_fixup_ofs(unsigned long ofs)
{ {
...@@ -463,7 +462,7 @@ static void __init rbtx4939_device_init(void) ...@@ -463,7 +462,7 @@ static void __init rbtx4939_device_init(void)
.flags = SMC91X_USE_16BIT, .flags = SMC91X_USE_16BIT,
}; };
struct platform_device *pdev; struct platform_device *pdev;
#if defined(CONFIG_TC35815) || defined(CONFIG_TC35815_MODULE) #if IS_ENABLED(CONFIG_TC35815)
int i, j; int i, j;
unsigned char ethaddr[2][6]; unsigned char ethaddr[2][6];
u8 bdipsw = readb(rbtx4939_bdipsw_addr) & 0x0f; u8 bdipsw = readb(rbtx4939_bdipsw_addr) & 0x0f;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment