summaryrefslogtreecommitdiff
path: root/linux/src/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'linux/src/drivers/net')
-rw-r--r--linux/src/drivers/net/3c503.c2
-rw-r--r--linux/src/drivers/net/3c505.c4
-rw-r--r--linux/src/drivers/net/8390.c5
-rw-r--r--linux/src/drivers/net/at1700.c2
-rw-r--r--linux/src/drivers/net/de4x5.c20
-rw-r--r--linux/src/drivers/net/depca.c8
-rw-r--r--linux/src/drivers/net/pci-scan.c2
7 files changed, 21 insertions, 22 deletions
diff --git a/linux/src/drivers/net/3c503.c b/linux/src/drivers/net/3c503.c
index a562db35..8ce488d8 100644
--- a/linux/src/drivers/net/3c503.c
+++ b/linux/src/drivers/net/3c503.c
@@ -192,7 +192,7 @@ el2_probe1(struct device *dev, int ioaddr)
}
if (ei_debug && version_printed++ == 0)
- printk(version);
+ printk("%s", version);
dev->base_addr = ioaddr;
/* Allocate dev->priv and fill in 8390 specific dev fields. */
diff --git a/linux/src/drivers/net/3c505.c b/linux/src/drivers/net/3c505.c
index b2163ecc..d78dad5b 100644
--- a/linux/src/drivers/net/3c505.c
+++ b/linux/src/drivers/net/3c505.c
@@ -1408,7 +1408,7 @@ static int elp_sense(struct device *dev)
/* Wait for a while; the adapter may still be booting up */
if (elp_debug > 0)
- printk(stilllooking_msg);
+ printk("%s", stilllooking_msg);
if (orig_HCR & DIR) {
/* If HCR.DIR is up, we pull it down. HSR.DIR should follow. */
outb_control(orig_HCR & ~DIR, addr);
@@ -1439,7 +1439,7 @@ static int elp_sense(struct device *dev)
* a hard reset. Also, do a hard reset if selected at the compile time.
*/
if (elp_debug > 0)
- printk(found_msg);
+ printk("%s", found_msg);
return 0;
}
diff --git a/linux/src/drivers/net/8390.c b/linux/src/drivers/net/8390.c
index 9864106b..747ccb04 100644
--- a/linux/src/drivers/net/8390.c
+++ b/linux/src/drivers/net/8390.c
@@ -703,16 +703,13 @@ static void set_multicast_list(struct device *dev)
int ethdev_init(struct device *dev)
{
if (ei_debug > 1)
- printk(version);
+ printk("%s", version);
if (dev->priv == NULL) {
- struct ei_device *ei_local;
-
dev->priv = kmalloc(sizeof(struct ei_device), GFP_KERNEL);
if (dev->priv == NULL)
return -ENOMEM;
memset(dev->priv, 0, sizeof(struct ei_device));
- ei_local = (struct ei_device *)dev->priv;
}
dev->hard_start_xmit = &ei_start_xmit;
diff --git a/linux/src/drivers/net/at1700.c b/linux/src/drivers/net/at1700.c
index 953c1889..9e42ab48 100644
--- a/linux/src/drivers/net/at1700.c
+++ b/linux/src/drivers/net/at1700.c
@@ -595,7 +595,9 @@ net_rx(struct device *dev)
/* The inverse routine to net_open(). */
static int net_close(struct device *dev)
{
+#if 0
struct net_local *lp = (struct net_local *)dev->priv;
+#endif
int ioaddr = dev->base_addr;
dev->tbusy = 1;
diff --git a/linux/src/drivers/net/de4x5.c b/linux/src/drivers/net/de4x5.c
index 114f6a74..a66f0564 100644
--- a/linux/src/drivers/net/de4x5.c
+++ b/linux/src/drivers/net/de4x5.c
@@ -1493,7 +1493,7 @@ de4x5_sw_reset(struct device *dev)
status = -EIO;
}
- lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+ lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
lp->tx_old = lp->tx_new;
return status;
@@ -1553,7 +1553,7 @@ de4x5_queue_pkt(struct sk_buff *skb, struct device *dev)
#endif
outl(POLL_DEMAND, DE4X5_TPD);/* Start the TX */
- lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+ lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
dev->trans_start = jiffies;
if (TX_BUFFS_AVAIL) {
@@ -1708,7 +1708,7 @@ de4x5_rx(struct device *dev)
}
/* Change buffer ownership for this frame, back to the adapter */
- for (;lp->rx_old!=entry;lp->rx_old=(++lp->rx_old)%lp->rxRingSize) {
+ for (;lp->rx_old!=entry;lp->rx_old=(lp->rx_old+1)%lp->rxRingSize) {
lp->rx_ring[lp->rx_old].status = cpu_to_le32(R_OWN);
barrier();
}
@@ -1719,7 +1719,7 @@ de4x5_rx(struct device *dev)
/*
** Update entry information
*/
- lp->rx_new = (++lp->rx_new) % lp->rxRingSize;
+ lp->rx_new = (lp->rx_new + 1) % lp->rxRingSize;
}
return 0;
@@ -1768,7 +1768,7 @@ de4x5_tx(struct device *dev)
}
/* Update all the pointers */
- lp->tx_old = (++lp->tx_old) % lp->txRingSize;
+ lp->tx_old = (lp->tx_old + 1) % lp->txRingSize;
}
if (TX_BUFFS_AVAIL && dev->tbusy) { /* Any resources available? */
@@ -1838,7 +1838,7 @@ de4x5_rx_ovfc(struct device *dev)
for (; (s32)le32_to_cpu(lp->rx_ring[lp->rx_new].status)>=0;) {
lp->rx_ring[lp->rx_new].status = cpu_to_le32(R_OWN);
- lp->rx_new = (++lp->rx_new % lp->rxRingSize);
+ lp->rx_new = (lp->rx_new + 1) % lp->rxRingSize;
}
outl(omr, DE4X5_OMR);
@@ -1963,7 +1963,7 @@ set_multicast_list(struct device *dev)
load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET |
SETUP_FRAME_LEN, NULL);
- lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+ lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
outl(POLL_DEMAND, DE4X5_TPD); /* Start the TX */
dev->trans_start = jiffies;
}
@@ -3576,7 +3576,7 @@ ping_media(struct device *dev, int msec)
lp->tmp = lp->tx_new; /* Remember the ring position */
load_packet(dev, lp->frame, TD_LS | TD_FS | sizeof(lp->frame), NULL);
- lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+ lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
outl(POLL_DEMAND, DE4X5_TPD);
}
@@ -5111,7 +5111,7 @@ mii_get_phy(struct device *dev)
lp->useMII = TRUE;
/* Search the MII address space for possible PHY devices */
- for (n=0, lp->mii_cnt=0, i=1; !((i==1) && (n==1)); i=(++i)%DE4X5_MAX_MII) {
+ for (n=0, lp->mii_cnt=0, i=1; !((i==1) && (n==1)); i=(i+1)%DE4X5_MAX_MII) {
lp->phy[lp->active].addr = i;
if (i==0) n++; /* Count cycles */
while (de4x5_reset_phy(dev)<0) udelay(100);/* Wait for reset */
@@ -5607,7 +5607,7 @@ de4x5_ioctl(struct device *dev, struct ifreq *rq, int cmd)
while (test_and_set_bit(0, (void *)&dev->tbusy) != 0);
load_packet(dev, lp->setup_frame, TD_IC | PERFECT_F | TD_SET |
SETUP_FRAME_LEN, NULL);
- lp->tx_new = (++lp->tx_new) % lp->txRingSize;
+ lp->tx_new = (lp->tx_new + 1) % lp->txRingSize;
outl(POLL_DEMAND, DE4X5_TPD); /* Start the TX */
dev->tbusy = 0; /* Unlock the TX ring */
diff --git a/linux/src/drivers/net/depca.c b/linux/src/drivers/net/depca.c
index 8cf6fc80..e1b03429 100644
--- a/linux/src/drivers/net/depca.c
+++ b/linux/src/drivers/net/depca.c
@@ -966,7 +966,7 @@ depca_rx(struct device *dev)
}
}
/* Change buffer ownership for this last frame, back to the adapter */
- for (; lp->rx_old!=entry; lp->rx_old=(++lp->rx_old)&lp->rxRingMask) {
+ for (; lp->rx_old!=entry; lp->rx_old=(lp->rx_old+1)&lp->rxRingMask) {
writel(readl(&lp->rx_ring[lp->rx_old].base) | R_OWN,
&lp->rx_ring[lp->rx_old].base);
}
@@ -976,7 +976,7 @@ depca_rx(struct device *dev)
/*
** Update entry information
*/
- lp->rx_new = (++lp->rx_new) & lp->rxRingMask;
+ lp->rx_new = (lp->rx_new + 1) & lp->rxRingMask;
}
return 0;
@@ -1017,7 +1017,7 @@ depca_tx(struct device *dev)
}
/* Update all the pointers */
- lp->tx_old = (++lp->tx_old) & lp->txRingMask;
+ lp->tx_old = (lp->tx_old + 1) & lp->txRingMask;
}
return 0;
@@ -1540,7 +1540,7 @@ static int load_packet(struct device *dev, struct sk_buff *skb)
/* set up the buffer descriptors */
len = (skb->len < ETH_ZLEN) ? ETH_ZLEN : skb->len;
- for (i = entry; i != end; i = (++i) & lp->txRingMask) {
+ for (i = entry; i != end; i = (i + 1) & lp->txRingMask) {
/* clean out flags */
writel(readl(&lp->tx_ring[i].base) & ~T_FLAGS, &lp->tx_ring[i].base);
writew(0x0000, &lp->tx_ring[i].misc); /* clears other error flags */
diff --git a/linux/src/drivers/net/pci-scan.c b/linux/src/drivers/net/pci-scan.c
index 6187d5db..60525b76 100644
--- a/linux/src/drivers/net/pci-scan.c
+++ b/linux/src/drivers/net/pci-scan.c
@@ -347,7 +347,7 @@ int pci_drv_register(struct drv_id_info *drv_id, void *initial_device)
pci_tbl[chip_idx].name, pciaddr, irq);
if ( ! (pci_flags & PCI_UNUSED_IRQ) &&
- (irq == 0 || irq == 255)) {
+ (irq == 0 || irq >= 16)) {
if (pci_bus == 32) /* Broken CardBus activation. */
printk(KERN_WARNING "Resources for CardBus device '%s' have"
" not been allocated.\n"
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-06 02:25:59 +0000