drm/udl: Store active framebuffer in device structure

[linux.git] / drivers / regulator / max14577-regulator.c

diff --git a/drivers/regulator/max14577-regulator.c b/drivers/regulator/max14577-regulator.c
index 85a88a9e4d427c0c383001267875ba0996d0e8bd..07a150c9bbf2281924885bc7d4f41e732480484f 100644 (file)
--- a/drivers/regulator/max14577-regulator.c
+++ b/drivers/regulator/max14577-regulator.c
@@ -155,58 +155,6 @@ static const struct regulator_desc max77836_supported_regulators[] = {
        [MAX77836_LDO2] = MAX77836_LDO_REG(2),
 };
 
-#ifdef CONFIG_OF
-static struct of_regulator_match max14577_regulator_matches[] = {
-       { .name = "SAFEOUT", },
-       { .name = "CHARGER", },
-};
-
-static struct of_regulator_match max77836_regulator_matches[] = {
-       { .name = "SAFEOUT", },
-       { .name = "CHARGER", },
-       { .name = "LDO1", },
-       { .name = "LDO2", },
-};
-
-static inline struct regulator_init_data *match_init_data(int index,
-               enum maxim_device_type dev_type)
-{
-       switch (dev_type) {
-       case MAXIM_DEVICE_TYPE_MAX77836:
-               return max77836_regulator_matches[index].init_data;
-
-       case MAXIM_DEVICE_TYPE_MAX14577:
-       default:
-               return max14577_regulator_matches[index].init_data;
-       }
-}
-
-static inline struct device_node *match_of_node(int index,
-               enum maxim_device_type dev_type)
-{
-       switch (dev_type) {
-       case MAXIM_DEVICE_TYPE_MAX77836:
-               return max77836_regulator_matches[index].of_node;
-
-       case MAXIM_DEVICE_TYPE_MAX14577:
-       default:
-               return max14577_regulator_matches[index].of_node;
-       }
-}
-#else /* CONFIG_OF */
-static inline struct regulator_init_data *match_init_data(int index,
-               enum maxim_device_type dev_type)
-{
-       return NULL;
-}
-
-static inline struct device_node *match_of_node(int index,
-               enum maxim_device_type dev_type)
-{
-       return NULL;
-}
-#endif /* CONFIG_OF */
-
 /**
  * Registers for regulators of max77836 use different I2C slave addresses so
  * different regmaps must be used for them.
@@ -265,9 +213,6 @@ static int max14577_regulator_probe(struct platform_device *pdev)
                if (pdata && pdata->regulators) {
                        config.init_data = pdata->regulators[i].initdata;
                        config.of_node = pdata->regulators[i].of_node;
-               } else {
-                       config.init_data = match_init_data(i, dev_type);
-                       config.of_node = match_of_node(i, dev_type);
                }
                config.regmap = max14577_get_regmap(max14577,
                                supported_regulators[i].id);