Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a33eb6b9 authored by Jörn Engel's avatar Jörn Engel Committed by Jens Axboe
Browse files

Move mtd_bdi_*mappable to mtdcore.c 



Removes one .h and one .c file that are never used outside of
mtdcore.c.

Signed-off-by: default avatarJoern Engel <joern@logfs.org>

Edited to remove on leftover debug define.
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent e6d086d8

drivers/mtd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


# Core functionality.

obj-$(CONFIG_MTD)		+= mtd.o

mtd-y				:= mtdcore.o mtdsuper.o mtdbdi.o

mtd-y				:= mtdcore.o mtdsuper.o

mtd-$(CONFIG_MTD_PARTITIONS)	+= mtdpart.o



obj-$(CONFIG_MTD_CONCAT)	+= mtdconcat.o

drivers/mtd/internal.h

+0 −17
Original line number Diff line number Diff line 
/* Internal MTD definitions

 *

 * Copyright © 2006 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



/*

 * mtdbdi.c

 */

extern struct backing_dev_info mtd_bdi_unmappable;

extern struct backing_dev_info mtd_bdi_ro_mappable;

extern struct backing_dev_info mtd_bdi_rw_mappable;

drivers/mtd/mtdbdi.c

+0 −43
Original line number Diff line number Diff line 
/* MTD backing device capabilities

 *

 * Copyright © 2006 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */



#include <linux/backing-dev.h>

#include <linux/mtd/mtd.h>

#include "internal.h"



/*

 * backing device capabilities for non-mappable devices (such as NAND flash)

 * - permits private mappings, copies are taken of the data

 */

struct backing_dev_info mtd_bdi_unmappable = {

	.capabilities	= BDI_CAP_MAP_COPY,

};



/*

 * backing device capabilities for R/O mappable devices (such as ROM)

 * - permits private mappings, copies are taken of the data

 * - permits non-writable shared mappings

 */

struct backing_dev_info mtd_bdi_ro_mappable = {

	.capabilities	= (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT |

			   BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP),

};



/*

 * backing device capabilities for writable mappable devices (such as RAM)

 * - permits private mappings, copies are taken of the data

 * - permits non-writable shared mappings

 */

struct backing_dev_info mtd_bdi_rw_mappable = {

	.capabilities	= (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT |

			   BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP |

			   BDI_CAP_WRITE_MAP),

};

drivers/mtd/mtdcore.c

+32 −1
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
 * Core registration and callback routines for MTD

 * drivers and users.

 *

 * bdi bits are:

 * Copyright © 2006 Red Hat, Inc. All Rights Reserved.

 * Written by David Howells (dhowells@redhat.com)

 */



#include <linux/module.h>
@@ -16,11 +19,39 @@ 
#include <linux/init.h>

#include <linux/mtd/compatmac.h>

#include <linux/proc_fs.h>

#include <linux/backing-dev.h>



#include <linux/mtd/mtd.h>

#include "internal.h"



#include "mtdcore.h"

/*

 * backing device capabilities for non-mappable devices (such as NAND flash)

 * - permits private mappings, copies are taken of the data

 */

struct backing_dev_info mtd_bdi_unmappable = {

	.capabilities	= BDI_CAP_MAP_COPY,

};



/*

 * backing device capabilities for R/O mappable devices (such as ROM)

 * - permits private mappings, copies are taken of the data

 * - permits non-writable shared mappings

 */

struct backing_dev_info mtd_bdi_ro_mappable = {

	.capabilities	= (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT |

			   BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP),

};



/*

 * backing device capabilities for writable mappable devices (such as RAM)

 * - permits private mappings, copies are taken of the data

 * - permits non-writable shared mappings

 */

struct backing_dev_info mtd_bdi_rw_mappable = {

	.capabilities	= (BDI_CAP_MAP_COPY | BDI_CAP_MAP_DIRECT |

			   BDI_CAP_EXEC_MAP | BDI_CAP_READ_MAP |

			   BDI_CAP_WRITE_MAP),

};



static int mtd_cls_suspend(struct device *dev, pm_message_t state);

static int mtd_cls_resume(struct device *dev);