Wall-mediated self-diffusion in slit and cylindrical pores