| Message ID | 20230522105049.1467313-8-schnelle@linux.ibm.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | None | expand |
On Mon, May 22, 2023 at 12:50:12PM +0200, Niklas Schnelle wrote: > The 104_QUAD_8 counter driver uses devm_ioport_map() without depending > on HAS_IOPORT_MAP. This means the driver is not usable on platforms such > as s390 which do not support I/O port mapping. Add the missing > HAS_IOPORT_MAP dependency to make this explicit. > > Co-developed-by: Arnd Bergmann <arnd@kernel.org> > Signed-off-by: Arnd Bergmann <arnd@kernel.org> > Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> > --- > drivers/counter/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig > index 4228be917038..e65a2bf178b8 100644 > --- a/drivers/counter/Kconfig > +++ b/drivers/counter/Kconfig > @@ -15,6 +15,7 @@ if COUNTER > config 104_QUAD_8 > tristate "ACCES 104-QUAD-8 driver" > depends on (PC104 && X86) || COMPILE_TEST > + depends on HAS_IOPORT_MAP > select ISA_BUS_API > help > Say yes here to build support for the ACCES 104-QUAD-8 quadrature > -- > 2.39.2 > This has a minor merge conflict with the current Kconfig in the Counter tree. Would you rebase on the counter-next branch and resubmit? Thanks, William Breathitt Gray
On Thu, 2023-06-08 at 10:59 -0400, William Breathitt Gray wrote: > On Mon, May 22, 2023 at 12:50:12PM +0200, Niklas Schnelle wrote: > > The 104_QUAD_8 counter driver uses devm_ioport_map() without depending > > on HAS_IOPORT_MAP. This means the driver is not usable on platforms such > > as s390 which do not support I/O port mapping. Add the missing > > HAS_IOPORT_MAP dependency to make this explicit. > > > > Co-developed-by: Arnd Bergmann <arnd@kernel.org> > > Signed-off-by: Arnd Bergmann <arnd@kernel.org> > > Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> > > --- > > drivers/counter/Kconfig | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig > > index 4228be917038..e65a2bf178b8 100644 > > --- a/drivers/counter/Kconfig > > +++ b/drivers/counter/Kconfig > > @@ -15,6 +15,7 @@ if COUNTER > > config 104_QUAD_8 > > tristate "ACCES 104-QUAD-8 driver" > > depends on (PC104 && X86) || COMPILE_TEST > > + depends on HAS_IOPORT_MAP > > select ISA_BUS_API > > help > > Say yes here to build support for the ACCES 104-QUAD-8 quadrature > > -- > > 2.39.2 > > > > This has a minor merge conflict with the current Kconfig in the Counter > tree. Would you rebase on the counter-next branch and resubmit? > > Thanks, > > William Breathitt Gray Sure can do. That said, using a three way merge as below doe handle the conflict correctly: % git checkout counter/counter-next % b4 am -P _ 'https://lore.kernel.org/all/20230522105049.1467313-8-schnelle@linux.ibm.com/' % git am -3 v5_20230522_schnelle_counter_add_has_ioport_map_dependency.mbx
diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig index 4228be917038..e65a2bf178b8 100644 --- a/drivers/counter/Kconfig +++ b/drivers/counter/Kconfig @@ -15,6 +15,7 @@ if COUNTER config 104_QUAD_8 tristate "ACCES 104-QUAD-8 driver" depends on (PC104 && X86) || COMPILE_TEST + depends on HAS_IOPORT_MAP select ISA_BUS_API help Say yes here to build support for the ACCES 104-QUAD-8 quadrature