* [PATCH] s2io iomem annotations
@ 2005-10-29 5:36 Al Viro
0 siblings, 0 replies; 3+ messages in thread
From: Al Viro @ 2005-10-29 5:36 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Jeff Garzik, linux-kernel
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
----
diff -urN RC14-base/drivers/net/s2io.c current/drivers/net/s2io.c
--- RC14-base/drivers/net/s2io.c 2005-10-28 18:17:09.000000000 -0400
+++ current/drivers/net/s2io.c 2005-10-28 22:27:05.000000000 -0400
@@ -3045,7 +3045,7 @@
int wait_for_msix_trans(nic_t *nic, int i)
{
- XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+ XENA_dev_config_t __iomem *bar0 = nic->bar0;
u64 val64;
int ret = 0, cnt = 0;
@@ -3066,7 +3066,7 @@
void restore_xmsi_data(nic_t *nic)
{
- XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+ XENA_dev_config_t __iomem *bar0 = nic->bar0;
u64 val64;
int i;
@@ -3084,7 +3084,7 @@
void store_xmsi_data(nic_t *nic)
{
- XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+ XENA_dev_config_t __iomem *bar0 = nic->bar0;
u64 val64, addr, data;
int i;
@@ -3107,7 +3107,7 @@
int s2io_enable_msi(nic_t *nic)
{
- XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+ XENA_dev_config_t __iomem *bar0 = nic->bar0;
u16 msi_ctrl, msg_val;
struct config_param *config = &nic->config;
struct net_device *dev = nic->dev;
@@ -3157,7 +3157,7 @@
int s2io_enable_msi_x(nic_t *nic)
{
- XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;
+ XENA_dev_config_t __iomem *bar0 = nic->bar0;
u64 tx_mat, rx_mat;
u16 msi_control; /* Temp variable */
int ret, i, j, msix_indx = 1;
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] s2io iomem annotations
@ 2008-06-02 9:59 Al Viro
2008-06-10 22:21 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: Al Viro @ 2008-06-02 9:59 UTC (permalink / raw)
To: torvalds; +Cc: jgarzik, linux-kernel
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index a20693e..b5c1e66 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2861,7 +2861,8 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget)
struct config_param *config;
struct mac_info *mac_control;
int pkts_processed = 0;
- u8 *addr = NULL, val8 = 0;
+ u8 __iomem *addr = NULL;
+ u8 val8 = 0;
struct s2io_nic *nic = dev->priv;
struct XENA_dev_config __iomem *bar0 = nic->bar0;
int budget_org = budget;
@@ -2878,7 +2879,7 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget)
if (pkts_processed < budget_org) {
netif_rx_complete(dev, napi);
/*Re Enable MSI-Rx Vector*/
- addr = (u8 *)&bar0->xmsi_mask_reg;
+ addr = (u8 __iomem *)&bar0->xmsi_mask_reg;
addr += 7 - ring->ring_no;
val8 = (ring->ring_no == 0) ? 0x3f : 0xbf;
writeb(val8, addr);
@@ -4364,9 +4365,10 @@ static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id)
return IRQ_HANDLED;
if (sp->config.napi) {
- u8 *addr = NULL, val8 = 0;
+ u8 __iomem *addr = NULL;
+ u8 val8 = 0;
- addr = (u8 *)&bar0->xmsi_mask_reg;
+ addr = (u8 __iomem *)&bar0->xmsi_mask_reg;
addr += (7 - ring->ring_no);
val8 = (ring->ring_no == 0) ? 0x7f : 0xff;
writeb(val8, addr);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] s2io iomem annotations
2008-06-02 9:59 [PATCH] s2io iomem annotations Al Viro
@ 2008-06-10 22:21 ` Jeff Garzik
0 siblings, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2008-06-10 22:21 UTC (permalink / raw)
To: Al Viro; +Cc: torvalds, linux-kernel
Al Viro wrote:
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
applied
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-06-10 22:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-02 9:59 [PATCH] s2io iomem annotations Al Viro
2008-06-10 22:21 ` Jeff Garzik
-- strict thread matches above, loose matches on Subject: below --
2005-10-29 5:36 Al Viro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox