From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934116AbcIFNGP (ORCPT ); Tue, 6 Sep 2016 09:06:15 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:59953 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933053AbcIFNGN (ORCPT ); Tue, 6 Sep 2016 09:06:13 -0400 From: Arnd Bergmann To: Russell King Cc: Arnd Bergmann , linux-pcmcia@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] pcmcia: soc-common: remove incorrect NO_IRQ use Date: Tue, 6 Sep 2016 15:06:01 +0200 Message-Id: <20160906130617.1725769-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:iaQPgU2dqp5RjImm6JqKUalZie0zcIeFv1uL0UlStQFLSU7OCoh C3hQvVqm5l5iF7NNFCXrWcGx12IaV7KZe4DI3rfa9uS3i3px+eqkNXwVSNQfmic8wqRBjlT tFTEQVHiTgb5IEeJ1EPGdEwruNQvnlTy/f26UNQ4boLjRa6Dw7bbw1WiU80jMB3Us7swDU7 wgjGXjV8Xu4uIv+gPSnkg== X-UI-Out-Filterresults: notjunk:1;V01:K0:4WTf3Dn0dMw=:FwuYcZa5WxdJeYnX7FXaxF KZ7Phzkxkf1wj5HACygBmJf2SzH3fwRWDJlHOONPGXEPoPBn2luw5+OweQkqFywcTz431EvH+ ytoyKQB4NW+C2OBypi+CVdq6dZoLEU3DYAZSchPpGjuC9b/4Hi8Rqyyt4plvNpLeqVSwx84YQ XHEdAI+Z5hEuO1b+rsqFU/3tVON6NCV1Q2PBjs7Dm73PbBJCMYn1q13LUiLSUVWbRW+en1OaU yxc8afUQa3EkLi51Xkafrn7XL1emHlEIemrsfloOJfqYRx/cOLBQyHeHJ39YrIocoraFO9DCX 5o7Jev3XG89vi7igeM1/fQPvOYiVMZVVJgTgCFXtuJzDFRrwSrvAwgP1vda4lj1gHnSLN09iK EwfCCpWM1gG92qX/9ya4jtMn5z4Il/fcSpTUGlb9UE98NdIrPWKcCkPV5f9cEAOp+nBM7OM7w o9oD8pTmcIUr/WhMwBUVgBaUJYb/fCvVEJw/YzW/GnYysfW4hkJjM2t+B2z2sOsTqYrsv8TS8 OzTzmSeYWBHAoRX9nf9eC84cFaZX0dcp1lXkcnGCI6yos3Nx80taqBss6IgQ9t8b+i1INPzZ2 uE+eJl2CvnycUxaAfYVPDWBQeQMKyXVZ5BADVaz4SeUOP3gdxPHqY8yKufRpii7pds35ycGVj nEaJUDxXxiWRx8YuO2AHHLluvqFQlPNsflSQB7AOKrAykyYx1joeqgDxMLCxx8gZFSEc= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The soc_common driver (used on ARM sa1100 and pxa) initializes the socket->pci_irq member to NO_IRQ by default to signify an invalid interrupt, and normally overrides this with a proper interrupt later. However, the code that checks socked->pci_irq for validity compares it to zero instead of NO_IRQ, as most drivers do, so this cannot work right. While zero is a valid interrupt number on PXA (and in the past also on sa1100), it is the interrupt line for the 'ssp' serial port, so there is no possible conflict in practice and we can simply change the default to zero. Signed-off-by: Arnd Bergmann --- drivers/pcmcia/soc_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c index eed5e9c05353..339ce29fa97b 100644 --- a/drivers/pcmcia/soc_common.c +++ b/drivers/pcmcia/soc_common.c @@ -691,7 +691,7 @@ void soc_pcmcia_init_one(struct soc_pcmcia_socket *skt, skt->ops = ops; skt->socket.owner = ops->owner; skt->socket.dev.parent = dev; - skt->socket.pci_irq = NO_IRQ; + skt->socket.pci_irq = 0; for (i = 0; i < ARRAY_SIZE(skt->stat); i++) skt->stat[i].gpio = -EINVAL; -- 2.9.0