atppc_acpi.c change breaks amd64 build

["John D. Baker" <jdbaker%consolidated.net@localhost>]

Recently "atppc_acpi.c" was changed in this commit:

  https://mail-index.netbsd.org/source-changes/2020/12/07/msg124923.html

The Log Message reads:

  Fix 32-bit build.

but it seems to have broken 64-bit builds (at least my amd64 kernels
with atppc_acpi/ppb/etc.).

Failure is as follows:

[...]
--- atppc_acpi.o ---
#   compile  PLEX760/atppc_acpi.o
/r0/build/current/tools/amd64/bin/x86_64--netbsd-gcc -mcmodel=kernel -mno-red-zone -mno-mmx -mno-sse -mno-avx -msoft-float -mindirect-branch=thunk -mindirect-branch-register -ffreestanding -fno-zero-initialized-in-bss -fno-delete-null-pointer-checks -g -O2 -fno-omit-frame-pointer -fstack-protector -Wstack-protector --param ssp-buffer-size=1 -fstack-usage -Wstack-usage=3584 -fno-strict-aliasing -fno-common -std=gnu99 -Werror -Wall -Wno-main -Wno-format-zero-length -Wpointer-arith -Wmissing-prototypes -Wstrict-prototypes -Wold-style-definition -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -Wno-unreachable-code -Wno-pointer-sign -Wno-attributes -Wextra -Wno-unused-parameter -Wold-style-definition -Wno-sign-compare -Walloca -Wno-error=address-of-packed-member --sysroot=/r0/build/current/DEST/amd64 -Damd64 -Dx86_64 -I. -I/x/current/src/sys/external/mit/xen-include-public/dist/ -I/x/current/src/sys/external/bsd/acpica/dist -I/x/current/src/sys/external/bsd/libnv/dist -I/x/current/src/sys/../common/lib/libx86emu -I/x/current/src/sys/../common/lib/libc/misc -I/x/current/src/sys/../common/include -I/x/current/src/sys/arch -I/x/current/src/sys -nostdinc -DCOMPAT_UTILS -D__XEN_INTERFACE_VERSION__=0x3020a -DDIAGNOSTIC -DCOMPAT_44 -DDISKLABEL_EI -D_KERNEL -D_KERNEL_OPT -std=gnu99 -I/x/current/src/sys/lib/libkern/../../../common/lib/libc/quad -I/x/current/src/sys/lib/libkern/../../../common/lib/libc/string -I/x/current/src/sys/lib/libkern/../../../common/lib/libc/arch/x86_64/string -I/x/current/src/sys/lib/libkern/../../../common/lib/libc/hash/sha3 -D_FORTIFY_SOURCE=2 -I/x/current/src/sys/dist/pf -I/x/current/src/sys/external/bsd/common/include -I/x/current/src/sys/external/bsd/common/include -I/x/current/src/sys/external/bsd/drm2/include -I/x/current/src/sys/external/bsd/drm2/include -I/x/current/src/sys/external/bsd/common/include -I/x/current/src/sys/external/bsd/drm2/dist/include -I/x/current/src/sys/external/bsd/drm2/dist/include/drm -I/x/current/src/sys/external/bsd/drm2/dist/uapi -I/x/current/src/sys/external/bsd/drm2/dist -D__KERNEL__ -DCONFIG_BACKLIGHT_CLASS_DEVICE=0 -DCONFIG_BACKLIGHT_CLASS_DEVICE_MODULE=0 -DCONFIG_DRM_FBDEV_EMULATION=1 -DCONFIG_FB=0 -I/x/current/src/sys/external/bsd/drm2/i915drm -I/x/current/src/sys/external/bsd/drm2/dist/drm/i915 -DCONFIG_DRM_I915_FBDEV=1 -DCONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT=0 -DCONFIG_DRM_FBDEV_EMULATION=1 -I/x/current/src/sys/external/bsd/acpica/dist/include -c /x/current/src/sys/dev/acpi/atppc_acpi.c -o atppc_acpi.o
/x/current/src/sys/dev/acpi/atppc_acpi.c: In function 'atppc_acpi_attach':
/x/current/src/sys/dev/acpi/atppc_acpi.c:143:15: error: implicit declaration of function 'acpi_intr_establish'; did you mean 'pci_intr_establish'? [-Werror=implicit-function-declaration]
  143 |  sc->sc_ieh = acpi_intr_establish(self,
      |               ^~~~~~~~~~~~~~~~~~~
      |               pci_intr_establish
/x/current/src/sys/dev/acpi/atppc_acpi.c:145:37: error: expected ')' before 'device_xname'
  145 |      IPL_TTY, false, atppcintr, self device_xname(self));
      |                                     ^~~~~~~~~~~~~
      |                                     )
/x/current/src/sys/dev/acpi/atppc_acpi.c:143:13: error: assignment to 'void *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
  143 |  sc->sc_ieh = acpi_intr_establish(self,
      |             ^
cc1: all warnings being treated as errors
*** [atppc_acpi.o] Error code 1

nbmake: stopped in /r0/build/current/obj/amd64/sys/arch/amd64/compile/PLEX760
--- atppc.o ---
/r0/build/current/tools/amd64/bin/nbctfconvert -g -L VERSION -g atppc.o
1 error

nbmake: stopped in /r0/build/current/obj/amd64/sys/arch/amd64/compile/PLEX760

ERROR: Failed to make all in "/r0/build/current/obj/amd64/sys/arch/amd64/compile/PLEX760"
*** BUILD ABORTED ***


build for 32-bit (i386) soon-ish to see if there is a problem.

Prior to this change, all of my atppc_acpi-enabled kernels built without
issue, both amd64 and i386.

-- 
|/"\ John D. Baker, KN5UKS               NetBSD     Darwin/MacOS X
|\ / jdbaker[snail]consolidated[flyspeck]net  OpenBSD            FreeBSD
| X  No HTML/proprietary data in email.   BSD just sits there and works!
|/ \ GPGkeyID:  D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645