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

Commit 6be55f79 authored by Paul Bolle's avatar Paul Bolle Committed by Artem Bityutskiy
Browse files

mtd: clean up usage of MTD_DOCPROBE_ADDRESS 



Depending on whether MTD_DOCPROBE_ADVANCED is set or not,
MTD_DOCPROBE_ADDRESS will default to either 0x0000 or 0. That should
lead to (basically) identical code in docprobe.c. The current two
defaults should be merged.

And, while we're at it, if MTD_DOCPROBE is set MTD_DOCPROBE_ADDRESS will
always be set. (MTD_DOCPROBE_ADDRESS depends on MTD_DOCPROBE and it has
a default value.) So the check whether CONFIG_MTD_DOCPROBE_ADDRESS is
defined is unnecessary and should be dropped.

Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 123005f3

drivers/mtd/devices/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -278,8 +278,7 @@ config MTD_DOCPROBE_ADVANCED 
config MTD_DOCPROBE_ADDRESS

	hex "Physical address of DiskOnChip" if MTD_DOCPROBE_ADVANCED

	depends on MTD_DOCPROBE

	default "0x0000" if MTD_DOCPROBE_ADVANCED

	default "0" if !MTD_DOCPROBE_ADVANCED

	default "0x0"

	---help---

	  By default, the probe for DiskOnChip devices will look for a

	  DiskOnChip at every multiple of 0x2000 between 0xC8000 and 0xEE000.

drivers/mtd/devices/docprobe.c

+0 −5
Original line number Diff line number Diff line
@@ -50,11 +50,6 @@ 
#include <linux/mtd/nand.h>

#include <linux/mtd/doc2000.h>



/* Where to look for the devices? */

#ifndef CONFIG_MTD_DOCPROBE_ADDRESS

#define CONFIG_MTD_DOCPROBE_ADDRESS 0

#endif





static unsigned long doc_config_location = CONFIG_MTD_DOCPROBE_ADDRESS;

module_param(doc_config_location, ulong, 0);