Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1482899
| Path | csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Peng Sun <sironhide0null@gmail.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 09/10] staging: slicoss: slicoss.c: fix different address space sparse warning |
| Date | Wed, 14 Sep 2016 05:10:01 +0200 |
| Message-ID | <sh8Kd-2KP-25@gated-at.bofh.it> (permalink) |
| References | <sh8Kd-2KP-5@gated-at.bofh.it> |
| X-Original-To | liodot@gmail.com, charrer@alacritech.com, gregkh@linuxfoundation.org |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=ZKeZ+7lQlorCmSXw9mGkMLHg+At+nqb6TRxh3i/DMRo=; b=XVUiufGgmNVpNAWGGgXv8Mc+Yk5xBo2TIeJFj6hicWZzmL/ypl2r5aKCRcfXpdt5b1 0fZn3tafpD3WBvzqIJujMOxdv/Rs1pFqyhj0lsEbvCMRuvOIvMqCwT2XMLb+a/gDTira nkQOyj9zwEDQjVRDaYaZI4Hni1K8/zR8SQPqrEPo3wN2IRt+tvihjqIdDTta0Lp+FuAO LSd+rswRJUB+zI+X1KrjLfRWQeEvKuyNvJtz7N/6yNETUCXGH1HH75ancXd6YjpEGMXB K/5tYRPX9kyDwBMRHh5AmdjRBVvtoMK7zphBa/Bfz3M6erKcaHkMdbOYc/qHwa2K+M1K AQ2g== |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=ZKeZ+7lQlorCmSXw9mGkMLHg+At+nqb6TRxh3i/DMRo=; b=ZseOPWm64nTOPQbyv0TENNcVQX8ePxlhHjT9aCFs7oHDPGOhL0QGLk+HXkKE6PN9bP 1eV8/rywL7xHpZQDDhKm1AJ+x2IEm7fZ/GxXBUb/PfksJCG5Ojx1iat5Twt47waPnQ6+ jJkHn0hkKzTuqe52RkmypMuHpzzt7Z2nh7Sei1zNL2qp0rjl1Ls0VqQXW4ifgnkGJlMv 2hl4OdBSDb1FmMrfmFwFbj2KfeBk8zORglEYRV1HPcLxZqxi9402yMS8LePnztjDbA3C LCu+c4byeJgfL4fqF2c2xNe8N2gVt6As2y7XmHQ9TSr9vrZ35/F3nAokdrVd7IxQyq6v WR/w== |
| X-Gm-Message-State | AE9vXwNMjeO22hxcjVUtsnO8jAs8WfiEC7JR1jxodXgDD/Td1Ec5BtWZw8JpyvYS3I9R2g== |
| X-Received | by 10.66.10.102 with SMTP id h6mr440247pab.112.1473822031886; Tue, 13 Sep 2016 20:00:31 -0700 (PDT) |
| X-Mailer | git-send-email 2.7.4 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 60 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | linux-kernel@vger.kernel.org, Peng Sun <sironhide0null@gmail.com> |
| X-Original-Date | Tue, 13 Sep 2016 19:59:58 -0700 |
| X-Original-Message-ID | <0076480d23a4ca406bddd98a58fc024a4c7ed370.1473821899.git.sironhide0null@gmail.com> |
| X-Original-References | <cover.1473821899.git.sironhide0null@gmail.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1482899 |
Show key headers only | View raw
Signed-off-by: Peng Sun <sironhide0null@gmail.com>
---
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/10] staging: slicoss: fix different address space sparse warnings Peng Sun <sironhide0null@gmail.com> - 2016-09-14 05:10 +0200
[PATCH 05/10] staging: slicoss: slicoss.c: fix different address space sparse warning Peng Sun <sironhide0null@gmail.com> - 2016-09-14 05:10 +0200
[PATCH 01/10] staging: slicoss: slic.h: add a macro IOMEM_GET_FIELDADDR to fix sparse warnings Peng Sun <sironhide0null@gmail.com> - 2016-09-14 05:10 +0200
Re: [PATCH 01/10] staging: slicoss: slic.h: add a macro IOMEM_GET_FIELDADDR to fix sparse warnings Greg KH <gregkh@linuxfoundation.org> - 2016-09-16 10:00 +0200
Re: [PATCH 01/10] staging: slicoss: slic.h: add a macro IOMEM_GET_FIELDADDR to fix sparse warnings Greg KH <gregkh@linuxfoundation.org> - 2016-09-16 10:00 +0200
Re: [PATCH 01/10] staging: slicoss: slic.h: add a macro IOMEM_GET_FIELDADDR to fix sparse warnings zerons <sironhide0null@gmail.com> - 2016-09-16 12:50 +0200
Re: [PATCH 01/10] staging: slicoss: slic.h: add a macro IOMEM_GET_FIELDADDR to fix sparse warnings Greg KH <gregkh@linuxfoundation.org> - 2016-09-16 15:00 +0200
Re: [PATCH 01/10] staging: slicoss: slic.h: add a macro IOMEM_GET_FIELDADDR to fix sparse warnings zerons <sironhide0null@gmail.com> - 2016-09-16 16:00 +0200
[PATCH 09/10] staging: slicoss: slicoss.c: fix different address space sparse warning Peng Sun <sironhide0null@gmail.com> - 2016-09-14 05:10 +0200
[PATCH 03/10] staging: slicoss: slic.h: add a macro IOMEM_SET_FIELD32 to fix sparse warnings Peng Sun <sironhide0null@gmail.com> - 2016-09-14 05:10 +0200
csiph-web