Commit eea72d5f authored by Jamie Iles's avatar Jamie Iles Committed by David Woodhouse
Browse files

mtd: remove add_mtd_partitions, add_mtd_device and friends 



These symbols are replaced with mtd_device_register() (and removal with
mtd_device_unregister()) for public registration.

Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent ee0e87b1

drivers/mtd/mtdcore.c

+1 −3
Original line number Diff line number Diff line
@@ -723,8 +723,6 @@ void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size) 
	return kmalloc(*size, GFP_KERNEL);

}



EXPORT_SYMBOL_GPL(add_mtd_device);

EXPORT_SYMBOL_GPL(del_mtd_device);

EXPORT_SYMBOL_GPL(get_mtd_device);

EXPORT_SYMBOL_GPL(get_mtd_device_nm);

EXPORT_SYMBOL_GPL(__get_mtd_device);

drivers/mtd/mtdcore.h

+6 −0
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ 
extern struct mutex mtd_table_mutex;

extern struct mtd_info *__mtd_next_device(int i);



extern int add_mtd_device(struct mtd_info *mtd);

extern int del_mtd_device(struct mtd_info *mtd);

extern int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *,

			      int);

extern int del_mtd_partitions(struct mtd_info *);



#define mtd_for_each_device(mtd)			\

	for ((mtd) = __mtd_next_device(0);		\

	     (mtd) != NULL;				\

drivers/mtd/mtdpart.c

+2 −2
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#include <linux/mtd/partitions.h>

#include <linux/err.h>



#include "mtdcore.h"



/* Our partition linked list */

static LIST_HEAD(mtd_partitions);

static DEFINE_MUTEX(mtd_partitions_mutex);
@@ -376,7 +378,6 @@ int del_mtd_partitions(struct mtd_info *master) 


	return err;

}

EXPORT_SYMBOL(del_mtd_partitions);



static struct mtd_part *allocate_partition(struct mtd_info *master,

			const struct mtd_partition *part, int partno,
@@ -671,7 +672,6 @@ int add_mtd_partitions(struct mtd_info *master, 


	return 0;

}

EXPORT_SYMBOL(add_mtd_partitions);



static DEFINE_SPINLOCK(part_parser_lock);

static LIST_HEAD(part_parsers);

include/linux/mtd/mtd.h

+0 −3
Original line number Diff line number Diff line
@@ -322,9 +322,6 @@ static inline uint32_t mtd_mod_by_ws(uint64_t sz, struct mtd_info *mtd) 


	/* Kernel-side ioctl definitions */



extern int add_mtd_device(struct mtd_info *mtd);

extern int del_mtd_device (struct mtd_info *mtd);



struct mtd_partition;



extern int mtd_device_register(struct mtd_info *master,

include/linux/mtd/partitions.h

+0 −9
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ struct mtd_partition { 


struct mtd_info;



int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);

int del_mtd_partitions(struct mtd_info *);



/*

 * Functions dealing with the various ways of partitioning the space

 */
@@ -86,12 +83,6 @@ static inline int of_mtd_parse_partitions(struct device *dev, 
}

#endif



#ifdef CONFIG_MTD_PARTITIONS

static inline int mtd_has_partitions(void) { return 1; }

#else

static inline int mtd_has_partitions(void) { return 0; }

#endif



#ifdef CONFIG_MTD_CMDLINE_PARTS

static inline int mtd_has_cmdlinepart(void) { return 1; }

#else