| Message ID | 1425418844-25177-3-git-send-email-fransklaver@gmail.com |
|---|---|
| State | Accepted |
| Commit | 6b44d910ae7de5316fcf1fc828ff4a8d48cac5e2 |
| Headers | show |
On Tue, Mar 3, 2015 at 10:39 PM, Frans Klaver <fransklaver@gmail.com> wrote: > If a parent device is set, add_mtd_device() has enough knowledge to fill > in some sane default values for the module name and owner. Do so if they > aren't already set. > > Signed-off-by: Frans Klaver <fransklaver@gmail.com> > --- > drivers/mtd/mtdcore.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c > index 2093676..487e467 100644 > --- a/drivers/mtd/mtdcore.c > +++ b/drivers/mtd/mtdcore.c > @@ -412,6 +412,15 @@ int add_mtd_device(struct mtd_info *mtd) > mtd->erasesize_mask = (1 << mtd->erasesize_shift) - 1; > mtd->writesize_mask = (1 << mtd->writesize_shift) - 1; > > + if (mtd->dev.parent) { > + if (!mtd->owner) > + mtd->owner = mtd->dev.parent->driver->owner; Turns out that driver pointer is not guaranteed to be set. I don't have the overview on whether this is something that only occurs with nandsim, or whether it is possible to have an actual device without a driver. It is of course easy to prevent the NULL dereference, but that does mean the requirement for owner becomes slightly more complex than "only necessary if you don't have a parent device". Unless someone has objections, I'll probably resend the series with this bit looking more like + if (mtd->dev.parent) { + if (!mtd->owner && mtd->dev.parent->driver) + mtd->owner = ... Nandsim seems to not have any issues with this.The drivers I've changed to rely on this seem to all have driver set. Thanks, Frans
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 2093676..487e467 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -412,6 +412,15 @@ int add_mtd_device(struct mtd_info *mtd) mtd->erasesize_mask = (1 << mtd->erasesize_shift) - 1; mtd->writesize_mask = (1 << mtd->writesize_shift) - 1; + if (mtd->dev.parent) { + if (!mtd->owner) + mtd->owner = mtd->dev.parent->driver->owner; + if (!mtd->name) + mtd->name = dev_name(mtd->dev.parent); + } else { + pr_debug("mtd device won't show a device entry in sysfs\n"); + } + /* Some chips always power up locked. Unlock them now */ if ((mtd->flags & MTD_WRITEABLE) && (mtd->flags & MTD_POWERUP_LOCK)) { error = mtd_unlock(mtd, 0, mtd->size);
If a parent device is set, add_mtd_device() has enough knowledge to fill in some sane default values for the module name and owner. Do so if they aren't already set. Signed-off-by: Frans Klaver <fransklaver@gmail.com> --- drivers/mtd/mtdcore.c | 9 +++++++++ 1 file changed, 9 insertions(+)