efi: sysfb_efi: Reduce number of references to global screen_info

Replace usage of global screen_info with local pointers. This will
later reduce churn when screen_info is being moved.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Richard Lyu <richard.lyu@suse.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/drivers/firmware/efi/sysfb_efi.c b/drivers/firmware/efi/sysfb_efi.c
index aea94a75b575eac73d4419668f51e49b78bc6c85..c074cbccd91bb29c5b8c2deb0ca868f2a1142916 100644 (file)
--- a/drivers/firmware/efi/sysfb_efi.c
+++ b/drivers/firmware/efi/sysfb_efi.c
@@ -92,7 +92,7 @@ void efifb_setup_from_dmi(struct screen_info *si, const char *opt)
        })
 
 #ifdef CONFIG_EFI
-static int __init efifb_set_system(const struct dmi_system_id *id)
+static int __init efifb_set_system(struct screen_info *si, const struct dmi_system_id *id)
 {
        struct efifb_dmi_info *info = id->driver_data;
 
@@ -101,14 +101,14 @@ static int __init efifb_set_system(const struct dmi_system_id *id)
                return 0;
 
        /* Trust the bootloader over the DMI tables */
-       if (screen_info.lfb_base == 0) {
+       if (si->lfb_base == 0) {
 #if defined(CONFIG_PCI)
                struct pci_dev *dev = NULL;
                int found_bar = 0;
 #endif
                if (info->base) {
-                       screen_info.lfb_base = choose_value(info->base,
-                               screen_info.lfb_base, OVERRIDE_BASE,
+                       si->lfb_base = choose_value(info->base,
+                               si->lfb_base, OVERRIDE_BASE,
                                info->flags);
 
 #if defined(CONFIG_PCI)
@@ -135,49 +135,53 @@ static int __init efifb_set_system(const struct dmi_system_id *id)
 
                                        start = pci_resource_start(dev, i);
                                        end = pci_resource_end(dev, i);
-                                       if (screen_info.lfb_base >= start &&
-                                           screen_info.lfb_base < end) {
+                                       if (si->lfb_base >= start && si->lfb_base < end) {
                                                found_bar = 1;
                                                break;
                                        }
                                }
                        }
                        if (!found_bar)
-                               screen_info.lfb_base = 0;
+                               si->lfb_base = 0;
 #endif
                }
        }
-       if (screen_info.lfb_base) {
-               screen_info.lfb_linelength = choose_value(info->stride,
-                       screen_info.lfb_linelength, OVERRIDE_STRIDE,
+       if (si->lfb_base) {
+               si->lfb_linelength = choose_value(info->stride,
+                       si->lfb_linelength, OVERRIDE_STRIDE,
                        info->flags);
-               screen_info.lfb_width = choose_value(info->width,
-                       screen_info.lfb_width, OVERRIDE_WIDTH,
+               si->lfb_width = choose_value(info->width,
+                       si->lfb_width, OVERRIDE_WIDTH,
                        info->flags);
-               screen_info.lfb_height = choose_value(info->height,
-                       screen_info.lfb_height, OVERRIDE_HEIGHT,
+               si->lfb_height = choose_value(info->height,
+                       si->lfb_height, OVERRIDE_HEIGHT,
                        info->flags);
-               if (screen_info.orig_video_isVGA == 0)
-                       screen_info.orig_video_isVGA = VIDEO_TYPE_EFI;
+               if (si->orig_video_isVGA == 0)
+                       si->orig_video_isVGA = VIDEO_TYPE_EFI;
        } else {
-               screen_info.lfb_linelength = 0;
-               screen_info.lfb_width = 0;
-               screen_info.lfb_height = 0;
-               screen_info.orig_video_isVGA = 0;
+               si->lfb_linelength = 0;
+               si->lfb_width = 0;
+               si->lfb_height = 0;
+               si->orig_video_isVGA = 0;
                return 0;
        }
 
        printk(KERN_INFO "efifb: dmi detected %s - framebuffer at 0x%08x "
                         "(%dx%d, stride %d)\n", id->ident,
-                        screen_info.lfb_base, screen_info.lfb_width,
-                        screen_info.lfb_height, screen_info.lfb_linelength);
+                        si->lfb_base, si->lfb_width,
+                        si->lfb_height, si->lfb_linelength);
 
        return 1;
 }
 
+static int __init efifb_set_system_callback(const struct dmi_system_id *id)
+{
+       return efifb_set_system(&screen_info, id);
+}
+
 #define EFIFB_DMI_SYSTEM_ID(vendor, name, enumid)              \
        {                                                       \
-               efifb_set_system,                               \
+               efifb_set_system_callback,                      \
                name,                                           \
                {                                               \
                        DMI_MATCH(DMI_BIOS_VENDOR, vendor),     \
@@ -347,12 +351,13 @@ static const struct dmi_system_id efifb_dmi_swap_width_height[] __initconst = {
        {},
 };
 
-static bool efifb_overlaps_pci_range(const struct of_pci_range *range)
+static bool efifb_overlaps_pci_range(const struct screen_info *si,
+                                    const struct of_pci_range *range)
 {
-       u64 fb_base = screen_info.lfb_base;
+       u64 fb_base = si->lfb_base;
 
-       if (screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE)
-               fb_base |= (u64)(unsigned long)screen_info.ext_lfb_base << 32;
+       if (si->capabilities & VIDEO_CAPABILITY_64BIT_BASE)
+               fb_base |= (u64)(unsigned long)si->ext_lfb_base << 32;
 
        return fb_base >= range->cpu_addr &&
               fb_base < (range->cpu_addr + range->size);
@@ -374,7 +379,7 @@ static struct device_node *find_pci_overlap_node(void)
                }
 
                for_each_of_pci_range(&parser, &range)
-                       if (efifb_overlaps_pci_range(&range))
+                       if (efifb_overlaps_pci_range(&screen_info, &range))
                                return np;
        }
        return NULL;
@@ -412,19 +417,19 @@ static const struct fwnode_operations efifb_fwnode_ops = {
 
 static struct fwnode_handle efifb_fwnode;
 
-__init void sysfb_apply_efi_quirks(void)
+__init void sysfb_apply_efi_quirks(struct screen_info *si)
 {
-       if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI ||
-           !(screen_info.capabilities & VIDEO_CAPABILITY_SKIP_QUIRKS))
+       if (si->orig_video_isVGA != VIDEO_TYPE_EFI ||
+           !(si->capabilities & VIDEO_CAPABILITY_SKIP_QUIRKS))
                dmi_check_system(efifb_dmi_system_table);
 
-       if (screen_info.orig_video_isVGA == VIDEO_TYPE_EFI)
+       if (si->orig_video_isVGA == VIDEO_TYPE_EFI)
                dmi_check_system(efifb_dmi_swap_width_height);
 }
 
-__init void sysfb_set_efifb_fwnode(struct platform_device *pd)
+__init void sysfb_set_efifb_fwnode(const struct screen_info *si, struct platform_device *pd)
 {
-       if (screen_info.orig_video_isVGA == VIDEO_TYPE_EFI && IS_ENABLED(CONFIG_PCI)) {
+       if (si->orig_video_isVGA == VIDEO_TYPE_EFI && IS_ENABLED(CONFIG_PCI)) {
                fwnode_init(&efifb_fwnode, &efifb_fwnode_ops);
                pd->dev.fwnode = &efifb_fwnode;
        }

diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c
index 889e5b05c739ce4141b48bec26172de6fd83db18..916b28538a292b478c82335a9cb3f69541bda2fb 100644 (file)
--- a/drivers/firmware/sysfb.c
+++ b/drivers/firmware/sysfb.c
@@ -155,7 +155,7 @@ static __init int sysfb_init(void)
        if (disabled)
                goto unlock_mutex;
 
-       sysfb_apply_efi_quirks();
+       sysfb_apply_efi_quirks(si);
 
        parent = sysfb_parent_dev(si);
        if (IS_ERR(parent)) {
@@ -200,7 +200,7 @@ static __init int sysfb_init(void)
 
        pd->dev.parent = parent;
 
-       sysfb_set_efifb_fwnode(pd);
+       sysfb_set_efifb_fwnode(si, pd);
 
        ret = platform_device_add_data(pd, si, sizeof(*si));
        if (ret)

diff --git a/drivers/firmware/sysfb_simplefb.c b/drivers/firmware/sysfb_simplefb.c
index 592d8a6446192dbe96f7aefc25123aad1d17b999..71f542e377327eaddedc468bc6690a4fad1afdab 100644 (file)
--- a/drivers/firmware/sysfb_simplefb.c
+++ b/drivers/firmware/sysfb_simplefb.c
@@ -117,7 +117,7 @@ __init struct platform_device *sysfb_create_simplefb(const struct screen_info *s
 
        pd->dev.parent = parent;
 
-       sysfb_set_efifb_fwnode(pd);
+       sysfb_set_efifb_fwnode(si, pd);
 
        ret = platform_device_add_resources(pd, &res, 1);
        if (ret)

diff --git a/include/linux/sysfb.h b/include/linux/sysfb.h
index b449665c686a00293a7fa3bd2c1be938913bf5ff..8527a50a5290eff9fed939963542404f464caa53 100644 (file)
--- a/include/linux/sysfb.h
+++ b/include/linux/sysfb.h
@@ -82,16 +82,17 @@ static inline bool sysfb_handles_screen_info(void)
 #ifdef CONFIG_EFI
 
 extern struct efifb_dmi_info efifb_dmi_list[];
-void sysfb_apply_efi_quirks(void);
-void sysfb_set_efifb_fwnode(struct platform_device *pd);
+void sysfb_apply_efi_quirks(struct screen_info *si);
+void sysfb_set_efifb_fwnode(const struct screen_info *si, struct platform_device *pd);
 
 #else /* CONFIG_EFI */
 
-static inline void sysfb_apply_efi_quirks(void)
+static inline void sysfb_apply_efi_quirks(struct screen_info *si)
 {
 }
 
-static inline void sysfb_set_efifb_fwnode(struct platform_device *pd)
+static inline void sysfb_set_efifb_fwnode(const struct screen_info *si,
+                                         struct platform_device *pd)
 {
 }