On Mon, Jun 12, 2017 at 09:24:04AM -0500, Andrew F. Davis wrote:
> On 06/10/2017 07:51 AM, Greg Kroah-Hartman wrote:
> > On Mon, Jun 05, 2017 at 08:52:08AM -0500, Andrew F. Davis wrote:
> >> Like other subsystems we should be able to define slave devices outside
> >> of the w1 directory. To do this we move public facing interface
> >> definitions to include/linux/w1.h and rename the internal definition
> >> file to w1_internal.h.
> >>
> >> As w1_family.h and w1_int.h contained almost entirely public
> >> driver interface definitions we simply removed these files and
> >> moved the remaining definitions into w1_internal.h.
> >>
> >> With this we can now start to move slave devices out of w1/slaves and
> >> into the subsystem based on the function they implement, again like
> >> other drivers.
> >>
> >> Signed-off-by: Andrew F. Davis <afd@xxxxxx>
> >> Reviewed-by: Sebastian Reichel <sre@xxxxxxxxxx>
> >> Acked-by: Evgeniy Polyakov <zbr@xxxxxxxxxxx>
> >> ---
> >> MAINTAINERS | 1 +
> >> drivers/power/supply/ds2760_battery.c | 2 +-
> >> drivers/power/supply/ds2780_battery.c | 2 +-
> >> drivers/power/supply/ds2781_battery.c | 2 +-
> >> drivers/w1/masters/ds1wm.c | 3 +-
> >> drivers/w1/masters/ds2482.c | 3 +-
> >> drivers/w1/masters/ds2490.c | 3 +-
> >> drivers/w1/masters/matrox_w1.c | 3 +-
> >> drivers/w1/masters/mxc_w1.c | 3 +-
> >> drivers/w1/masters/omap_hdq.c | 3 +-
> >> drivers/w1/masters/w1-gpio.c | 3 +-
> >> drivers/w1/slaves/w1_bq27000.c | 6 +-
> >> drivers/w1/slaves/w1_ds2405.c | 5 +-
> >> drivers/w1/slaves/w1_ds2406.c | 6 +-
> >> drivers/w1/slaves/w1_ds2408.c | 6 +-
> >> drivers/w1/slaves/w1_ds2413.c | 6 +-
> >> drivers/w1/slaves/w1_ds2423.c | 6 +-
> >> drivers/w1/slaves/w1_ds2431.c | 6 +-
> >> drivers/w1/slaves/w1_ds2433.c | 6 +-
> >> drivers/w1/slaves/w1_ds2438.c | 5 +-
> >> drivers/w1/slaves/w1_ds2760.c | 7 ++-
> >> drivers/w1/slaves/w1_ds2780.c | 7 ++-
> >> drivers/w1/slaves/w1_ds2781.c | 7 ++-
> >> drivers/w1/slaves/w1_ds28e04.c | 6 +-
> >> drivers/w1/slaves/w1_smem.c | 7 ++-
> >> drivers/w1/slaves/w1_therm.c | 10 ++-
> >> drivers/w1/w1.c | 6 +-
> >> drivers/w1/w1_family.c | 3 +-
> >> drivers/w1/w1_family.h | 98 -----------------------------
> >> drivers/w1/w1_int.c | 3 +-
> >> drivers/w1/w1_int.h | 27 --------
> >> drivers/w1/w1_internal.h | 87 ++++++++++++++++++++++++++
> >> drivers/w1/w1_io.c | 2 +-
> >> drivers/w1/w1_netlink.c | 2 +-
> >> drivers/w1/w1_netlink.h | 2 +-
> >> {drivers/w1 => include/linux}/w1.h | 114 +++++++++++++++-------------------
> >> 36 files changed, 208 insertions(+), 260 deletions(-)
> >> delete mode 100644 drivers/w1/w1_family.h
> >> delete mode 100644 drivers/w1/w1_int.h
> >> create mode 100644 drivers/w1/w1_internal.h
> >> rename {drivers/w1 => include/linux}/w1.h (76%)
> >
> > You forgot to update Documentation/DocBook/w1.tmpl, and now the
> > documentation build breaks :(
> >
> > Can you please send me a patch to fix that up?
>
> It looks like in -next DocBook/w1.tmpl has been converted to
> driver-api/w1.rst, should I just fix up the .rst version, or would you
> also like a patch for your tree to keep it building for now?
Fixing up my tree would be best for now.
We can handle the merge issue if it happens afterward.
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
