Merge branch 'gup_flag-cleanups'

[cascardo/linux.git] / drivers / video / fbdev / bfin_adv7393fb.c

diff --git a/drivers/video/fbdev/bfin_adv7393fb.c b/drivers/video/fbdev/bfin_adv7393fb.c
index e2d7d03..542ffad 100644 (file)
--- a/drivers/video/fbdev/bfin_adv7393fb.c
+++ b/drivers/video/fbdev/bfin_adv7393fb.c
@@ -375,7 +375,6 @@ static int bfin_adv7393_fb_probe(struct i2c_client *client,
 {
        int ret = 0;
        struct proc_dir_entry *entry;
-       int num_modes = ARRAY_SIZE(known_modes);
 
        struct adv7393fb_device *fbdev = NULL;
 
@@ -384,7 +383,7 @@ static int bfin_adv7393_fb_probe(struct i2c_client *client,
                return -EINVAL;
        }
 
-       if (mode > num_modes) {
+       if (mode >= ARRAY_SIZE(known_modes)) {
                dev_err(&client->dev, "mode %d: not supported", mode);
                return -EFAULT;
        }
@@ -797,7 +796,7 @@ static struct i2c_driver bfin_adv7393_fb_driver = {
 
 static int __init bfin_adv7393_fb_driver_init(void)
 {
-#if  defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+#if IS_ENABLED(CONFIG_I2C_BLACKFIN_TWI)
        request_module("i2c-bfin-twi");
 #else
        request_module("i2c-gpio");