]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
pcmcia: journada720: use sa1100 pin interfaces correctly
authorArnd Bergmann <arnd@arndb.de>
Thu, 5 Jun 2014 21:05:47 +0000 (23:05 +0200)
committerJiri Slaby <jslaby@suse.cz>
Wed, 19 Nov 2014 22:27:38 +0000 (23:27 +0100)
commitbd66de1b39f7694430862d9637475439be571d62
treea431d87cd6fe3b0380754ec1cd7e6a0fe3e679f4
parent2948ce57731969aa662e0192d2df0749f1f21462
pcmcia: journada720: use sa1100 pin interfaces correctly

commit 58409f9d21a9d372e35857b5b8aaf334997b127b upstream.

commit dabd14684bc2 "PCMCIA: sa1111: remove duplicated initializers"
incorrectly moved some code into the pcmcia_jornada720_init, causing
a few build errors, and for unknown reasons, the driver lacks
an inclusion of <linux/io.h>, so we get the build errors, and more:

sa1111_jornada720.c: In function 'pcmcia_jornada720_init':
sa1111_jornada720.c:101:3: error: implicit declaration of function 'IOMEM' [-Werror=implicit-function-declaration]
   GRER |= 0x00000002;
   ^
sa1111_jornada720.c:104:3: warning: passing argument 1 of 'sa1111_set_io_dir' from incompatible pointer type [enabled by default]
   sa1111_set_io_dir(dev, pin, 0, 0);
   ^

This patch uses the SA1111_DEV() to convert the dev pointer to the
correct type before passing it and adds the missing include.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Cc: linux-pcmcia@lists.infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/pcmcia/sa1111_jornada720.c