aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/can/c_can/c_can_pci.c2
-rw-r--r--drivers/net/can/cc770/cc770_platform.c4
-rw-r--r--drivers/net/can/mscan/mpc5xxx_can.c12
-rw-r--r--drivers/net/can/sja1000/ems_pci.c2
-rw-r--r--drivers/net/can/sja1000/ems_pcmcia.c3
-rw-r--r--drivers/net/can/sja1000/kvaser_pci.c2
-rw-r--r--drivers/net/can/sja1000/peak_pci.c3
-rw-r--r--drivers/net/can/sja1000/plx_pci.c2
-rw-r--r--drivers/net/can/softing/softing_cs.c3
-rw-r--r--drivers/net/can/softing/softing_main.c2
-rw-r--r--drivers/net/ethernet/3com/3c509.c11
-rw-r--r--drivers/net/ethernet/3com/3c59x.c7
-rw-r--r--drivers/net/ethernet/8390/hydra.c2
-rw-r--r--drivers/net/ethernet/8390/zorro8390.c7
-rw-r--r--drivers/net/ethernet/adaptec/starfire.c2
-rw-r--r--drivers/net/ethernet/alteon/acenic.c7
-rw-r--r--drivers/net/ethernet/amd/a2065.c4
-rw-r--r--drivers/net/ethernet/amd/ariadne.c2
-rw-r--r--drivers/net/ethernet/amd/hplance.c9
-rw-r--r--drivers/net/ethernet/amd/sunlance.c4
-rw-r--r--drivers/net/ethernet/atheros/atl1c/atl1c_main.c3
-rw-r--r--drivers/net/ethernet/atheros/atl1e/atl1e_main.c3
-rw-r--r--drivers/net/ethernet/atheros/atlx/atl1.c5
-rw-r--r--drivers/net/ethernet/atheros/atlx/atl2.c3
-rw-r--r--drivers/net/ethernet/broadcom/b44.c2
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c17
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c3
-rw-r--r--drivers/net/ethernet/chelsio/cxgb/cxgb2.c3
-rw-r--r--drivers/net/ethernet/chelsio/cxgb/sge.c3
-rw-r--r--drivers/net/ethernet/chelsio/cxgb/subr.c7
-rw-r--r--drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c6
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c5
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/t4_hw.c6
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c2
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c3
-rw-r--r--drivers/net/ethernet/cisco/enic/enic_main.c3
-rw-r--r--drivers/net/ethernet/dec/tulip/de2104x.c3
-rw-r--r--drivers/net/ethernet/dec/tulip/de4x5.c2
-rw-r--r--drivers/net/ethernet/dec/tulip/dmfe.c3
-rw-r--r--drivers/net/ethernet/dec/tulip/tulip_core.c6
-rw-r--r--drivers/net/ethernet/dec/tulip/winbond-840.c3
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c3
-rw-r--r--drivers/net/ethernet/fealnx.c2
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c3
-rw-r--r--drivers/net/ethernet/hp/hp100.c6
-rw-r--r--drivers/net/ethernet/ibm/ehea/ehea_main.c4
-rw-r--r--drivers/net/ethernet/ibm/emac/core.c8
-rw-r--r--drivers/net/ethernet/ibm/emac/mal.c3
-rw-r--r--drivers/net/ethernet/ibm/ibmveth.c3
-rw-r--r--drivers/net/ethernet/icplus/ipg.c3
-rw-r--r--drivers/net/ethernet/intel/e100.c3
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_main.c3
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_param.c4
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c3
-rw-r--r--drivers/net/ethernet/intel/e1000e/param.c4
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c3
-rw-r--r--drivers/net/ethernet/intel/igbvf/netdev.c3
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c3
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c3
-rw-r--r--drivers/net/ethernet/marvell/skge.c3
-rw-r--r--drivers/net/ethernet/marvell/sky2.c8
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/main.c3
-rw-r--r--drivers/net/ethernet/micrel/ksz884x.c3
-rw-r--r--drivers/net/ethernet/natsemi/macsonic.c3
-rw-r--r--drivers/net/ethernet/natsemi/natsemi.c3
-rw-r--r--drivers/net/ethernet/natsemi/ns83820.c2
-rw-r--r--drivers/net/ethernet/neterion/s2io.h3
-rw-r--r--drivers/net/ethernet/neterion/vxge/vxge-main.c15
-rw-r--r--drivers/net/ethernet/packetengines/yellowfin.c2
-rw-r--r--drivers/net/ethernet/qlogic/qla3xxx.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c3
-rw-r--r--drivers/net/ethernet/qlogic/qlge/qlge_main.c6
-rw-r--r--drivers/net/ethernet/rdc/r6040.c3
-rw-r--r--drivers/net/ethernet/sfc/efx.c2
-rw-r--r--drivers/net/ethernet/sgi/ioc3-eth.c3
-rw-r--r--drivers/net/ethernet/silan/sc92031.c3
-rw-r--r--drivers/net/ethernet/sis/sis190.c9
-rw-r--r--drivers/net/ethernet/sis/sis900.c2
-rw-r--r--drivers/net/ethernet/smsc/epic100.c3
-rw-r--r--drivers/net/ethernet/smsc/smc91x.c2
-rw-r--r--drivers/net/ethernet/smsc/smsc911x.c7
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c2
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c8
-rw-r--r--drivers/net/ethernet/sun/cassini.c3
-rw-r--r--drivers/net/ethernet/sun/niu.c43
-rw-r--r--drivers/net/ethernet/sun/sunbmac.c2
-rw-r--r--drivers/net/ethernet/sun/sungem.c3
-rw-r--r--drivers/net/ethernet/sun/sunhme.c2
-rw-r--r--drivers/net/ethernet/sun/sunvnet.c3
-rw-r--r--drivers/net/ethernet/ti/tlan.c5
-rw-r--r--drivers/net/ethernet/toshiba/ps3_gelic_net.c10
-rw-r--r--drivers/net/ethernet/toshiba/tc35815.c2
-rw-r--r--drivers/net/ethernet/via/via-rhine.c3
-rw-r--r--drivers/net/ethernet/via/via-velocity.c5
-rw-r--r--drivers/net/fddi/defxx.c10
-rw-r--r--drivers/net/hippi/rrunner.c3
-rw-r--r--drivers/net/irda/smsc-ircc2.c2
-rw-r--r--drivers/net/irda/via-ircc.c7
-rw-r--r--drivers/net/phy/mdio-gpio.c4
-rw-r--r--drivers/net/wan/dscc4.c3
-rw-r--r--drivers/net/wan/hd64570.c3
-rw-r--r--drivers/net/wan/hd64572.c3
-rw-r--r--drivers/net/wan/lmc/lmc_main.c3
-rw-r--r--drivers/net/wan/pc300too.c2
-rw-r--r--drivers/net/wan/pci200syn.c2
-rw-r--r--drivers/net/wan/wanxl.c2
-rw-r--r--drivers/net/xen-netfront.c2
107 files changed, 188 insertions, 284 deletions
diff --git a/drivers/net/can/c_can/c_can_pci.c b/drivers/net/can/c_can/c_can_pci.c
index a1f26317068..b374be7891a 100644
--- a/drivers/net/can/c_can/c_can_pci.c
+++ b/drivers/net/can/c_can/c_can_pci.c
@@ -64,7 +64,7 @@ static void c_can_pci_write_reg_aligned_to_32bit(struct c_can_priv *priv,
64} 64}
65 65
66static int c_can_pci_probe(struct pci_dev *pdev, 66static int c_can_pci_probe(struct pci_dev *pdev,
67 const struct pci_device_id *ent) 67 const struct pci_device_id *ent)
68{ 68{
69 struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data; 69 struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data;
70 struct c_can_priv *priv; 70 struct c_can_priv *priv;
diff --git a/drivers/net/can/cc770/cc770_platform.c b/drivers/net/can/cc770/cc770_platform.c
index 7d451cd7500..d0f6bfc45ae 100644
--- a/drivers/net/can/cc770/cc770_platform.c
+++ b/drivers/net/can/cc770/cc770_platform.c
@@ -76,7 +76,7 @@ static void cc770_platform_write_reg(const struct cc770_priv *priv, int reg,
76} 76}
77 77
78static int cc770_get_of_node_data(struct platform_device *pdev, 78static int cc770_get_of_node_data(struct platform_device *pdev,
79 struct cc770_priv *priv) 79 struct cc770_priv *priv)
80{ 80{
81 struct device_node *np = pdev->dev.of_node; 81 struct device_node *np = pdev->dev.of_node;
82 const u32 *prop; 82 const u32 *prop;
@@ -149,7 +149,7 @@ static int cc770_get_of_node_data(struct platform_device *pdev,
149} 149}
150 150
151static int cc770_get_platform_data(struct platform_device *pdev, 151static int cc770_get_platform_data(struct platform_device *pdev,
152 struct cc770_priv *priv) 152 struct cc770_priv *priv)
153{ 153{
154 154
155 struct cc770_platform_data *pdata = pdev->dev.platform_data; 155 struct cc770_platform_data *pdata = pdev->dev.platform_data;
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index 06a4561955c..668850e441d 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -49,8 +49,7 @@ static struct of_device_id mpc52xx_cdm_ids[] = {
49}; 49};
50 50
51static u32 mpc52xx_can_get_clock(struct platform_device *ofdev, 51static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
52 const char *clock_name, 52 const char *clock_name, int *mscan_clksrc)
53 int *mscan_clksrc)
54{ 53{
55 unsigned int pvr; 54 unsigned int pvr;
56 struct mpc52xx_cdm __iomem *cdm; 55 struct mpc52xx_cdm __iomem *cdm;
@@ -102,8 +101,7 @@ static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
102} 101}
103#else /* !CONFIG_PPC_MPC52xx */ 102#else /* !CONFIG_PPC_MPC52xx */
104static u32 mpc52xx_can_get_clock(struct platform_device *ofdev, 103static u32 mpc52xx_can_get_clock(struct platform_device *ofdev,
105 const char *clock_name, 104 const char *clock_name, int *mscan_clksrc)
106 int *mscan_clksrc)
107{ 105{
108 return 0; 106 return 0;
109} 107}
@@ -130,8 +128,7 @@ static struct of_device_id mpc512x_clock_ids[] = {
130}; 128};
131 129
132static u32 mpc512x_can_get_clock(struct platform_device *ofdev, 130static u32 mpc512x_can_get_clock(struct platform_device *ofdev,
133 const char *clock_name, 131 const char *clock_name, int *mscan_clksrc)
134 int *mscan_clksrc)
135{ 132{
136 struct mpc512x_clockctl __iomem *clockctl; 133 struct mpc512x_clockctl __iomem *clockctl;
137 struct device_node *np_clock; 134 struct device_node *np_clock;
@@ -240,8 +237,7 @@ exit_put:
240} 237}
241#else /* !CONFIG_PPC_MPC512x */ 238#else /* !CONFIG_PPC_MPC512x */
242static u32 mpc512x_can_get_clock(struct platform_device *ofdev, 239static u32 mpc512x_can_get_clock(struct platform_device *ofdev,
243 const char *clock_name, 240 const char *clock_name, int *mscan_clksrc)
244 int *mscan_clksrc)
245{ 241{
246 return 0; 242 return 0;
247} 243}
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c
index f232bc8d087..036a326836b 100644
--- a/drivers/net/can/sja1000/ems_pci.c
+++ b/drivers/net/can/sja1000/ems_pci.c
@@ -221,7 +221,7 @@ static void ems_pci_card_reset(struct ems_pci_card *card)
221 * CAN channel to SJA1000 Socket-CAN subsystem. 221 * CAN channel to SJA1000 Socket-CAN subsystem.
222 */ 222 */
223static int ems_pci_add_card(struct pci_dev *pdev, 223static int ems_pci_add_card(struct pci_dev *pdev,
224 const struct pci_device_id *ent) 224 const struct pci_device_id *ent)
225{ 225{
226 struct sja1000_priv *priv; 226 struct sja1000_priv *priv;
227 struct net_device *dev; 227 struct net_device *dev;
diff --git a/drivers/net/can/sja1000/ems_pcmcia.c b/drivers/net/can/sja1000/ems_pcmcia.c
index 46fc313214a..5c2f3fbbf5a 100644
--- a/drivers/net/can/sja1000/ems_pcmcia.c
+++ b/drivers/net/can/sja1000/ems_pcmcia.c
@@ -166,8 +166,7 @@ static void ems_pcmcia_del_card(struct pcmcia_device *pdev)
166 * Probe PCI device for EMS CAN signature and register each available 166 * Probe PCI device for EMS CAN signature and register each available
167 * CAN channel to SJA1000 Socket-CAN subsystem. 167 * CAN channel to SJA1000 Socket-CAN subsystem.
168 */ 168 */
169static int ems_pcmcia_add_card(struct pcmcia_device *pdev, 169static int ems_pcmcia_add_card(struct pcmcia_device *pdev, unsigned long base)
170 unsigned long base)
171{ 170{
172 struct sja1000_priv *priv; 171 struct sja1000_priv *priv;
173 struct net_device *dev; 172 struct net_device *dev;
diff --git a/drivers/net/can/sja1000/kvaser_pci.c b/drivers/net/can/sja1000/kvaser_pci.c
index 4efdaf26eae..37b0381f532 100644
--- a/drivers/net/can/sja1000/kvaser_pci.c
+++ b/drivers/net/can/sja1000/kvaser_pci.c
@@ -291,7 +291,7 @@ failure:
291} 291}
292 292
293static int kvaser_pci_init_one(struct pci_dev *pdev, 293static int kvaser_pci_init_one(struct pci_dev *pdev,
294 const struct pci_device_id *ent) 294 const struct pci_device_id *ent)
295{ 295{
296 int err; 296 int err;
297 struct net_device *master_dev = NULL; 297 struct net_device *master_dev = NULL;
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
index 3faeb3d8436..d84888f03d9 100644
--- a/drivers/net/can/sja1000/peak_pci.c
+++ b/drivers/net/can/sja1000/peak_pci.c
@@ -551,8 +551,7 @@ static void peak_pci_post_irq(const struct sja1000_priv *priv)
551 writew(chan->icr_mask, chan->cfg_base + PITA_ICR); 551 writew(chan->icr_mask, chan->cfg_base + PITA_ICR);
552} 552}
553 553
554static int peak_pci_probe(struct pci_dev *pdev, 554static int peak_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
555 const struct pci_device_id *ent)
556{ 555{
557 struct sja1000_priv *priv; 556 struct sja1000_priv *priv;
558 struct peak_pci_chan *chan; 557 struct peak_pci_chan *chan;
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
index 8b233f8c95f..11d1062a944 100644
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
@@ -485,7 +485,7 @@ static void plx_pci_del_card(struct pci_dev *pdev)
485 * available CAN channel to SJA1000 Socket-CAN subsystem. 485 * available CAN channel to SJA1000 Socket-CAN subsystem.
486 */ 486 */
487static int plx_pci_add_card(struct pci_dev *pdev, 487static int plx_pci_add_card(struct pci_dev *pdev,
488 const struct pci_device_id *ent) 488 const struct pci_device_id *ent)
489{ 489{
490 struct sja1000_priv *priv; 490 struct sja1000_priv *priv;
491 struct net_device *dev; 491 struct net_device *dev;
diff --git a/drivers/net/can/softing/softing_cs.c b/drivers/net/can/softing/softing_cs.c
index ce18ba52e4b..c2c0a5bb0b2 100644
--- a/drivers/net/can/softing/softing_cs.c
+++ b/drivers/net/can/softing/softing_cs.c
@@ -193,8 +193,7 @@ static int softingcs_enable_irq(struct platform_device *pdev, int v)
193/* 193/*
194 * pcmcia check 194 * pcmcia check
195 */ 195 */
196static int softingcs_probe_config(struct pcmcia_device *pcmcia, 196static int softingcs_probe_config(struct pcmcia_device *pcmcia, void *priv_data)
197 void *priv_data)
198{ 197{
199 struct softing_platform_data *pdat = priv_data; 198 struct softing_platform_data *pdat = priv_data;
200 struct resource *pres; 199 struct resource *pres;
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index 50b1e0f21f1..3a2b45601ec 100644
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -646,7 +646,7 @@ static const struct can_bittiming_const softing_btr_const = {
646 646
647 647
648static struct net_device *softing_netdev_create(struct softing *card, 648static struct net_device *softing_netdev_create(struct softing *card,
649 uint16_t chip_id) 649 uint16_t chip_id)
650{ 650{
651 struct net_device *netdev; 651 struct net_device *netdev;
652 struct softing_priv *priv; 652 struct softing_priv *priv;
diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c
index 9300185da97..633c709b9d9 100644
--- a/drivers/net/ethernet/3com/3c509.c
+++ b/drivers/net/ethernet/3com/3c509.c
@@ -270,9 +270,8 @@ static int el3_isa_id_sequence(__be16 *phys_addr)
270 270
271} 271}
272 272
273static void el3_dev_fill(struct net_device *dev, __be16 *phys_addr, 273static void el3_dev_fill(struct net_device *dev, __be16 *phys_addr, int ioaddr,
274 int ioaddr, int irq, int if_port, 274 int irq, int if_port, enum el3_cardtype type)
275 enum el3_cardtype type)
276{ 275{
277 struct el3_private *lp = netdev_priv(dev); 276 struct el3_private *lp = netdev_priv(dev);
278 277
@@ -283,8 +282,7 @@ static void el3_dev_fill(struct net_device *dev, __be16 *phys_addr,
283 lp->type = type; 282 lp->type = type;
284} 283}
285 284
286static int el3_isa_match(struct device *pdev, 285static int el3_isa_match(struct device *pdev, unsigned int ndev)
287 unsigned int ndev)
288{ 286{
289 struct net_device *dev; 287 struct net_device *dev;
290 int ioaddr, isa_irq, if_port, err; 288 int ioaddr, isa_irq, if_port, err;
@@ -406,8 +404,7 @@ static struct pnp_device_id el3_pnp_ids[] = {
406}; 404};
407MODULE_DEVICE_TABLE(pnp, el3_pnp_ids); 405MODULE_DEVICE_TABLE(pnp, el3_pnp_ids);
408 406
409static int el3_pnp_probe(struct pnp_dev *pdev, 407static int el3_pnp_probe(struct pnp_dev *pdev, const struct pnp_device_id *id)
410 const struct pnp_device_id *id)
411{ 408{
412 short i; 409 short i;
413 int ioaddr, irq, if_port; 410 int ioaddr, irq, if_port;
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index 658e224b361..ed0feb3cc6f 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -1001,7 +1001,7 @@ static int __init vortex_eisa_init(void)
1001 1001
1002/* returns count (>= 0), or negative on error */ 1002/* returns count (>= 0), or negative on error */
1003static int vortex_init_one(struct pci_dev *pdev, 1003static int vortex_init_one(struct pci_dev *pdev,
1004 const struct pci_device_id *ent) 1004 const struct pci_device_id *ent)
1005{ 1005{
1006 int rc, unit, pci_bar; 1006 int rc, unit, pci_bar;
1007 struct vortex_chip_info *vci; 1007 struct vortex_chip_info *vci;
@@ -1088,9 +1088,8 @@ static const struct net_device_ops vortex_netdev_ops = {
1088 * 1088 *
1089 * NOTE: pdev can be NULL, for the case of a Compaq device 1089 * NOTE: pdev can be NULL, for the case of a Compaq device
1090 */ 1090 */
1091static int vortex_probe1(struct device *gendev, 1091static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq,
1092 void __iomem *ioaddr, int irq, 1092 int chip_idx, int card_idx)
1093 int chip_idx, int card_idx)
1094{ 1093{
1095 struct vortex_private *vp; 1094 struct vortex_private *vp;
1096 int option; 1095 int option;
diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c
index bc81de1b7d4..fb3dd4399cf 100644
--- a/drivers/net/ethernet/8390/hydra.c
+++ b/drivers/net/ethernet/8390/hydra.c
@@ -81,7 +81,7 @@ static struct zorro_driver hydra_driver = {
81}; 81};
82 82
83static int hydra_init_one(struct zorro_dev *z, 83static int hydra_init_one(struct zorro_dev *z,
84 const struct zorro_device_id *ent) 84 const struct zorro_device_id *ent)
85{ 85{
86 int err; 86 int err;
87 87
diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c
index ceb89d90230..85ec4c2d264 100644
--- a/drivers/net/ethernet/8390/zorro8390.c
+++ b/drivers/net/ethernet/8390/zorro8390.c
@@ -286,9 +286,8 @@ static const struct net_device_ops zorro8390_netdev_ops = {
286#endif 286#endif
287}; 287};
288 288
289static int zorro8390_init(struct net_device *dev, 289static int zorro8390_init(struct net_device *dev, unsigned long board,
290 unsigned long board, const char *name, 290 const char *name, unsigned long ioaddr)
291 unsigned long ioaddr)
292{ 291{
293 int i; 292 int i;
294 int err; 293 int err;
@@ -397,7 +396,7 @@ static int zorro8390_init(struct net_device *dev,
397} 396}
398 397
399static int zorro8390_init_one(struct zorro_dev *z, 398static int zorro8390_init_one(struct zorro_dev *z,
400 const struct zorro_device_id *ent) 399 const struct zorro_device_id *ent)
401{ 400{
402 struct net_device *dev; 401 struct net_device *dev;
403 unsigned long board, ioaddr; 402 unsigned long board, ioaddr;
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index d67c192b650..549b7750057 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -642,7 +642,7 @@ static const struct net_device_ops netdev_ops = {
642}; 642};
643 643
644static int starfire_init_one(struct pci_dev *pdev, 644static int starfire_init_one(struct pci_dev *pdev,
645 const struct pci_device_id *ent) 645 const struct pci_device_id *ent)
646{ 646{
647 struct device *d = &pdev->dev; 647 struct device *d = &pdev->dev;
648 struct netdev_private *np; 648 struct netdev_private *np;
diff --git a/drivers/net/ethernet/alteon/acenic.c b/drivers/net/ethernet/alteon/acenic.c
index dfddce6342e..c0bc41a784c 100644
--- a/drivers/net/ethernet/alteon/acenic.c
+++ b/drivers/net/ethernet/alteon/acenic.c
@@ -455,7 +455,7 @@ static const struct net_device_ops ace_netdev_ops = {
455}; 455};
456 456
457static int acenic_probe_one(struct pci_dev *pdev, 457static int acenic_probe_one(struct pci_dev *pdev,
458 const struct pci_device_id *id) 458 const struct pci_device_id *id)
459{ 459{
460 struct net_device *dev; 460 struct net_device *dev;
461 struct ace_private *ap; 461 struct ace_private *ap;
@@ -2825,7 +2825,7 @@ static struct net_device_stats *ace_get_stats(struct net_device *dev)
2825 2825
2826 2826
2827static void ace_copy(struct ace_regs __iomem *regs, const __be32 *src, 2827static void ace_copy(struct ace_regs __iomem *regs, const __be32 *src,
2828 u32 dest, int size) 2828 u32 dest, int size)
2829{ 2829{
2830 void __iomem *tdest; 2830 void __iomem *tdest;
2831 short tsize, i; 2831 short tsize, i;
@@ -3091,8 +3091,7 @@ static void eeprom_stop(struct ace_regs __iomem *regs)
3091/* 3091/*
3092 * Read a whole byte from the EEPROM. 3092 * Read a whole byte from the EEPROM.
3093 */ 3093 */
3094static int read_eeprom_byte(struct net_device *dev, 3094static int read_eeprom_byte(struct net_device *dev, unsigned long offset)
3095 unsigned long offset)
3096{ 3095{
3097 struct ace_private *ap = netdev_priv(dev); 3096 struct ace_private *ap = netdev_priv(dev);
3098 struct ace_regs __iomem *regs = ap->regs; 3097 struct ace_regs __iomem *regs = ap->regs;
diff --git a/drivers/net/ethernet/amd/a2065.c b/drivers/net/ethernet/amd/a2065.c
index 818f6d6cdbe..3789affbc0e 100644
--- a/drivers/net/ethernet/amd/a2065.c
+++ b/drivers/net/ethernet/amd/a2065.c
@@ -640,7 +640,7 @@ static void lance_set_multicast(struct net_device *dev)
640} 640}
641 641
642static int a2065_init_one(struct zorro_dev *z, 642static int a2065_init_one(struct zorro_dev *z,
643 const struct zorro_device_id *ent); 643 const struct zorro_device_id *ent);
644static void a2065_remove_one(struct zorro_dev *z); 644static void a2065_remove_one(struct zorro_dev *z);
645 645
646 646
@@ -671,7 +671,7 @@ static const struct net_device_ops lance_netdev_ops = {
671}; 671};
672 672
673static int a2065_init_one(struct zorro_dev *z, 673static int a2065_init_one(struct zorro_dev *z,
674 const struct zorro_device_id *ent) 674 const struct zorro_device_id *ent)
675{ 675{
676 struct net_device *dev; 676 struct net_device *dev;
677 struct lance_private *priv; 677 struct lance_private *priv;
diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c
index 2ea7a231ef1..98f4522fd17 100644
--- a/drivers/net/ethernet/amd/ariadne.c
+++ b/drivers/net/ethernet/amd/ariadne.c
@@ -711,7 +711,7 @@ static const struct net_device_ops ariadne_netdev_ops = {
711}; 711};
712 712
713static int ariadne_init_one(struct zorro_dev *z, 713static int ariadne_init_one(struct zorro_dev *z,
714 const struct zorro_device_id *ent) 714 const struct zorro_device_id *ent)
715{ 715{
716 unsigned long board = z->resource.start; 716 unsigned long board = z->resource.start;
717 unsigned long base_addr = board + ARIADNE_LANCE; 717 unsigned long base_addr = board + ARIADNE_LANCE;
diff --git a/drivers/net/ethernet/amd/hplance.c b/drivers/net/ethernet/amd/hplance.c
index 705333e0eff..0c61fd50d88 100644
--- a/drivers/net/ethernet/amd/hplance.c
+++ b/drivers/net/ethernet/amd/hplance.c
@@ -46,10 +46,8 @@ struct hplance_private {
46 * plus board-specific init, open and close actions. 46 * plus board-specific init, open and close actions.
47 * Oh, and we need to tell the generic code how to read and write LANCE registers... 47 * Oh, and we need to tell the generic code how to read and write LANCE registers...
48 */ 48 */
49static int hplance_init_one(struct dio_dev *d, 49static int hplance_init_one(struct dio_dev *d, const struct dio_device_id *ent);
50 const struct dio_device_id *ent); 50static void hplance_init(struct net_device *dev, struct dio_dev *d);
51static void hplance_init(struct net_device *dev,
52 struct dio_dev *d);
53static void hplance_remove_one(struct dio_dev *d); 51static void hplance_remove_one(struct dio_dev *d);
54static void hplance_writerap(void *priv, unsigned short value); 52static void hplance_writerap(void *priv, unsigned short value);
55static void hplance_writerdp(void *priv, unsigned short value); 53static void hplance_writerdp(void *priv, unsigned short value);
@@ -83,8 +81,7 @@ static const struct net_device_ops hplance_netdev_ops = {
83}; 81};
84 82
85/* Find all the HP Lance boards and initialise them... */ 83/* Find all the HP Lance boards and initialise them... */
86static int hplance_init_one(struct dio_dev *d, 84static int hplance_init_one(struct dio_dev *d, const struct dio_device_id *ent)
87 const struct dio_device_id *ent)
88{ 85{
89 struct net_device *dev; 86 struct net_device *dev;
90 int err = -ENOMEM; 87 int err = -ENOMEM;
diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
index 64dbffa0a7e..c2d696c88e4 100644
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
@@ -1305,8 +1305,8 @@ static const struct net_device_ops sparc_lance_ops = {
1305}; 1305};
1306 1306
1307static int sparc_lance_probe_one(struct platform_device *op, 1307static int sparc_lance_probe_one(struct platform_device *op,
1308 struct platform_device *ledma, 1308 struct platform_device *ledma,
1309 struct platform_device *lebuffer) 1309 struct platform_device *lebuffer)
1310{ 1310{
1311 struct device_node *dp = op->dev.of_node; 1311 struct device_node *dp = op->dev.of_node;
1312 static unsigned version_printed; 1312 static unsigned version_printed;
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 44bee4a2b9b..56d3f697e0c 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -2442,8 +2442,7 @@ static int atl1c_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
2442 * The OS initialization, configuring of the adapter private structure, 2442 * The OS initialization, configuring of the adapter private structure,
2443 * and a hardware reset occur. 2443 * and a hardware reset occur.
2444 */ 2444 */
2445static int atl1c_probe(struct pci_dev *pdev, 2445static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2446 const struct pci_device_id *ent)
2447{ 2446{
2448 struct net_device *netdev; 2447 struct net_device *netdev;
2449 struct atl1c_adapter *adapter; 2448 struct atl1c_adapter *adapter;
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index dec5d2cfd38..e4466a36d10 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -2235,8 +2235,7 @@ static int atl1e_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
2235 * The OS initialization, configuring of the adapter private structure, 2235 * The OS initialization, configuring of the adapter private structure,
2236 * and a hardware reset occur. 2236 * and a hardware reset occur.
2237 */ 2237 */
2238static int atl1e_probe(struct pci_dev *pdev, 2238static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2239 const struct pci_device_id *ent)
2240{ 2239{
2241 struct net_device *netdev; 2240 struct net_device *netdev;
2242 struct atl1e_adapter *adapter = NULL; 2241 struct atl1e_adapter *adapter = NULL;
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index 3e7327ec390..71b3d7daa21 100644
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -144,7 +144,7 @@ struct atl1_option {
144}; 144};
145 145
146static int atl1_validate_option(int *value, struct atl1_option *opt, 146static int atl1_validate_option(int *value, struct atl1_option *opt,
147 struct pci_dev *pdev) 147 struct pci_dev *pdev)
148{ 148{
149 if (*value == OPTION_UNSET) { 149 if (*value == OPTION_UNSET) {
150 *value = opt->def; 150 *value = opt->def;
@@ -2934,8 +2934,7 @@ static const struct net_device_ops atl1_netdev_ops = {
2934 * The OS initialization, configuring of the adapter private structure, 2934 * The OS initialization, configuring of the adapter private structure,
2935 * and a hardware reset occur. 2935 * and a hardware reset occur.
2936 */ 2936 */
2937static int atl1_probe(struct pci_dev *pdev, 2937static int atl1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2938 const struct pci_device_id *ent)
2939{ 2938{
2940 struct net_device *netdev; 2939 struct net_device *netdev;
2941 struct atl1_adapter *adapter; 2940 struct atl1_adapter *adapter;
diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
index 7dc9766bb5b..aab83a2d4e0 100644
--- a/drivers/net/ethernet/atheros/atlx/atl2.c
+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
@@ -1338,8 +1338,7 @@ static const struct net_device_ops atl2_netdev_ops = {
1338 * The OS initialization, configuring of the adapter private structure, 1338 * The OS initialization, configuring of the adapter private structure,
1339 * and a hardware reset occur. 1339 * and a hardware reset occur.
1340 */ 1340 */
1341static int atl2_probe(struct pci_dev *pdev, 1341static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1342 const struct pci_device_id *ent)
1343{ 1342{
1344 struct net_device *netdev; 1343 struct net_device *netdev;
1345 struct atl2_adapter *adapter; 1344 struct atl2_adapter *adapter;
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index c64351f486c..219f6226fcb 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -2142,7 +2142,7 @@ static const struct net_device_ops b44_netdev_ops = {
2142}; 2142};
2143 2143
2144static int b44_init_one(struct ssb_device *sdev, 2144static int b44_init_one(struct ssb_device *sdev,
2145 const struct ssb_device_id *ent) 2145 const struct ssb_device_id *ent)
2146{ 2146{
2147 struct net_device *dev; 2147 struct net_device *dev;
2148 struct b44 *bp; 2148 struct b44 *bp;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 2f6a19bfad5..940ef859dc6 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -9487,8 +9487,7 @@ static void bnx2x_prev_unload_close_mac(struct bnx2x *bp)
9487#define BNX2X_PREV_UNDI_BD(val) ((val) >> 16 & 0xffff) 9487#define BNX2X_PREV_UNDI_BD(val) ((val) >> 16 & 0xffff)
9488#define BNX2X_PREV_UNDI_PROD(rcq, bd) ((bd) << 16 | (rcq)) 9488#define BNX2X_PREV_UNDI_PROD(rcq, bd) ((bd) << 16 | (rcq))
9489 9489
9490static void bnx2x_prev_unload_undi_inc(struct bnx2x *bp, u8 port, 9490static void bnx2x_prev_unload_undi_inc(struct bnx2x *bp, u8 port, u8 inc)
9491 u8 inc)
9492{ 9491{
9493 u16 rcq, bd; 9492 u16 rcq, bd;
9494 u32 tmp_reg = REG_RD(bp, BNX2X_PREV_UNDI_PROD_ADDR(port)); 9493 u32 tmp_reg = REG_RD(bp, BNX2X_PREV_UNDI_PROD_ADDR(port));
@@ -10072,8 +10071,7 @@ static int bnx2x_get_igu_cam_info(struct bnx2x *bp)
10072 return 0; 10071 return 0;
10073} 10072}
10074 10073
10075static void bnx2x_link_settings_supported(struct bnx2x *bp, 10074static void bnx2x_link_settings_supported(struct bnx2x *bp, u32 switch_cfg)
10076 u32 switch_cfg)
10077{ 10075{
10078 int cfg_size = 0, idx, port = BP_PORT(bp); 10076 int cfg_size = 0, idx, port = BP_PORT(bp);
10079 10077
@@ -11553,9 +11551,8 @@ static int bnx2x_set_coherency_mask(struct bnx2x *bp)
11553 return 0; 11551 return 0;
11554} 11552}
11555 11553
11556static int bnx2x_init_dev(struct pci_dev *pdev, 11554static int bnx2x_init_dev(struct pci_dev *pdev, struct net_device *dev,
11557 struct net_device *dev, 11555 unsigned long board_type)
11558 unsigned long board_type)
11559{ 11556{
11560 struct bnx2x *bp; 11557 struct bnx2x *bp;
11561 int rc; 11558 int rc;
@@ -11735,8 +11732,7 @@ err_out:
11735 return rc; 11732 return rc;
11736} 11733}
11737 11734
11738static void bnx2x_get_pcie_width_speed(struct bnx2x *bp, 11735static void bnx2x_get_pcie_width_speed(struct bnx2x *bp, int *width, int *speed)
11739 int *width, int *speed)
11740{ 11736{
11741 u32 val = REG_RD(bp, PCICFG_OFFSET + PCICFG_LINK_CONTROL); 11737 u32 val = REG_RD(bp, PCICFG_OFFSET + PCICFG_LINK_CONTROL);
11742 11738
@@ -12042,8 +12038,7 @@ static int bnx2x_get_num_non_def_sbs(struct pci_dev *pdev,
12042 12038
12043struct cnic_eth_dev *bnx2x_cnic_probe(struct net_device *); 12039struct cnic_eth_dev *bnx2x_cnic_probe(struct net_device *);
12044 12040
12045static int bnx2x_init_one(struct pci_dev *pdev, 12041static int bnx2x_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
12046 const struct pci_device_id *ent)
12047{ 12042{
12048 struct net_device *dev = NULL; 12043 struct net_device *dev = NULL;
12049 struct bnx2x *bp; 12044 struct bnx2x *bp;
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 3f7b1c309c6..78ea90c40e1 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -14873,8 +14873,7 @@ static bool tg3_10_100_only_device(struct tg3 *tp,
14873 return false; 14873 return false;
14874} 14874}
14875 14875
14876static int tg3_get_invariants(struct tg3 *tp, 14876static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent)
14877 const struct pci_device_id *ent)
14878{ 14877{
14879 u32 misc_ctrl_reg; 14878 u32 misc_ctrl_reg;
14880 u32 pci_state_reg, grc_misc_cfg; 14879 u32 pci_state_reg, grc_misc_cfg;
diff --git a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
index 5f60623dd7f..c8fdeaae56c 100644
--- a/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
+++ b/drivers/net/ethernet/chelsio/cxgb/cxgb2.c
@@ -974,8 +974,7 @@ static const struct net_device_ops cxgb_netdev_ops = {
974#endif 974#endif
975}; 975};
976 976
977static int init_one(struct pci_dev *pdev, 977static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
978 const struct pci_device_id *ent)
979{ 978{
980 static int version_printed; 979 static int version_printed;
981 980
diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c
index 5328804779f..d84872e8817 100644
--- a/drivers/net/ethernet/chelsio/cxgb/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb/sge.c
@@ -2059,8 +2059,7 @@ static void espibug_workaround(unsigned long data)
2059/* 2059/*
2060 * Creates a t1_sge structure and returns suggested resource parameters. 2060 * Creates a t1_sge structure and returns suggested resource parameters.
2061 */ 2061 */
2062struct sge *t1_sge_create(struct adapter *adapter, 2062struct sge *t1_sge_create(struct adapter *adapter, struct sge_params *p)
2063 struct sge_params *p)
2064{ 2063{
2065 struct sge *sge = kzalloc(sizeof(*sge), GFP_KERNEL); 2064 struct sge *sge = kzalloc(sizeof(*sge), GFP_KERNEL);
2066 int i; 2065 int i;
diff --git a/drivers/net/ethernet/chelsio/cxgb/subr.c b/drivers/net/ethernet/chelsio/cxgb/subr.c
index 9527dc196f8..e0a03a31e7c 100644
--- a/drivers/net/ethernet/chelsio/cxgb/subr.c
+++ b/drivers/net/ethernet/chelsio/cxgb/subr.c
@@ -893,7 +893,7 @@ static void power_sequence_xpak(adapter_t* adapter)
893} 893}
894 894
895int t1_get_board_rev(adapter_t *adapter, const struct board_info *bi, 895int t1_get_board_rev(adapter_t *adapter, const struct board_info *bi,
896 struct adapter_params *p) 896 struct adapter_params *p)
897{ 897{
898 p->chip_version = bi->chip_term; 898 p->chip_version = bi->chip_term;
899 p->is_asic = (p->chip_version != CHBT_TERM_FPGA); 899 p->is_asic = (p->chip_version != CHBT_TERM_FPGA);
@@ -1029,7 +1029,7 @@ void t1_free_sw_modules(adapter_t *adapter)
1029} 1029}
1030 1030
1031static void init_link_config(struct link_config *lc, 1031static void init_link_config(struct link_config *lc,
1032 const struct board_info *bi) 1032 const struct board_info *bi)
1033{ 1033{
1034 lc->supported = bi->caps; 1034 lc->supported = bi->caps;
1035 lc->requested_speed = lc->speed = SPEED_INVALID; 1035 lc->requested_speed = lc->speed = SPEED_INVALID;
@@ -1049,8 +1049,7 @@ static void init_link_config(struct link_config *lc,
1049 * Allocate and initialize the data structures that hold the SW state of 1049 * Allocate and initialize the data structures that hold the SW state of
1050 * the Terminator HW modules. 1050 * the Terminator HW modules.
1051 */ 1051 */
1052int t1_init_sw_modules(adapter_t *adapter, 1052int t1_init_sw_modules(adapter_t *adapter, const struct board_info *bi)
1053 const struct board_info *bi)
1054{ 1053{
1055 unsigned int i; 1054 unsigned int i;
1056 1055
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
index 4aa3b21c6f7..f15ee326d5c 100644
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -3108,8 +3108,7 @@ static int cxgb_enable_msix(struct adapter *adap)
3108 return err; 3108 return err;
3109} 3109}
3110 3110
3111static void print_port_info(struct adapter *adap, 3111static void print_port_info(struct adapter *adap, const struct adapter_info *ai)
3112 const struct adapter_info *ai)
3113{ 3112{
3114 static const char *pci_variant[] = { 3113 static const char *pci_variant[] = {
3115 "PCI", "PCI-X", "PCI-X ECC", "PCI-X 266", "PCI Express" 3114 "PCI", "PCI-X", "PCI-X ECC", "PCI-X 266", "PCI Express"
@@ -3176,8 +3175,7 @@ static void cxgb3_init_iscsi_mac(struct net_device *dev)
3176#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN) 3175#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN)
3177#define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \ 3176#define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \
3178 NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA) 3177 NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)
3179static int init_one(struct pci_dev *pdev, 3178static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
3180 const struct pci_device_id *ent)
3181{ 3179{
3182 static int version_printed; 3180 static int version_printed;
3183 3181
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index bef893d4c68..130dd9d5b49 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -2149,7 +2149,7 @@ static const struct file_operations mem_debugfs_fops = {
2149}; 2149};
2150 2150
2151static void add_debugfs_mem(struct adapter *adap, const char *name, 2151static void add_debugfs_mem(struct adapter *adap, const char *name,
2152 unsigned int idx, unsigned int size_mb) 2152 unsigned int idx, unsigned int size_mb)
2153{ 2153{
2154 struct dentry *de; 2154 struct dentry *de;
2155 2155
@@ -4419,8 +4419,7 @@ static void free_some_resources(struct adapter *adapter)
4419#define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \ 4419#define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \
4420 NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA) 4420 NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)
4421 4421
4422static int init_one(struct pci_dev *pdev, 4422static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
4423 const struct pci_device_id *ent)
4424{ 4423{
4425 int func, i, err; 4424 int func, i, err;
4426 struct port_info *pi; 4425 struct port_info *pi;
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 8ea773630d1..45f2bea2e92 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -3440,8 +3440,7 @@ int t4_handle_fw_rpl(struct adapter *adap, const __be64 *rpl)
3440 return 0; 3440 return 0;
3441} 3441}
3442 3442
3443static void get_pci_mode(struct adapter *adapter, 3443static void get_pci_mode(struct adapter *adapter, struct pci_params *p)
3444 struct pci_params *p)
3445{ 3444{
3446 u16 val; 3445 u16 val;
3447 3446
@@ -3460,8 +3459,7 @@ static void get_pci_mode(struct adapter *adapter,
3460 * Initializes the SW state maintained for each link, including the link's 3459 * Initializes the SW state maintained for each link, including the link's
3461 * capabilities and default speed/flow-control/autonegotiation settings. 3460 * capabilities and default speed/flow-control/autonegotiation settings.
3462 */ 3461 */
3463static void init_link_config(struct link_config *lc, 3462static void init_link_config(struct link_config *lc, unsigned int caps)
3464 unsigned int caps)
3465{ 3463{
3466 lc->supported = caps; 3464 lc->supported = caps;
3467 lc->requested_speed = 0; 3465 lc->requested_speed = 0;
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index f866eb5e35d..0188df70571 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -2463,7 +2463,7 @@ static const struct net_device_ops cxgb4vf_netdev_ops = {
2463 * the PF Driver ... 2463 * the PF Driver ...
2464 */ 2464 */
2465static int cxgb4vf_pci_probe(struct pci_dev *pdev, 2465static int cxgb4vf_pci_probe(struct pci_dev *pdev,
2466 const struct pci_device_id *ent) 2466 const struct pci_device_id *ent)
2467{ 2467{
2468 static int version_printed; 2468 static int version_printed;
2469 2469
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
index 9b70cccf843..7127c7b9efd 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c
@@ -253,8 +253,7 @@ static int hash_mac_addr(const u8 *addr)
253 * Initializes the SW state maintained for each link, including the link's 253 * Initializes the SW state maintained for each link, including the link's
254 * capabilities and default speed/flow-control/autonegotiation settings. 254 * capabilities and default speed/flow-control/autonegotiation settings.
255 */ 255 */
256static void init_link_config(struct link_config *lc, 256static void init_link_config(struct link_config *lc, unsigned int caps)
257 unsigned int caps)
258{ 257{
259 lc->supported = caps; 258 lc->supported = caps;
260 lc->requested_speed = 0; 259 lc->requested_speed = 0;
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index 930f03bd126..64866ff1aea 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -2275,8 +2275,7 @@ static void enic_iounmap(struct enic *enic)
2275 iounmap(enic->bar[i].vaddr); 2275 iounmap(enic->bar[i].vaddr);
2276} 2276}
2277 2277
2278static int enic_probe(struct pci_dev *pdev, 2278static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2279 const struct pci_device_id *ent)
2280{ 2279{
2281 struct device *dev = &pdev->dev; 2280 struct device *dev = &pdev->dev;
2282 struct net_device *netdev; 2281 struct net_device *netdev;
diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c
index 0918e3879ab..eaab73cf27c 100644
--- a/drivers/net/ethernet/dec/tulip/de2104x.c
+++ b/drivers/net/ethernet/dec/tulip/de2104x.c
@@ -1962,8 +1962,7 @@ static const struct net_device_ops de_netdev_ops = {
1962 .ndo_validate_addr = eth_validate_addr, 1962 .ndo_validate_addr = eth_validate_addr,
1963}; 1963};
1964 1964
1965static int de_init_one(struct pci_dev *pdev, 1965static int de_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
1966 const struct pci_device_id *ent)
1967{ 1966{
1968 struct net_device *dev; 1967 struct net_device *dev;
1969 struct de_private *de; 1968 struct de_private *de;
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index c411aedd8e6..4c830030fb0 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -2104,7 +2104,7 @@ static struct eisa_driver de4x5_eisa_driver = {
2104 .driver = { 2104 .driver = {
2105 .name = "de4x5", 2105 .name = "de4x5",
2106 .probe = de4x5_eisa_probe, 2106 .probe = de4x5_eisa_probe,
2107 .remove = de4x5_eisa_remove, 2107 .remove = de4x5_eisa_remove,
2108 } 2108 }
2109}; 2109};
2110MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids); 2110MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c
index 56a8fe7d4ef..83139307861 100644
--- a/drivers/net/ethernet/dec/tulip/dmfe.c
+++ b/drivers/net/ethernet/dec/tulip/dmfe.c
@@ -367,8 +367,7 @@ static const struct net_device_ops netdev_ops = {
367 * Search DM910X board ,allocate space and register it 367 * Search DM910X board ,allocate space and register it
368 */ 368 */
369 369
370static int dmfe_init_one(struct pci_dev *pdev, 370static int dmfe_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
371 const struct pci_device_id *ent)
372{ 371{
373 struct dmfe_board_info *db; /* board information structure */ 372 struct dmfe_board_info *db; /* board information structure */
374 struct net_device *dev; 373 struct net_device *dev;
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index 157c8e6e93f..1e9443d9fb5 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -1191,8 +1191,7 @@ static void set_rx_mode(struct net_device *dev)
1191} 1191}
1192 1192
1193#ifdef CONFIG_TULIP_MWI 1193#ifdef CONFIG_TULIP_MWI
1194static void tulip_mwi_config(struct pci_dev *pdev, 1194static void tulip_mwi_config(struct pci_dev *pdev, struct net_device *dev)
1195 struct net_device *dev)
1196{ 1195{
1197 struct tulip_private *tp = netdev_priv(dev); 1196 struct tulip_private *tp = netdev_priv(dev);
1198 u8 cache; 1197 u8 cache;
@@ -1301,8 +1300,7 @@ DEFINE_PCI_DEVICE_TABLE(early_486_chipsets) = {
1301 { }, 1300 { },
1302}; 1301};
1303 1302
1304static int tulip_init_one(struct pci_dev *pdev, 1303static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
1305 const struct pci_device_id *ent)
1306{ 1304{
1307 struct tulip_private *tp; 1305 struct tulip_private *tp;
1308 /* See note below on the multiport cards. */ 1306 /* See note below on the multiport cards. */
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
index 0a1bda857e7..c7b04ecf5b4 100644
--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
@@ -358,8 +358,7 @@ static const struct net_device_ops netdev_ops = {
358 .ndo_validate_addr = eth_validate_addr, 358 .ndo_validate_addr = eth_validate_addr,
359}; 359};
360 360
361static int w840_probe1(struct pci_dev *pdev, 361static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)
362 const struct pci_device_id *ent)
363{ 362{
364 struct net_device *dev; 363 struct net_device *dev;
365 struct netdev_private *np; 364 struct netdev_private *np;
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index b003abc2422..f95612b907a 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3994,8 +3994,7 @@ static inline char *func_name(struct be_adapter *adapter)
3994 return be_physfn(adapter) ? "PF" : "VF"; 3994 return be_physfn(adapter) ? "PF" : "VF";
3995} 3995}
3996 3996
3997static int be_probe(struct pci_dev *pdev, 3997static int be_probe(struct pci_dev *pdev, const struct pci_device_id *pdev_id)
3998 const struct pci_device_id *pdev_id)
3999{ 3998{
4000 int status = 0; 3999 int status = 0;
4001 struct be_adapter *adapter; 4000 struct be_adapter *adapter;
diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
index 519c2895e8f..c706b7a9397 100644
--- a/drivers/net/ethernet/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c
@@ -478,7 +478,7 @@ static const struct net_device_ops netdev_ops = {
478}; 478};
479 479
480static int fealnx_init_one(struct pci_dev *pdev, 480static int fealnx_init_one(struct pci_dev *pdev,
481 const struct pci_device_id *ent) 481 const struct pci_device_id *ent)
482{ 482{
483 struct netdev_private *np; 483 struct netdev_private *np;
484 int i, option, err, irq; 484 int i, option, err, irq;
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
index 3f35b6a983e..2bafbd37c24 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
@@ -108,8 +108,7 @@ static struct mdiobb_ops bb_ops = {
108 .get_mdio_data = mdio_read, 108 .get_mdio_data = mdio_read,
109}; 109};
110 110
111static int fs_mii_bitbang_init(struct mii_bus *bus, 111static int fs_mii_bitbang_init(struct mii_bus *bus, struct device_node *np)
112 struct device_node *np)
113{ 112{
114 struct resource res; 113 struct resource res;
115 const u32 *data; 114 const u32 *data;
diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/net/ethernet/hp/hp100.c
index 598e576ddf5..e3c7c697fc4 100644
--- a/drivers/net/ethernet/hp/hp100.c
+++ b/drivers/net/ethernet/hp/hp100.c
@@ -447,8 +447,8 @@ static const struct net_device_ops hp100_netdev_ops = {
447 .ndo_validate_addr = eth_validate_addr, 447 .ndo_validate_addr = eth_validate_addr,
448}; 448};
449 449
450static int hp100_probe1(struct net_device *dev, int ioaddr, 450static int hp100_probe1(struct net_device *dev, int ioaddr, u_char bus,
451 u_char bus, struct pci_dev *pci_dev) 451 struct pci_dev *pci_dev)
452{ 452{
453 int i; 453 int i;
454 int err = -ENODEV; 454 int err = -ENODEV;
@@ -2878,7 +2878,7 @@ static struct eisa_driver hp100_eisa_driver = {
2878 .driver = { 2878 .driver = {
2879 .name = "hp100", 2879 .name = "hp100",
2880 .probe = hp100_eisa_probe, 2880 .probe = hp100_eisa_probe,
2881 .remove = hp100_eisa_remove, 2881 .remove = hp100_eisa_remove,
2882 } 2882 }
2883}; 2883};
2884#endif 2884#endif
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index e238130574c..19b64de7124 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -99,7 +99,7 @@ static struct ehea_bcmc_reg_array ehea_bcmc_regs;
99 99
100 100
101static int ehea_probe_adapter(struct platform_device *dev, 101static int ehea_probe_adapter(struct platform_device *dev,
102 const struct of_device_id *id); 102 const struct of_device_id *id);
103 103
104static int ehea_remove(struct platform_device *dev); 104static int ehea_remove(struct platform_device *dev);
105 105
@@ -3258,7 +3258,7 @@ static void ehea_remove_device_sysfs(struct platform_device *dev)
3258} 3258}
3259 3259
3260static int ehea_probe_adapter(struct platform_device *dev, 3260static int ehea_probe_adapter(struct platform_device *dev,
3261 const struct of_device_id *id) 3261 const struct of_device_id *id)
3262{ 3262{
3263 struct ehea_adapter *adapter; 3263 struct ehea_adapter *adapter;
3264 const u64 *adapter_handle; 3264 const u64 *adapter_handle;
diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index c791ad3907b..256bdb8e199 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -2262,7 +2262,7 @@ struct emac_depentry {
2262#define EMAC_DEP_COUNT 6 2262#define EMAC_DEP_COUNT 6
2263 2263
2264static int emac_check_deps(struct emac_instance *dev, 2264static int emac_check_deps(struct emac_instance *dev,
2265 struct emac_depentry *deps) 2265 struct emac_depentry *deps)
2266{ 2266{
2267 int i, there = 0; 2267 int i, there = 0;
2268 struct device_node *np; 2268 struct device_node *np;
@@ -2314,8 +2314,8 @@ static void emac_put_deps(struct emac_instance *dev)
2314 of_dev_put(dev->tah_dev); 2314 of_dev_put(dev->tah_dev);
2315} 2315}
2316 2316
2317static int emac_of_bus_notify(struct notifier_block *nb, 2317static int emac_of_bus_notify(struct notifier_block *nb, unsigned long action,
2318 unsigned long action, void *data) 2318 void *data)
2319{ 2319{
2320 /* We are only intereted in device addition */ 2320 /* We are only intereted in device addition */
2321 if (action == BUS_NOTIFY_BOUND_DRIVER) 2321 if (action == BUS_NOTIFY_BOUND_DRIVER)
@@ -2368,7 +2368,7 @@ static int emac_wait_deps(struct emac_instance *dev)
2368} 2368}
2369 2369
2370static int emac_read_uint_prop(struct device_node *np, const char *name, 2370static int emac_read_uint_prop(struct device_node *np, const char *name,
2371 u32 *val, int fatal) 2371 u32 *val, int fatal)
2372{ 2372{
2373 int len; 2373 int len;
2374 const u32 *prop = of_get_property(np, name, &len); 2374 const u32 *prop = of_get_property(np, name, &len);
diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c
index 8becaaf6eb5..50ea12bfb57 100644
--- a/drivers/net/ethernet/ibm/emac/mal.c
+++ b/drivers/net/ethernet/ibm/emac/mal.c
@@ -33,8 +33,7 @@
33 33
34static int mal_count; 34static int mal_count;
35 35
36int mal_register_commac(struct mal_instance *mal, 36int mal_register_commac(struct mal_instance *mal, struct mal_commac *commac)
37 struct mal_commac *commac)
38{ 37{
39 unsigned long flags; 38 unsigned long flags;
40 39
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index 35485f2c144..f2fdbb79837 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1324,8 +1324,7 @@ static const struct net_device_ops ibmveth_netdev_ops = {
1324#endif 1324#endif
1325}; 1325};
1326 1326
1327static int ibmveth_probe(struct vio_dev *dev, 1327static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id)
1328 const struct vio_device_id *id)
1329{ 1328{
1330 int rc, i; 1329 int rc, i;
1331 struct net_device *netdev; 1330 struct net_device *netdev;
diff --git a/drivers/net/ethernet/icplus/ipg.c b/drivers/net/ethernet/icplus/ipg.c
index f80ae745908..068d7815165 100644
--- a/drivers/net/ethernet/icplus/ipg.c
+++ b/drivers/net/ethernet/icplus/ipg.c
@@ -2199,8 +2199,7 @@ static const struct net_device_ops ipg_netdev_ops = {
2199 .ndo_validate_addr = eth_validate_addr, 2199 .ndo_validate_addr = eth_validate_addr,
2200}; 2200};
2201 2201
2202static int ipg_probe(struct pci_dev *pdev, 2202static int ipg_probe(struct pci_dev *pdev, const struct pci_device_id *id)
2203 const struct pci_device_id *id)
2204{ 2203{
2205 unsigned int i = id->driver_data; 2204 unsigned int i = id->driver_data;
2206 struct ipg_nic_private *sp; 2205 struct ipg_nic_private *sp;
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index 50c20509862..a59f0779e1c 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2829,8 +2829,7 @@ static const struct net_device_ops e100_netdev_ops = {
2829 .ndo_set_features = e100_set_features, 2829 .ndo_set_features = e100_set_features,
2830}; 2830};
2831 2831
2832static int e100_probe(struct pci_dev *pdev, 2832static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2833 const struct pci_device_id *ent)
2834{ 2833{
2835 struct net_device *netdev; 2834 struct net_device *netdev;
2836 struct nic *nic; 2835 struct nic *nic;
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 840fb0d3903..294da56b824 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -938,8 +938,7 @@ static int e1000_init_hw_struct(struct e1000_adapter *adapter,
938 * The OS initialization, configuring of the adapter private structure, 938 * The OS initialization, configuring of the adapter private structure,
939 * and a hardware reset occur. 939 * and a hardware reset occur.
940 **/ 940 **/
941static int e1000_probe(struct pci_dev *pdev, 941static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
942 const struct pci_device_id *ent)
943{ 942{
944 struct net_device *netdev; 943 struct net_device *netdev;
945 struct e1000_adapter *adapter; 944 struct e1000_adapter *adapter;
diff --git a/drivers/net/ethernet/intel/e1000/e1000_param.c b/drivers/net/ethernet/intel/e1000/e1000_param.c
index 4e19aa0657f..750fc0194f3 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_param.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_param.c
@@ -206,8 +206,8 @@ struct e1000_option {
206}; 206};
207 207
208static int e1000_validate_option(unsigned int *value, 208static int e1000_validate_option(unsigned int *value,
209 const struct e1000_option *opt, 209 const struct e1000_option *opt,
210 struct e1000_adapter *adapter) 210 struct e1000_adapter *adapter)
211{ 211{
212 if (*value == OPTION_UNSET) { 212 if (*value == OPTION_UNSET) {
213 *value = opt->def; 213 *value = opt->def;
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 829e81471ae..fbf75fdca99 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6024,8 +6024,7 @@ static const struct net_device_ops e1000e_netdev_ops = {
6024 * The OS initialization, configuring of the adapter private structure, 6024 * The OS initialization, configuring of the adapter private structure,
6025 * and a hardware reset occur. 6025 * and a hardware reset occur.
6026 **/ 6026 **/
6027static int e1000_probe(struct pci_dev *pdev, 6027static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
6028 const struct pci_device_id *ent)
6029{ 6028{
6030 struct net_device *netdev; 6029 struct net_device *netdev;
6031 struct e1000_adapter *adapter; 6030 struct e1000_adapter *adapter;
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index b3beed2232f..89d536dd7ff 100644
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -173,8 +173,8 @@ struct e1000_option {
173}; 173};
174 174
175static int e1000_validate_option(unsigned int *value, 175static int e1000_validate_option(unsigned int *value,
176 const struct e1000_option *opt, 176 const struct e1000_option *opt,
177 struct e1000_adapter *adapter) 177 struct e1000_adapter *adapter)
178{ 178{
179 if (*value == OPTION_UNSET) { 179 if (*value == OPTION_UNSET) {
180 *value = opt->def; 180 *value = opt->def;
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 06513d9e9fb..31cfe2ec75d 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -1833,8 +1833,7 @@ void igb_set_fw_version(struct igb_adapter *adapter)
1833 * The OS initialization, configuring of the adapter private structure, 1833 * The OS initialization, configuring of the adapter private structure,
1834 * and a hardware reset occur. 1834 * and a hardware reset occur.
1835 **/ 1835 **/
1836static int igb_probe(struct pci_dev *pdev, 1836static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1837 const struct pci_device_id *ent)
1838{ 1837{
1839 struct net_device *netdev; 1838 struct net_device *netdev;
1840 struct igb_adapter *adapter; 1839 struct igb_adapter *adapter;
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index b494309ee94..277f5dfe3d9 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -2618,8 +2618,7 @@ static const struct net_device_ops igbvf_netdev_ops = {
2618 * The OS initialization, configuring of the adapter private structure, 2618 * The OS initialization, configuring of the adapter private structure,
2619 * and a hardware reset occur. 2619 * and a hardware reset occur.
2620 **/ 2620 **/
2621static int igbvf_probe(struct pci_dev *pdev, 2621static int igbvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
2622 const struct pci_device_id *ent)
2623{ 2622{
2624 struct net_device *netdev; 2623 struct net_device *netdev;
2625 struct igbvf_adapter *adapter; 2624 struct igbvf_adapter *adapter;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index fb165b6ffad..20a5af6d87d 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7186,8 +7186,7 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id,
7186 * The OS initialization, configuring of the adapter private structure, 7186 * The OS initialization, configuring of the adapter private structure,
7187 * and a hardware reset occur. 7187 * and a hardware reset occur.
7188 **/ 7188 **/
7189static int ixgbe_probe(struct pci_dev *pdev, 7189static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
7190 const struct pci_device_id *ent)
7191{ 7190{
7192 struct net_device *netdev; 7191 struct net_device *netdev;
7193 struct ixgbe_adapter *adapter = NULL; 7192 struct ixgbe_adapter *adapter = NULL;
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 1e2f02ac268..257357ae66c 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -3242,8 +3242,7 @@ static void ixgbevf_assign_netdev_ops(struct net_device *dev)
3242 * The OS initialization, configuring of the adapter private structure, 3242 * The OS initialization, configuring of the adapter private structure,
3243 * and a hardware reset occur. 3243 * and a hardware reset occur.
3244 **/ 3244 **/
3245static int ixgbevf_probe(struct pci_dev *pdev, 3245static int ixgbevf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3246 const struct pci_device_id *ent)
3247{ 3246{
3248 struct net_device *netdev; 3247 struct net_device *netdev;
3249 struct ixgbevf_adapter *adapter = NULL; 3248 struct ixgbevf_adapter *adapter = NULL;
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 3d66e959a0c..5544a1fe2f9 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c
@@ -3869,8 +3869,7 @@ static void skge_show_addr(struct net_device *dev)
3869 3869
3870static int only_32bit_dma; 3870static int only_32bit_dma;
3871 3871
3872static int skge_probe(struct pci_dev *pdev, 3872static int skge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3873 const struct pci_device_id *ent)
3874{ 3873{
3875 struct net_device *dev, *dev1; 3874 struct net_device *dev, *dev1;
3876 struct skge_hw *hw; 3875 struct skge_hw *hw;
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 6ddfbcae780..3269eb38cc5 100644
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -4741,9 +4741,8 @@ static const struct net_device_ops sky2_netdev_ops[2] = {
4741}; 4741};
4742 4742
4743/* Initialize network device */ 4743/* Initialize network device */
4744static struct net_device *sky2_init_netdev(struct sky2_hw *hw, 4744static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port,
4745 unsigned port, 4745 int highmem, int wol)
4746 int highmem, int wol)
4747{ 4746{
4748 struct sky2_port *sky2; 4747 struct sky2_port *sky2;
4749 struct net_device *dev = alloc_etherdev(sizeof(*sky2)); 4748 struct net_device *dev = alloc_etherdev(sizeof(*sky2));
@@ -4896,8 +4895,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz)
4896 return buf; 4895 return buf;
4897} 4896}
4898 4897
4899static int sky2_probe(struct pci_dev *pdev, 4898static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
4900 const struct pci_device_id *ent)
4901{ 4899{
4902 struct net_device *dev, *dev1; 4900 struct net_device *dev, *dev1;
4903 struct sky2_hw *hw; 4901 struct sky2_hw *hw;
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 340551eebed..200cc0ec805 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -2224,8 +2224,7 @@ err_disable_pdev:
2224 return err; 2224 return err;
2225} 2225}
2226 2226
2227static int mlx4_init_one(struct pci_dev *pdev, 2227static int mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
2228 const struct pci_device_id *id)
2229{ 2228{
2230 printk_once(KERN_INFO "%s", mlx4_version); 2229 printk_once(KERN_INFO "%s", mlx4_version);
2231 2230
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index f3f09b18a70..093d594435e 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -6919,8 +6919,7 @@ static void read_other_addr(struct ksz_hw *hw)
6919#define PCI_VENDOR_ID_MICREL_KS 0x16c6 6919#define PCI_VENDOR_ID_MICREL_KS 0x16c6
6920#endif 6920#endif
6921 6921
6922static int pcidev_init(struct pci_dev *pdev, 6922static int pcidev_init(struct pci_dev *pdev, const struct pci_device_id *id)
6923 const struct pci_device_id *id)
6924{ 6923{
6925 struct net_device *dev; 6924 struct net_device *dev;
6926 struct dev_priv *priv; 6925 struct dev_priv *priv;
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index eaddbb7c24a..0ffde69c8d0 100644
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -421,8 +421,7 @@ static int mac_onboard_sonic_probe(struct net_device *dev)
421} 421}
422 422
423static int mac_nubus_sonic_ethernet_addr(struct net_device *dev, 423static int mac_nubus_sonic_ethernet_addr(struct net_device *dev,
424 unsigned long prom_addr, 424 unsigned long prom_addr, int id)
425 int id)
426{ 425{
427 int i; 426 int i;
428 for(i = 0; i < 6; i++) 427 for(i = 0; i < 6; i++)
diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c
index 77f7cd37ad3..f4ad60c97ea 100644
--- a/drivers/net/ethernet/natsemi/natsemi.c
+++ b/drivers/net/ethernet/natsemi/natsemi.c
@@ -797,8 +797,7 @@ static const struct net_device_ops natsemi_netdev_ops = {
797#endif 797#endif
798}; 798};
799 799
800static int natsemi_probe1(struct pci_dev *pdev, 800static int natsemi_probe1(struct pci_dev *pdev, const struct pci_device_id *ent)
801 const struct pci_device_id *ent)
802{ 801{
803 struct net_device *dev; 802 struct net_device *dev;
804 struct netdev_private *np; 803 struct netdev_private *np;
diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c
index 0281755200a..77c070de621 100644
--- a/drivers/net/ethernet/natsemi/ns83820.c
+++ b/drivers/net/ethernet/natsemi/ns83820.c
@@ -1942,7 +1942,7 @@ static const struct net_device_ops netdev_ops = {
1942}; 1942};
1943 1943
1944static int ns83820_init_one(struct pci_dev *pci_dev, 1944static int ns83820_init_one(struct pci_dev *pci_dev,
1945 const struct pci_device_id *id) 1945 const struct pci_device_id *id)
1946{ 1946{
1947 struct net_device *ndev; 1947 struct net_device *ndev;
1948 struct ns83820 *dev; 1948 struct ns83820 *dev;
diff --git a/drivers/net/ethernet/neterion/s2io.h b/drivers/net/ethernet/neterion/s2io.h
index 032f9b6d850..d89b6ed82c5 100644
--- a/drivers/net/ethernet/neterion/s2io.h
+++ b/drivers/net/ethernet/neterion/s2io.h
@@ -1075,8 +1075,7 @@ static inline void SPECIAL_REG_WRITE(u64 val, void __iomem *addr, int order)
1075/* 1075/*
1076 * Prototype declaration. 1076 * Prototype declaration.
1077 */ 1077 */
1078static int s2io_init_nic(struct pci_dev *pdev, 1078static int s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre);
1079 const struct pci_device_id *pre);
1080static void s2io_rem_nic(struct pci_dev *pdev); 1079static void s2io_rem_nic(struct pci_dev *pdev);
1081static int init_shared_mem(struct s2io_nic *sp); 1080static int init_shared_mem(struct s2io_nic *sp);
1082static void free_shared_mem(struct s2io_nic *sp); 1081static void free_shared_mem(struct s2io_nic *sp);
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index bb5770fc650..7c87105ca04 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -3372,9 +3372,8 @@ static const struct net_device_ops vxge_netdev_ops = {
3372}; 3372};
3373 3373
3374static int vxge_device_register(struct __vxge_hw_device *hldev, 3374static int vxge_device_register(struct __vxge_hw_device *hldev,
3375 struct vxge_config *config, 3375 struct vxge_config *config, int high_dma,
3376 int high_dma, int no_of_vpath, 3376 int no_of_vpath, struct vxgedev **vdev_out)
3377 struct vxgedev **vdev_out)
3378{ 3377{
3379 struct net_device *ndev; 3378 struct net_device *ndev;
3380 enum vxge_hw_status status = VXGE_HW_OK; 3379 enum vxge_hw_status status = VXGE_HW_OK;
@@ -3672,9 +3671,8 @@ static void verify_bandwidth(void)
3672/* 3671/*
3673 * Vpath configuration 3672 * Vpath configuration
3674 */ 3673 */
3675static int vxge_config_vpaths( 3674static int vxge_config_vpaths(struct vxge_hw_device_config *device_config,
3676 struct vxge_hw_device_config *device_config, 3675 u64 vpath_mask, struct vxge_config *config_param)
3677 u64 vpath_mask, struct vxge_config *config_param)
3678{ 3676{
3679 int i, no_of_vpaths = 0, default_no_vpath = 0, temp; 3677 int i, no_of_vpaths = 0, default_no_vpath = 0, temp;
3680 u32 txdl_size, txdl_per_memblock; 3678 u32 txdl_size, txdl_per_memblock;
@@ -3859,9 +3857,8 @@ static int vxge_config_vpaths(
3859} 3857}
3860 3858
3861/* initialize device configuratrions */ 3859/* initialize device configuratrions */
3862static void vxge_device_config_init( 3860static void vxge_device_config_init(struct vxge_hw_device_config *device_config,
3863 struct vxge_hw_device_config *device_config, 3861 int *intr_type)
3864 int *intr_type)
3865{ 3862{
3866 /* Used for CQRQ/SRQ. */ 3863 /* Used for CQRQ/SRQ. */
3867 device_config->dma_blockpool_initial = 3864 device_config->dma_blockpool_initial =
diff --git a/drivers/net/ethernet/packetengines/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c
index 2800c449de4..fbaed4fa72f 100644
--- a/drivers/net/ethernet/packetengines/yellowfin.c
+++ b/drivers/net/ethernet/packetengines/yellowfin.c
@@ -368,7 +368,7 @@ static const struct net_device_ops netdev_ops = {
368}; 368};
369 369
370static int yellowfin_init_one(struct pci_dev *pdev, 370static int yellowfin_init_one(struct pci_dev *pdev,
371 const struct pci_device_id *ent) 371 const struct pci_device_id *ent)
372{ 372{
373 struct net_device *dev; 373 struct net_device *dev;
374 struct yellowfin_private *np; 374 struct yellowfin_private *np;
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
index df6eb27fa10..67a679aaf29 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -3770,7 +3770,7 @@ static const struct net_device_ops ql3xxx_netdev_ops = {
3770}; 3770};
3771 3771
3772static int ql3xxx_probe(struct pci_dev *pdev, 3772static int ql3xxx_probe(struct pci_dev *pdev,
3773 const struct pci_device_id *pci_entry) 3773 const struct pci_device_id *pci_entry)
3774{ 3774{
3775 struct net_device *ndev = NULL; 3775 struct net_device *ndev = NULL;
3776 struct ql3_adapter *qdev = NULL; 3776 struct ql3_adapter *qdev = NULL;
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 8d58092bd06..a7554d9aab0 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -54,8 +54,7 @@ static int qlcnic_config_npars;
54module_param(qlcnic_config_npars, int, 0444); 54module_param(qlcnic_config_npars, int, 0444);
55MODULE_PARM_DESC(qlcnic_config_npars, "Configure NPARs (0=disabled, 1=enabled"); 55MODULE_PARM_DESC(qlcnic_config_npars, "Configure NPARs (0=disabled, 1=enabled");
56 56
57static int qlcnic_probe(struct pci_dev *pdev, 57static int qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
58 const struct pci_device_id *ent);
59static void qlcnic_remove(struct pci_dev *pdev); 58static void qlcnic_remove(struct pci_dev *pdev);
60static int qlcnic_open(struct net_device *netdev); 59static int qlcnic_open(struct net_device *netdev);
61static int qlcnic_close(struct net_device *netdev); 60static int qlcnic_close(struct net_device *netdev);
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index cae881c18f0..f80cd975dae 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -4491,8 +4491,8 @@ static void ql_release_all(struct pci_dev *pdev)
4491 pci_set_drvdata(pdev, NULL); 4491 pci_set_drvdata(pdev, NULL);
4492} 4492}
4493 4493
4494static int ql_init_device(struct pci_dev *pdev, 4494static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev,
4495 struct net_device *ndev, int cards_found) 4495 int cards_found)
4496{ 4496{
4497 struct ql_adapter *qdev = netdev_priv(ndev); 4497 struct ql_adapter *qdev = netdev_priv(ndev);
4498 int err = 0; 4498 int err = 0;
@@ -4657,7 +4657,7 @@ static void ql_timer(unsigned long data)
4657} 4657}
4658 4658
4659static int qlge_probe(struct pci_dev *pdev, 4659static int qlge_probe(struct pci_dev *pdev,
4660 const struct pci_device_id *pci_entry) 4660 const struct pci_device_id *pci_entry)
4661{ 4661{
4662 struct net_device *ndev = NULL; 4662 struct net_device *ndev = NULL;
4663 struct ql_adapter *qdev = NULL; 4663 struct ql_adapter *qdev = NULL;
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index ae27e4463f9..63c13125db6 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -1073,8 +1073,7 @@ static int r6040_mii_probe(struct net_device *dev)
1073 return 0; 1073 return 0;
1074} 1074}
1075 1075
1076static int r6040_init_one(struct pci_dev *pdev, 1076static int r6040_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
1077 const struct pci_device_id *ent)
1078{ 1077{
1079 struct net_device *dev; 1078 struct net_device *dev;
1080 struct r6040_private *lp; 1079 struct r6040_private *lp;
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index e95cc7bb2e0..bf57b3cb16a 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -2670,7 +2670,7 @@ static int efx_pci_probe_main(struct efx_nic *efx)
2670 * interfaces is brought up (i.e. efx_net_open). 2670 * interfaces is brought up (i.e. efx_net_open).
2671 */ 2671 */
2672static int efx_pci_probe(struct pci_dev *pci_dev, 2672static int efx_pci_probe(struct pci_dev *pci_dev,
2673 const struct pci_device_id *entry) 2673 const struct pci_device_id *entry)
2674{ 2674{
2675 struct net_device *net_dev; 2675 struct net_device *net_dev;
2676 struct efx_nic *efx; 2676 struct efx_nic *efx;
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index 4b1deec9189..dc171b4961e 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -1229,8 +1229,7 @@ static const struct net_device_ops ioc3_netdev_ops = {
1229 .ndo_change_mtu = eth_change_mtu, 1229 .ndo_change_mtu = eth_change_mtu,
1230}; 1230};
1231 1231
1232static int ioc3_probe(struct pci_dev *pdev, 1232static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1233 const struct pci_device_id *ent)
1234{ 1233{
1235 unsigned int sw_physid1, sw_physid2; 1234 unsigned int sw_physid1, sw_physid2;
1236 struct net_device *dev = NULL; 1235 struct net_device *dev = NULL;
diff --git a/drivers/net/ethernet/silan/sc92031.c b/drivers/net/ethernet/silan/sc92031.c
index 2103449a2df..b2315324cc6 100644
--- a/drivers/net/ethernet/silan/sc92031.c
+++ b/drivers/net/ethernet/silan/sc92031.c
@@ -1395,8 +1395,7 @@ static const struct net_device_ops sc92031_netdev_ops = {
1395#endif 1395#endif
1396}; 1396};
1397 1397
1398static int sc92031_probe(struct pci_dev *pdev, 1398static int sc92031_probe(struct pci_dev *pdev, const struct pci_device_id *id)
1399 const struct pci_device_id *id)
1400{ 1399{
1401 int err; 1400 int err;
1402 void __iomem* port_base; 1401 void __iomem* port_base;
diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
index c114c4f9cea..9a9c379420d 100644
--- a/drivers/net/ethernet/sis/sis190.c
+++ b/drivers/net/ethernet/sis/sis190.c
@@ -1574,7 +1574,7 @@ static void sis190_set_rgmii(struct sis190_private *tp, u8 reg)
1574} 1574}
1575 1575
1576static int sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev, 1576static int sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
1577 struct net_device *dev) 1577 struct net_device *dev)
1578{ 1578{
1579 struct sis190_private *tp = netdev_priv(dev); 1579 struct sis190_private *tp = netdev_priv(dev);
1580 void __iomem *ioaddr = tp->mmio_addr; 1580 void __iomem *ioaddr = tp->mmio_addr;
@@ -1616,7 +1616,7 @@ static int sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
1616 * MAC address is read into @net_dev->dev_addr. 1616 * MAC address is read into @net_dev->dev_addr.
1617 */ 1617 */
1618static int sis190_get_mac_addr_from_apc(struct pci_dev *pdev, 1618static int sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
1619 struct net_device *dev) 1619 struct net_device *dev)
1620{ 1620{
1621 static const u16 ids[] = { 0x0965, 0x0966, 0x0968 }; 1621 static const u16 ids[] = { 0x0965, 0x0966, 0x0968 };
1622 struct sis190_private *tp = netdev_priv(dev); 1622 struct sis190_private *tp = netdev_priv(dev);
@@ -1693,8 +1693,7 @@ static inline void sis190_init_rxfilter(struct net_device *dev)
1693 SIS_PCI_COMMIT(); 1693 SIS_PCI_COMMIT();
1694} 1694}
1695 1695
1696static int sis190_get_mac_addr(struct pci_dev *pdev, 1696static int sis190_get_mac_addr(struct pci_dev *pdev, struct net_device *dev)
1697 struct net_device *dev)
1698{ 1697{
1699 int rc; 1698 int rc;
1700 1699
@@ -1846,7 +1845,7 @@ static const struct net_device_ops sis190_netdev_ops = {
1846}; 1845};
1847 1846
1848static int sis190_init_one(struct pci_dev *pdev, 1847static int sis190_init_one(struct pci_dev *pdev,
1849 const struct pci_device_id *ent) 1848 const struct pci_device_id *ent)
1850{ 1849{
1851 static int printed_version = 0; 1850 static int printed_version = 0;
1852 struct sis190_private *tp; 1851 struct sis190_private *tp;
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c
index 88c6c4243cb..5bffd9749a5 100644
--- a/drivers/net/ethernet/sis/sis900.c
+++ b/drivers/net/ethernet/sis/sis900.c
@@ -435,7 +435,7 @@ static const struct net_device_ops sis900_netdev_ops = {
435 */ 435 */
436 436
437static int sis900_probe(struct pci_dev *pci_dev, 437static int sis900_probe(struct pci_dev *pci_dev,
438 const struct pci_device_id *pci_id) 438 const struct pci_device_id *pci_id)
439{ 439{
440 struct sis900_private *sis_priv; 440 struct sis900_private *sis_priv;
441 struct net_device *net_dev; 441 struct net_device *net_dev;
diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c
index 347cccbeb53..03b256af7ed 100644
--- a/drivers/net/ethernet/smsc/epic100.c
+++ b/drivers/net/ethernet/smsc/epic100.c
@@ -318,8 +318,7 @@ static const struct net_device_ops epic_netdev_ops = {
318 .ndo_validate_addr = eth_validate_addr, 318 .ndo_validate_addr = eth_validate_addr,
319}; 319};
320 320
321static int epic_init_one(struct pci_dev *pdev, 321static int epic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
322 const struct pci_device_id *ent)
323{ 322{
324 static int card_idx = -1; 323 static int card_idx = -1;
325 void __iomem *ioaddr; 324 void __iomem *ioaddr;
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index b085692f389..022b45bc14f 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -1854,7 +1854,7 @@ static int smc_findirq(struct smc_local *lp)
1854 * o GRAB the region 1854 * o GRAB the region
1855 */ 1855 */
1856static int smc_probe(struct net_device *dev, void __iomem *ioaddr, 1856static int smc_probe(struct net_device *dev, void __iomem *ioaddr,
1857 unsigned long irq_flags) 1857 unsigned long irq_flags)
1858{ 1858{
1859 struct smc_local *lp = netdev_priv(dev); 1859 struct smc_local *lp = netdev_priv(dev);
1860 static int version_printed = 0; 1860 static int version_printed = 0;
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index c52a5cefa19..39a7a49d98e 100644
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -1032,7 +1032,7 @@ static int smsc911x_mii_probe(struct net_device *dev)
1032} 1032}
1033 1033
1034static int smsc911x_mii_init(struct platform_device *pdev, 1034static int smsc911x_mii_init(struct platform_device *pdev,
1035 struct net_device *dev) 1035 struct net_device *dev)
1036{ 1036{
1037 struct smsc911x_data *pdata = netdev_priv(dev); 1037 struct smsc911x_data *pdata = netdev_priv(dev);
1038 int err = -ENXIO, i; 1038 int err = -ENXIO, i;
@@ -2296,9 +2296,8 @@ static const struct smsc911x_ops shifted_smsc911x_ops = {
2296}; 2296};
2297 2297
2298#ifdef CONFIG_OF 2298#ifdef CONFIG_OF
2299static int smsc911x_probe_config_dt( 2299static int smsc911x_probe_config_dt(struct smsc911x_platform_config *config,
2300 struct smsc911x_platform_config *config, 2300 struct device_node *np)
2301 struct device_node *np)
2302{ 2301{
2303 const char *mac; 2302 const char *mac;
2304 u32 width = 0; 2303 u32 width = 0;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 5cf9eb6dd65..064eaac9616 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -62,7 +62,7 @@ static void stmmac_default_data(void)
62 * to take "ownership" of the device or an error code(-ve no) otherwise. 62 * to take "ownership" of the device or an error code(-ve no) otherwise.
63 */ 63 */
64static int stmmac_pci_probe(struct pci_dev *pdev, 64static int stmmac_pci_probe(struct pci_dev *pdev,
65 const struct pci_device_id *id) 65 const struct pci_device_id *id)
66{ 66{
67 int ret = 0; 67 int ret = 0;
68 void __iomem *addr = NULL; 68 void __iomem *addr = NULL;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index b77b913df11..b43d68b40e5 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -30,8 +30,8 @@
30 30
31#ifdef CONFIG_OF 31#ifdef CONFIG_OF
32static int stmmac_probe_config_dt(struct platform_device *pdev, 32static int stmmac_probe_config_dt(struct platform_device *pdev,
33 struct plat_stmmacenet_data *plat, 33 struct plat_stmmacenet_data *plat,
34 const char **mac) 34 const char **mac)
35{ 35{
36 struct device_node *np = pdev->dev.of_node; 36 struct device_node *np = pdev->dev.of_node;
37 37
@@ -60,8 +60,8 @@ static int stmmac_probe_config_dt(struct platform_device *pdev,
60} 60}
61#else 61#else
62static int stmmac_probe_config_dt(struct platform_device *pdev, 62static int stmmac_probe_config_dt(struct platform_device *pdev,
63 struct plat_stmmacenet_data *plat, 63 struct plat_stmmacenet_data *plat,
64 const char **mac) 64 const char **mac)
65{ 65{
66 return -ENOSYS; 66 return -ENOSYS;
67} 67}
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index 85f971fe261..4c682a3d042 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -4916,8 +4916,7 @@ static const struct net_device_ops cas_netdev_ops = {
4916#endif 4916#endif
4917}; 4917};
4918 4918
4919static int cas_init_one(struct pci_dev *pdev, 4919static int cas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
4920 const struct pci_device_id *ent)
4921{ 4920{
4922 static int cas_version_printed = 0; 4921 static int cas_version_printed = 0;
4923 unsigned long casreg_len; 4922 unsigned long casreg_len;
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 6023949be3b..a0bdf077946 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -8054,10 +8054,8 @@ static int niu_pci_eeprom_read16_swp(struct niu *np, u32 off)
8054 return val; 8054 return val;
8055} 8055}
8056 8056
8057static int niu_pci_vpd_get_propname(struct niu *np, 8057static int niu_pci_vpd_get_propname(struct niu *np, u32 off, char *namebuf,
8058 u32 off, 8058 int namebuf_len)
8059 char *namebuf,
8060 int namebuf_len)
8061{ 8059{
8062 int i; 8060 int i;
8063 8061
@@ -8102,8 +8100,7 @@ static void niu_vpd_parse_version(struct niu *np)
8102} 8100}
8103 8101
8104/* ESPC_PIO_EN_ENABLE must be set */ 8102/* ESPC_PIO_EN_ENABLE must be set */
8105static int niu_pci_vpd_scan_props(struct niu *np, 8103static int niu_pci_vpd_scan_props(struct niu *np, u32 start, u32 end)
8106 u32 start, u32 end)
8107{ 8104{
8108 unsigned int found_mask = 0; 8105 unsigned int found_mask = 0;
8109#define FOUND_MASK_MODEL 0x00000001 8106#define FOUND_MASK_MODEL 0x00000001
@@ -8279,8 +8276,7 @@ static u32 niu_pci_vpd_offset(struct niu *np)
8279 return 0; 8276 return 0;
8280} 8277}
8281 8278
8282static int niu_phy_type_prop_decode(struct niu *np, 8279static int niu_phy_type_prop_decode(struct niu *np, const char *phy_prop)
8283 const char *phy_prop)
8284{ 8280{
8285 if (!strcmp(phy_prop, "mif")) { 8281 if (!strcmp(phy_prop, "mif")) {
8286 /* 1G copper, MII */ 8282 /* 1G copper, MII */
@@ -8572,10 +8568,8 @@ static int niu_get_and_validate_port(struct niu *np)
8572 return 0; 8568 return 0;
8573} 8569}
8574 8570
8575static int phy_record(struct niu_parent *parent, 8571static int phy_record(struct niu_parent *parent, struct phy_probe_info *p,
8576 struct phy_probe_info *p, 8572 int dev_id_1, int dev_id_2, u8 phy_port, int type)
8577 int dev_id_1, int dev_id_2, u8 phy_port,
8578 int type)
8579{ 8573{
8580 u32 id = (dev_id_1 << 16) | dev_id_2; 8574 u32 id = (dev_id_1 << 16) | dev_id_2;
8581 u8 idx; 8575 u8 idx;
@@ -8670,7 +8664,7 @@ static void niu_n2_divide_channels(struct niu_parent *parent)
8670} 8664}
8671 8665
8672static void niu_divide_channels(struct niu_parent *parent, 8666static void niu_divide_channels(struct niu_parent *parent,
8673 int num_10g, int num_1g) 8667 int num_10g, int num_1g)
8674{ 8668{
8675 int num_ports = parent->num_ports; 8669 int num_ports = parent->num_ports;
8676 int rx_chans_per_10g, rx_chans_per_1g; 8670 int rx_chans_per_10g, rx_chans_per_1g;
@@ -8732,7 +8726,7 @@ static void niu_divide_channels(struct niu_parent *parent,
8732} 8726}
8733 8727
8734static void niu_divide_rdc_groups(struct niu_parent *parent, 8728static void niu_divide_rdc_groups(struct niu_parent *parent,
8735 int num_10g, int num_1g) 8729 int num_10g, int num_1g)
8736{ 8730{
8737 int i, num_ports = parent->num_ports; 8731 int i, num_ports = parent->num_ports;
8738 int rdc_group, rdc_groups_per_port; 8732 int rdc_group, rdc_groups_per_port;
@@ -8776,9 +8770,8 @@ static void niu_divide_rdc_groups(struct niu_parent *parent,
8776 } 8770 }
8777} 8771}
8778 8772
8779static int fill_phy_probe_info(struct niu *np, 8773static int fill_phy_probe_info(struct niu *np, struct niu_parent *parent,
8780 struct niu_parent *parent, 8774 struct phy_probe_info *info)
8781 struct phy_probe_info *info)
8782{ 8775{
8783 unsigned long flags; 8776 unsigned long flags;
8784 int port, err; 8777 int port, err;
@@ -9480,8 +9473,7 @@ static struct device_attribute niu_parent_attributes[] = {
9480}; 9473};
9481 9474
9482static struct niu_parent *niu_new_parent(struct niu *np, 9475static struct niu_parent *niu_new_parent(struct niu *np,
9483 union niu_parent_id *id, 9476 union niu_parent_id *id, u8 ptype)
9484 u8 ptype)
9485{ 9477{
9486 struct platform_device *plat_dev; 9478 struct platform_device *plat_dev;
9487 struct niu_parent *p; 9479 struct niu_parent *p;
@@ -9545,8 +9537,7 @@ fail_unregister:
9545} 9537}
9546 9538
9547static struct niu_parent *niu_get_parent(struct niu *np, 9539static struct niu_parent *niu_get_parent(struct niu *np,
9548 union niu_parent_id *id, 9540 union niu_parent_id *id, u8 ptype)
9549 u8 ptype)
9550{ 9541{
9551 struct niu_parent *p, *tmp; 9542 struct niu_parent *p, *tmp;
9552 int port = np->port; 9543 int port = np->port;
@@ -9670,10 +9661,10 @@ static void niu_driver_version(void)
9670 pr_info("%s", version); 9661 pr_info("%s", version);
9671} 9662}
9672 9663
9673static struct net_device *niu_alloc_and_init( 9664static struct net_device *niu_alloc_and_init(struct device *gen_dev,
9674 struct device *gen_dev, struct pci_dev *pdev, 9665 struct pci_dev *pdev,
9675 struct platform_device *op, const struct niu_ops *ops, 9666 struct platform_device *op,
9676 u8 port) 9667 const struct niu_ops *ops, u8 port)
9677{ 9668{
9678 struct net_device *dev; 9669 struct net_device *dev;
9679 struct niu *np; 9670 struct niu *np;
@@ -9757,7 +9748,7 @@ static void niu_set_basic_features(struct net_device *dev)
9757} 9748}
9758 9749
9759static int niu_pci_init_one(struct pci_dev *pdev, 9750static int niu_pci_init_one(struct pci_dev *pdev,
9760 const struct pci_device_id *ent) 9751 const struct pci_device_id *ent)
9761{ 9752{
9762 union niu_parent_id parent_id; 9753 union niu_parent_id parent_id;
9763 struct net_device *dev; 9754 struct net_device *dev;
diff --git a/drivers/net/ethernet/sun/sunbmac.c b/drivers/net/ethernet/sun/sunbmac.c
index 8fda9100922..be82f6d13c5 100644
--- a/drivers/net/ethernet/sun/sunbmac.c
+++ b/drivers/net/ethernet/sun/sunbmac.c
@@ -1075,7 +1075,7 @@ static const struct net_device_ops bigmac_ops = {
1075}; 1075};
1076 1076
1077static int bigmac_ether_init(struct platform_device *op, 1077static int bigmac_ether_init(struct platform_device *op,
1078 struct platform_device *qec_op) 1078 struct platform_device *qec_op)
1079{ 1079{
1080 static int version_printed; 1080 static int version_printed;
1081 struct net_device *dev; 1081 struct net_device *dev;
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index c7bc0561b8e..5f3f9d52757 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -2827,8 +2827,7 @@ static const struct net_device_ops gem_netdev_ops = {
2827#endif 2827#endif
2828}; 2828};
2829 2829
2830static int gem_init_one(struct pci_dev *pdev, 2830static int gem_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
2831 const struct pci_device_id *ent)
2832{ 2831{
2833 unsigned long gemreg_base, gemreg_len; 2832 unsigned long gemreg_base, gemreg_len;
2834 struct net_device *dev; 2833 struct net_device *dev;
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index 43babc33a2c..a1bff49a815 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -2928,7 +2928,7 @@ static void get_hme_mac_nonsparc(struct pci_dev *pdev, unsigned char *dev_addr)
2928#endif /* !(CONFIG_SPARC) */ 2928#endif /* !(CONFIG_SPARC) */
2929 2929
2930static int happy_meal_pci_probe(struct pci_dev *pdev, 2930static int happy_meal_pci_probe(struct pci_dev *pdev,
2931 const struct pci_device_id *ent) 2931 const struct pci_device_id *ent)
2932{ 2932{
2933 struct quattro *qp = NULL; 2933 struct quattro *qp = NULL;
2934#ifdef CONFIG_SPARC 2934#ifdef CONFIG_SPARC
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index 2852b7099ee..e1b89553082 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -1132,8 +1132,7 @@ static void print_version(void)
1132 1132
1133const char *remote_macaddr_prop = "remote-mac-address"; 1133const char *remote_macaddr_prop = "remote-mac-address";
1134 1134
1135static int vnet_port_probe(struct vio_dev *vdev, 1135static int vnet_port_probe(struct vio_dev *vdev, const struct vio_device_id *id)
1136 const struct vio_device_id *id)
1137{ 1136{
1138 struct mdesc_handle *hp; 1137 struct mdesc_handle *hp;
1139 struct vnet_port *port; 1138 struct vnet_port *port;
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index af16081677e..22725386c5d 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -460,9 +460,8 @@ static int tlan_init_one(struct pci_dev *pdev,
460* 460*
461**************************************************************/ 461**************************************************************/
462 462
463static int tlan_probe1(struct pci_dev *pdev, 463static int tlan_probe1(struct pci_dev *pdev, long ioaddr, int irq, int rev,
464 long ioaddr, int irq, int rev, 464 const struct pci_device_id *ent)
465 const struct pci_device_id *ent)
466{ 465{
467 466
468 struct net_device *dev; 467 struct net_device *dev;
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
index d7c8af7cca0..e321d0b6fc8 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
@@ -235,9 +235,8 @@ static void gelic_card_free_chain(struct gelic_card *card,
235 * returns 0 on success, <0 on failure 235 * returns 0 on success, <0 on failure
236 */ 236 */
237static int gelic_card_init_chain(struct gelic_card *card, 237static int gelic_card_init_chain(struct gelic_card *card,
238 struct gelic_descr_chain *chain, 238 struct gelic_descr_chain *chain,
239 struct gelic_descr *start_descr, 239 struct gelic_descr *start_descr, int no)
240 int no)
241{ 240{
242 int i; 241 int i;
243 struct gelic_descr *descr; 242 struct gelic_descr *descr;
@@ -1469,7 +1468,7 @@ static const struct net_device_ops gelic_netdevice_ops = {
1469 * fills out function pointers in the net_device structure 1468 * fills out function pointers in the net_device structure
1470 */ 1469 */
1471static void gelic_ether_setup_netdev_ops(struct net_device *netdev, 1470static void gelic_ether_setup_netdev_ops(struct net_device *netdev,
1472 struct napi_struct *napi) 1471 struct napi_struct *napi)
1473{ 1472{
1474 netdev->watchdog_timeo = GELIC_NET_WATCHDOG_TIMEOUT; 1473 netdev->watchdog_timeo = GELIC_NET_WATCHDOG_TIMEOUT;
1475 /* NAPI */ 1474 /* NAPI */
@@ -1489,8 +1488,7 @@ static void gelic_ether_setup_netdev_ops(struct net_device *netdev,
1489 * gelic_ether_setup_netdev initializes the net_device structure 1488 * gelic_ether_setup_netdev initializes the net_device structure
1490 * and register it. 1489 * and register it.
1491 **/ 1490 **/
1492int gelic_net_setup_netdev(struct net_device *netdev, 1491int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card)
1493 struct gelic_card *card)
1494{ 1492{
1495 int status; 1493 int status;
1496 u64 v1, v2; 1494 u64 v1, v2;
diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c
index 5db09efae92..9819349eaa1 100644
--- a/drivers/net/ethernet/toshiba/tc35815.c
+++ b/drivers/net/ethernet/toshiba/tc35815.c
@@ -786,7 +786,7 @@ static const struct net_device_ops tc35815_netdev_ops = {
786}; 786};
787 787
788static int tc35815_init_one(struct pci_dev *pdev, 788static int tc35815_init_one(struct pci_dev *pdev,
789 const struct pci_device_id *ent) 789 const struct pci_device_id *ent)
790{ 790{
791 void __iomem *ioaddr = NULL; 791 void __iomem *ioaddr = NULL;
792 struct net_device *dev; 792 struct net_device *dev;
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index 53ccc5174d0..7992b3e05d3 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -856,8 +856,7 @@ static const struct net_device_ops rhine_netdev_ops = {
856#endif 856#endif
857}; 857};
858 858
859static int rhine_init_one(struct pci_dev *pdev, 859static int rhine_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
860 const struct pci_device_id *ent)
861{ 860{
862 struct net_device *dev; 861 struct net_device *dev;
863 struct rhine_private *rp; 862 struct rhine_private *rp;
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index dc9edd48c93..1bc7f9fd258 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -2630,9 +2630,8 @@ static const struct net_device_ops velocity_netdev_ops = {
2630 * Set up the initial velocity_info struct for the device that has been 2630 * Set up the initial velocity_info struct for the device that has been
2631 * discovered. 2631 * discovered.
2632 */ 2632 */
2633static void velocity_init_info(struct pci_dev *pdev, 2633static void velocity_init_info(struct pci_dev *pdev, struct velocity_info *vptr,
2634 struct velocity_info *vptr, 2634 const struct velocity_info_tbl *info)
2635 const struct velocity_info_tbl *info)
2636{ 2635{
2637 memset(vptr, 0, sizeof(struct velocity_info)); 2636 memset(vptr, 0, sizeof(struct velocity_info));
2638 2637
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 3c8aab70f5e..502c8ff1d98 100644
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -962,9 +962,8 @@ static void dfx_bus_config_check(DFX_board_t *bp)
962 * returning from this routine. 962 * returning from this routine.
963 */ 963 */
964 964
965static int dfx_driver_init(struct net_device *dev, 965static int dfx_driver_init(struct net_device *dev, const char *print_name,
966 const char *print_name, 966 resource_size_t bar_start)
967 resource_size_t bar_start)
968{ 967{
969 DFX_board_t *bp = netdev_priv(dev); 968 DFX_board_t *bp = netdev_priv(dev);
970 struct device *bdev = bp->bus_dev; 969 struct device *bdev = bp->bus_dev;
@@ -3623,8 +3622,7 @@ static int __maybe_unused dfx_dev_register(struct device *);
3623static int __maybe_unused dfx_dev_unregister(struct device *); 3622static int __maybe_unused dfx_dev_unregister(struct device *);
3624 3623
3625#ifdef CONFIG_PCI 3624#ifdef CONFIG_PCI
3626static int dfx_pci_register(struct pci_dev *, 3625static int dfx_pci_register(struct pci_dev *, const struct pci_device_id *);
3627 const struct pci_device_id *);
3628static void dfx_pci_unregister(struct pci_dev *); 3626static void dfx_pci_unregister(struct pci_dev *);
3629 3627
3630static DEFINE_PCI_DEVICE_TABLE(dfx_pci_table) = { 3628static DEFINE_PCI_DEVICE_TABLE(dfx_pci_table) = {
@@ -3641,7 +3639,7 @@ static struct pci_driver dfx_pci_driver = {
3641}; 3639};
3642 3640
3643static int dfx_pci_register(struct pci_dev *pdev, 3641static int dfx_pci_register(struct pci_dev *pdev,
3644 const struct pci_device_id *ent) 3642 const struct pci_device_id *ent)
3645{ 3643{
3646 return dfx_register(&pdev->dev); 3644 return dfx_register(&pdev->dev);
3647} 3645}
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index e54b84d5ad7..e5b19b05690 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -88,8 +88,7 @@ static const struct net_device_ops rr_netdev_ops = {
88 * stack will need to know about I/O vectors or something similar. 88 * stack will need to know about I/O vectors or something similar.
89 */ 89 */
90 90
91static int rr_init_one(struct pci_dev *pdev, 91static int rr_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
92 const struct pci_device_id *ent)
93{ 92{
94 struct net_device *dev; 93 struct net_device *dev;
95 static int version_disp; 94 static int version_disp;
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index 82c5f30aaba..5290952b60c 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -377,7 +377,7 @@ static int pnp_driver_registered;
377 377
378#ifdef CONFIG_PNP 378#ifdef CONFIG_PNP
379static int smsc_ircc_pnp_probe(struct pnp_dev *dev, 379static int smsc_ircc_pnp_probe(struct pnp_dev *dev,
380 const struct pnp_device_id *dev_id) 380 const struct pnp_device_id *dev_id)
381{ 381{
382 unsigned int firbase, sirbase; 382 unsigned int firbase, sirbase;
383 u8 dma, irq; 383 u8 dma, irq;
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 63efbf4b51c..f9033c6a888 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -77,7 +77,7 @@ static int dongle_id = 0; /* default: probe */
77module_param(dongle_id, int, 0); 77module_param(dongle_id, int, 0);
78 78
79/* Some prototypes */ 79/* Some prototypes */
80static int via_ircc_open(struct pci_dev *pdev, chipio_t * info, 80static int via_ircc_open(struct pci_dev *pdev, chipio_t *info,
81 unsigned int id); 81 unsigned int id);
82static int via_ircc_dma_receive(struct via_ircc_cb *self); 82static int via_ircc_dma_receive(struct via_ircc_cb *self);
83static int via_ircc_dma_receive_complete(struct via_ircc_cb *self, 83static int via_ircc_dma_receive_complete(struct via_ircc_cb *self,
@@ -103,7 +103,7 @@ static void hwreset(struct via_ircc_cb *self);
103static int via_ircc_dma_xmit(struct via_ircc_cb *self, u16 iobase); 103static int via_ircc_dma_xmit(struct via_ircc_cb *self, u16 iobase);
104static int upload_rxdata(struct via_ircc_cb *self, int iobase); 104static int upload_rxdata(struct via_ircc_cb *self, int iobase);
105static int via_init_one(struct pci_dev *pcidev, const struct pci_device_id *id); 105static int via_init_one(struct pci_dev *pcidev, const struct pci_device_id *id);
106static void via_remove_one (struct pci_dev *pdev); 106static void via_remove_one(struct pci_dev *pdev);
107 107
108/* FIXME : Should use udelay() instead, even if we are x86 only - Jean II */ 108/* FIXME : Should use udelay() instead, even if we are x86 only - Jean II */
109static void iodelay(int udelay) 109static void iodelay(int udelay)
@@ -286,8 +286,7 @@ static const struct net_device_ops via_ircc_fir_ops = {
286 * Open driver instance 286 * Open driver instance
287 * 287 *
288 */ 288 */
289static int via_ircc_open(struct pci_dev *pdev, chipio_t *info, 289static int via_ircc_open(struct pci_dev *pdev, chipio_t *info, unsigned int id)
290 unsigned int id)
291{ 290{
292 struct net_device *dev; 291 struct net_device *dev;
293 struct via_ircc_cb *self; 292 struct via_ircc_cb *self;
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index 36fe08ac74b..27274986ab5 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -104,8 +104,8 @@ static struct mdiobb_ops mdio_gpio_ops = {
104}; 104};
105 105
106static struct mii_bus *mdio_gpio_bus_init(struct device *dev, 106static struct mii_bus *mdio_gpio_bus_init(struct device *dev,
107 struct mdio_gpio_platform_data *pdata, 107 struct mdio_gpio_platform_data *pdata,
108 int bus_id) 108 int bus_id)
109{ 109{
110 struct mii_bus *new_bus; 110 struct mii_bus *new_bus;
111 struct mdio_gpio_info *bitbang; 111 struct mdio_gpio_info *bitbang;
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index d50223050cf..851dc7b7e8b 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -707,8 +707,7 @@ static void dscc4_free1(struct pci_dev *pdev)
707 kfree(ppriv); 707 kfree(ppriv);
708} 708}
709 709
710static int dscc4_init_one(struct pci_dev *pdev, 710static int dscc4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
711 const struct pci_device_id *ent)
712{ 711{
713 struct dscc4_pci_priv *priv; 712 struct dscc4_pci_priv *priv;
714 struct dscc4_dev_priv *dpriv; 713 struct dscc4_dev_priv *dpriv;
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index c6e1a4b9e4f..62f01b74cbd 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -676,8 +676,7 @@ static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev)
676 676
677 677
678#ifdef NEED_DETECT_RAM 678#ifdef NEED_DETECT_RAM
679static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, 679static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, u32 ramsize)
680 u32 ramsize)
681{ 680{
682 /* Round RAM size to 32 bits, fill from end to start */ 681 /* Round RAM size to 32 bits, fill from end to start */
683 u32 i = ramsize &= ~3; 682 u32 i = ramsize &= ~3;
diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c
index f1685d9624c..6269a09c736 100644
--- a/drivers/net/wan/hd64572.c
+++ b/drivers/net/wan/hd64572.c
@@ -605,8 +605,7 @@ static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev)
605} 605}
606 606
607 607
608static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, 608static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, u32 ramsize)
609 u32 ramsize)
610{ 609{
611 /* Round RAM size to 32 bits, fill from end to start */ 610 /* Round RAM size to 32 bits, fill from end to start */
612 u32 i = ramsize &= ~3; 611 u32 i = ramsize &= ~3;
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 0e443fd0803..7ef435bab42 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -816,8 +816,7 @@ static const struct net_device_ops lmc_ops = {
816 .ndo_get_stats = lmc_get_stats, 816 .ndo_get_stats = lmc_get_stats,
817}; 817};
818 818
819static int lmc_init_one(struct pci_dev *pdev, 819static int lmc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
820 const struct pci_device_id *ent)
821{ 820{
822 lmc_softc_t *sc; 821 lmc_softc_t *sc;
823 struct net_device *dev; 822 struct net_device *dev;
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index a51cfa7c654..53efc57fcac 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -298,7 +298,7 @@ static const struct net_device_ops pc300_ops = {
298}; 298};
299 299
300static int pc300_pci_init_one(struct pci_dev *pdev, 300static int pc300_pci_init_one(struct pci_dev *pdev,
301 const struct pci_device_id *ent) 301 const struct pci_device_id *ent)
302{ 302{
303 card_t *card; 303 card_t *card;
304 u32 __iomem *p; 304 u32 __iomem *p;
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index 037c423a632..ddbce54040e 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -277,7 +277,7 @@ static const struct net_device_ops pci200_ops = {
277}; 277};
278 278
279static int pci200_pci_init_one(struct pci_dev *pdev, 279static int pci200_pci_init_one(struct pci_dev *pdev,
280 const struct pci_device_id *ent) 280 const struct pci_device_id *ent)
281{ 281{
282 card_t *card; 282 card_t *card;
283 u32 __iomem *p; 283 u32 __iomem *p;
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index b72be128036..6a24a5a70cc 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -558,7 +558,7 @@ static const struct net_device_ops wanxl_ops = {
558}; 558};
559 559
560static int wanxl_pci_init_one(struct pci_dev *pdev, 560static int wanxl_pci_init_one(struct pci_dev *pdev,
561 const struct pci_device_id *ent) 561 const struct pci_device_id *ent)
562{ 562{
563 card_t *card; 563 card_t *card;
564 u32 ramsize, stat; 564 u32 ramsize, stat;
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 53451dd7b60..c26e28b4bd9 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1408,7 +1408,7 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
1408 * inform the backend of the appropriate details for those. 1408 * inform the backend of the appropriate details for those.
1409 */ 1409 */
1410static int netfront_probe(struct xenbus_device *dev, 1410static int netfront_probe(struct xenbus_device *dev,
1411 const struct xenbus_device_id *id) 1411 const struct xenbus_device_id *id)
1412{ 1412{
1413 int err; 1413 int err;
1414 struct net_device *netdev; 1414 struct net_device *netdev;