linux.git/drivers/mtd/devices, branch v3.3-rc2

Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6

2012-01-10T21:45:22+00:00

MTD pull for 3.3

* tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6: (113 commits)
  mtd: Fix dependency for MTD_DOC200x
  mtd: do not use mtd->block_markbad directly
  logfs: do not use 'mtd->block_isbad' directly
  mtd: introduce mtd_can_have_bb helper
  mtd: do not use mtd->suspend and mtd->resume directly
  mtd: do not use mtd->lock, unlock and is_locked directly
  mtd: do not use mtd->sync directly
  mtd: harmonize mtd_writev usage
  mtd: do not use mtd->lock_user_prot_reg directly
  mtd: mtd->write_user_prot_reg directly
  mtd: do not use mtd->read_*_prot_reg directly
  mtd: do not use mtd->get_*_prot_info directly
  mtd: do not use mtd->read_oob directly
  mtd: mtdoops: do not use mtd->panic_write directly
  romfs: do not use mtd->get_unmapped_area directly
  mtd: do not use mtd->get_unmapped_area directly
  mtd: do use mtd->point directly
  mtd: introduce mtd_has_oob helper
  mtd: mtdcore: export symbols cleanup
  mtd: clean-up the default_mtd_writev function
  ...

Fix up trivial edit/remove conflict in drivers/staging/spectra/lld_mtd.c

mtd: Fix dependency for MTD_DOC200x

2012-01-09T18:26:27+00:00

Fix the following build warning:

warning: (MTD_DOC2000 && MTD_DOC2001 && MTD_DOC2001PLUS) selects MTD_NAND_IDS
which has unmet direct dependencies (MTD && MTD_NAND)

Signed-off-by: Fabio Estevam 
Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse

mtd: harmonize mtd_writev usage

2012-01-09T18:26:19+00:00

This patch makes the 'mtd_writev()' function more usable and logical. We first
teach it to fall-back to the 'default_mtd_writev()' function if the MTD driver
does not define its own '->writev()' method. Then we make block2mtd and JFFS2
just 'mtd_writev()' instead of 'default_mtd_writev()' function. This means we
can now stop exporting 'default_mtd_writev()' and instead, export
'mtd_writev()'. This is much cleaner and more logical, as well as allows us to
get read of another direct 'mtd->writev' access in JFFS2.

Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse

mtd: sst25l: kill unused variable

2012-01-09T18:26:01+00:00

Fix the following gcc warning:
drivers/mtd/devices/sst25l.c: In function ‘sst25l_probe’:
drivers/mtd/devices/sst25l.c:381:11: warning: unused variable ‘i’ [-Wunused-variable]

Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse

mtd: doc: do not initialize mtd_info fields to 0 or NULL

2012-01-09T18:25:53+00:00

The 'struct mtd_info' object is allocated with 'kzalloc()', so it
contains only zeroes - no need to initialize various fields to 0 or
NULL.

Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse

mtd: docprobe: use kzalloc instead

2012-01-09T18:25:51+00:00

Instead of calling 'kmalloc()' and them 'memeset(0)', use 'kzalloc()'.

Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse

mtd: docg3: remove unused function

2012-01-09T18:18:51+00:00

As the MTD api has no use for the number of erase cycles
each block has endured, remove the function which calculated
that value.

If one day MTD api finds it usefull for wear levelling
algorithms to have this information, the function should be
put back in place.

Signed-off-by: Robert Jarzmik 
Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse

mtd: docg3: fixes and cleanups

2012-01-09T18:13:05+00:00

This patch takes into account checkpatch, sparse and ECC
comments.

Signed-off-by: Robert Jarzmik 
Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse

mtd: docg3: dereferencing an ERR_PTR() in docg3_probe()

2012-01-09T18:07:32+00:00

If doc_probe_device() returned an ERR_PTR, then we accidentally saved
that to docg3_floors[floor] = mtd; which gets derefenced in the error
handling when we call doc_release_device().

I've reworked the error handling to take care of that and hopefully
make it a little simpler.

Signed-off-by: Dan Carpenter 
Acked-by: Robert Jarzmik 
Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse

mtd: Remove redundant spi driver bus initialization

2012-01-09T18:07:31+00:00

In ancient times it was necessary to manually initialize the bus field of an
spi_driver to spi_bus_type. These days this is done in spi_driver_register(),
so we can drop the manual assignment.

The patch was generated using the following coccinelle semantic patch:
// 
@@
identifier _driver;
@@
struct spi_driver _driver = {
	.driver = {
-		.bus = &spi_bus_type,
	},
};
// 

Signed-off-by: Lars-Peter Clausen 
Signed-off-by: Artem Bityutskiy 
Signed-off-by: David Woodhouse