From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759560AbcINDBT (ORCPT ); Tue, 13 Sep 2016 23:01:19 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:36441 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758378AbcINDAc (ORCPT ); Tue, 13 Sep 2016 23:00:32 -0400 From: Peng Sun To: liodot@gmail.com, charrer@alacritech.com, gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Peng Sun Subject: [PATCH 09/10] staging: slicoss: slicoss.c: fix different address space sparse warning Date: Tue, 13 Sep 2016 19:59:58 -0700 Message-Id: <0076480d23a4ca406bddd98a58fc024a4c7ed370.1473821899.git.sironhide0null@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: <679c2fd03a90ca7104b081ed8c2f6dd68fb43eb7.1473821899.git.sironhide0null@gmail.com> References: <2fdea4da0036cd13aa0879ffcf86e3303013d52a.1473821899.git.sironhide0null@gmail.com> <2fcefc8b7d4b917dc6dfa32238e47c266428ade0.1473821899.git.sironhide0null@gmail.com> <974f8bea8404695a9440f19b3812300f0ded32b5.1473821899.git.sironhide0null@gmail.com> <62de4cf8ac3f837d2828cbee3b075b9cbe102bcd.1473821899.git.sironhide0null@gmail.com> <73f5aeb587e505b0b81da8a8b86cd130670310e2.1473821899.git.sironhide0null@gmail.com> <60988e18e9bd12fb0aae73ef885495c95b5f9eb8.1473821899.git.sironhide0null@gmail.com> <679c2fd03a90ca7104b081ed8c2f6dd68fb43eb7.1473821899.git.sironhide0null@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Peng Sun --- drivers/staging/slicoss/slicoss.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index a2d9c77..6ecf71c 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -2230,7 +2230,7 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags) struct sliccard *card = adapter->card; struct net_device *dev = adapter->netdev; struct slic_shmemory *sm = &adapter->shmem; - struct slic_shmem_data *sm_data = sm->shmem_data; + struct slic_shmem_data __iomem *sm_data = sm->shmem_data; int rc; /* adapter should be down at this point */ @@ -2314,7 +2314,7 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags) /* * clear any pending events, then enable interrupts */ - sm_data->isr = 0; + IOMEM_SET_FIELD32(0, sm_data, isr); slic_write32(adapter, SLIC_REG_ISR, 0); slic_write32(adapter, SLIC_REG_ICR, ICR_INT_ON); @@ -2603,7 +2603,7 @@ static void slic_config_pci(struct pci_dev *pcidev) static int slic_card_init(struct sliccard *card, struct adapter *adapter) { struct slic_shmemory *sm = &adapter->shmem; - struct slic_shmem_data *sm_data = sm->shmem_data; + struct slic_shmem_data __iomem *sm_data = sm->shmem_data; struct slic_eeprom *peeprom; struct oslic_eeprom *pOeeprom; dma_addr_t phys_config; @@ -2666,9 +2666,9 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter) } for (;;) { - if (sm_data->isr) { - if (sm_data->isr & ISR_UPC) { - sm_data->isr = 0; + if (IOMEM_GET_FIELD32(sm_data, isr)) { + if (IOMEM_GET_FIELD32(sm_data, isr) & ISR_UPC) { + IOMEM_SET_FIELD32(0, sm_data, isr); slic_write64(adapter, SLIC_REG_ISP, 0, 0); slic_write32(adapter, SLIC_REG_ISR, 0); @@ -2678,7 +2678,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter) break; } - sm_data->isr = 0; + IOMEM_SET_FIELD32(0, sm_data, isr); slic_write32(adapter, SLIC_REG_ISR, 0); slic_flush_write(adapter); } else { -- 2.7.4