target/linux/brcm63xx/patches-4.4/000-4.5-10-mtd-ofpart-drop-of_node-partition-parser-data.patch

   1 From e270bca531b40cd0a143176eb093d173b9c6f418 Mon Sep 17 00:00:00 2001
   2 From: Brian Norris <computersforpeace@gmail.com>
   3 Date: Fri, 30 Oct 2015 20:33:29 -0700
   4 Subject: [PATCH 10/11] mtd: ofpart: drop 'of_node' partition parser data
   5
   6 This field is no longer used anywhere, as it is superseded by
   7 mtd->dev.of_node.
   8
   9 Signed-off-by: Brian Norris <computersforpeace@gmail.com>
  10 Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
  11 ---
  12  drivers/mtd/ofpart.c           | 14 ++++----------
  13  include/linux/mtd/partitions.h |  4 ----
  14  2 files changed, 4 insertions(+), 14 deletions(-)
  15
  16 --- a/drivers/mtd/ofpart.c
  17 +++ b/drivers/mtd/ofpart.c
  18 @@ -37,11 +37,8 @@ static int parse_ofpart_partitions(struc
  19         bool dedicated = true;
  20
  21
  22 -       /*
  23 -        * of_node can be provided through auxiliary parser data or (preferred)
  24 -        * by assigning the master device node
  25 -        */
  26 -       mtd_node = data && data->of_node ? data->of_node : mtd_get_of_node(master);
  27 +       /* Pull of_node from the master device node */
  28 +       mtd_node = mtd_get_of_node(master);
  29         if (!mtd_node)
  30                 return 0;
  31
  32 @@ -158,11 +155,8 @@ static int parse_ofoldpart_partitions(st
  33         } *part;
  34         const char *names;
  35
  36 -       /*
  37 -        * of_node can be provided through auxiliary parser data or (preferred)
  38 -        * by assigning the master device node
  39 -        */
  40 -       dp = data && data->of_node ? data->of_node : mtd_get_of_node(master);
  41 +       /* Pull of_node from the master device node */
  42 +       dp = mtd_get_of_node(master);
  43         if (!dp)
  44                 return 0;
  45
  46 --- a/include/linux/mtd/partitions.h
  47 +++ b/include/linux/mtd/partitions.h
  48 @@ -56,13 +56,9 @@ struct device_node;
  49  /**
  50   * struct mtd_part_parser_data - used to pass data to MTD partition parsers.
  51   * @origin: for RedBoot, start address of MTD device
  52 - * @of_node: for OF parsers, device node containing partitioning information.
  53 - *           This field is deprecated, as the device node should simply be
  54 - *           assigned to the master struct device.
  55   */
  56  struct mtd_part_parser_data {
  57         unsigned long origin;
  58 -       struct device_node *of_node;
  59  };
  60
  61