Skip to content

Commit

Permalink
mtd: drop of_mtd_parse_partitions()
Browse files Browse the repository at this point in the history
All users have been converted to call of_mtd_parse_partitions through
parse_mtd_partitions() multiplexer. Drop obsolete API.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <dedekind1@gmail.com>
  • Loading branch information
Dmitry Eremin-Solenikov authored and Artem Bityutskiy committed Sep 11, 2011
1 parent 2cd9ea5 commit 628376f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 27 deletions.
20 changes: 9 additions & 11 deletions drivers/mtd/ofpart.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,19 @@ static int parse_ofpart_partitions(struct mtd_info *master,
struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
{
if (!data || !data->of_node)
return 0;

return of_mtd_parse_partitions(NULL, data->of_node, pparts);
}

int of_mtd_parse_partitions(struct device *dev,
struct device_node *node,
struct mtd_partition **pparts)
{
struct device_node *node;
const char *partname;
struct device_node *pp;
int nr_parts, i;


if (!data)
return 0;

node = data->of_node;
if (!node)
return 0;

/* First count the subnodes */
pp = NULL;
nr_parts = 0;
Expand Down Expand Up @@ -87,7 +86,6 @@ int of_mtd_parse_partitions(struct device *dev,

return nr_parts;
}
EXPORT_SYMBOL(of_mtd_parse_partitions);

static struct mtd_part_parser ofpart_parser = {
.owner = THIS_MODULE,
Expand Down
16 changes: 0 additions & 16 deletions include/linux/mtd/partitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,6 @@ extern int parse_mtd_partitions(struct mtd_info *master, const char **types,

#define put_partition_parser(p) do { module_put((p)->owner); } while(0)

struct device;
struct device_node;

#ifdef CONFIG_MTD_OF_PARTS
int of_mtd_parse_partitions(struct device *dev,
struct device_node *node,
struct mtd_partition **pparts);
#else
static inline int of_mtd_parse_partitions(struct device *dev,
struct device_node *node,
struct mtd_partition **pparts)
{
return 0;
}
#endif

int mtd_is_partition(struct mtd_info *mtd);
int mtd_add_partition(struct mtd_info *master, char *name,
long long offset, long long length);
Expand Down

0 comments on commit 628376f

Please sign in to comment.