drivers/net: fix up function prototypes after __dev* removals
The __dev* removal patches for the network drivers ended up messing up the function prototypes for a bunch of drivers. This patch fixes all of them back up to be properly aligned. Bonus is that this almost removes 100 lines of code, always a nice surprise. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
45122ca26c
commit
1dd06ae8db
@@ -2142,7 +2142,7 @@ static const struct net_device_ops b44_netdev_ops = {
|
||||
};
|
||||
|
||||
static int b44_init_one(struct ssb_device *sdev,
|
||||
const struct ssb_device_id *ent)
|
||||
const struct ssb_device_id *ent)
|
||||
{
|
||||
struct net_device *dev;
|
||||
struct b44 *bp;
|
||||
|
@@ -9487,8 +9487,7 @@ static void bnx2x_prev_unload_close_mac(struct bnx2x *bp)
|
||||
#define BNX2X_PREV_UNDI_BD(val) ((val) >> 16 & 0xffff)
|
||||
#define BNX2X_PREV_UNDI_PROD(rcq, bd) ((bd) << 16 | (rcq))
|
||||
|
||||
static void bnx2x_prev_unload_undi_inc(struct bnx2x *bp, u8 port,
|
||||
u8 inc)
|
||||
static void bnx2x_prev_unload_undi_inc(struct bnx2x *bp, u8 port, u8 inc)
|
||||
{
|
||||
u16 rcq, bd;
|
||||
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)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void bnx2x_link_settings_supported(struct bnx2x *bp,
|
||||
u32 switch_cfg)
|
||||
static void bnx2x_link_settings_supported(struct bnx2x *bp, u32 switch_cfg)
|
||||
{
|
||||
int cfg_size = 0, idx, port = BP_PORT(bp);
|
||||
|
||||
@@ -11553,9 +11551,8 @@ static int bnx2x_set_coherency_mask(struct bnx2x *bp)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int bnx2x_init_dev(struct pci_dev *pdev,
|
||||
struct net_device *dev,
|
||||
unsigned long board_type)
|
||||
static int bnx2x_init_dev(struct pci_dev *pdev, struct net_device *dev,
|
||||
unsigned long board_type)
|
||||
{
|
||||
struct bnx2x *bp;
|
||||
int rc;
|
||||
@@ -11735,8 +11732,7 @@ err_out:
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void bnx2x_get_pcie_width_speed(struct bnx2x *bp,
|
||||
int *width, int *speed)
|
||||
static void bnx2x_get_pcie_width_speed(struct bnx2x *bp, int *width, int *speed)
|
||||
{
|
||||
u32 val = REG_RD(bp, PCICFG_OFFSET + PCICFG_LINK_CONTROL);
|
||||
|
||||
@@ -12042,8 +12038,7 @@ static int bnx2x_get_num_non_def_sbs(struct pci_dev *pdev,
|
||||
|
||||
struct cnic_eth_dev *bnx2x_cnic_probe(struct net_device *);
|
||||
|
||||
static int bnx2x_init_one(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
static int bnx2x_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
{
|
||||
struct net_device *dev = NULL;
|
||||
struct bnx2x *bp;
|
||||
|
@@ -14873,8 +14873,7 @@ static bool tg3_10_100_only_device(struct tg3 *tp,
|
||||
return false;
|
||||
}
|
||||
|
||||
static int tg3_get_invariants(struct tg3 *tp,
|
||||
const struct pci_device_id *ent)
|
||||
static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent)
|
||||
{
|
||||
u32 misc_ctrl_reg;
|
||||
u32 pci_state_reg, grc_misc_cfg;
|
||||
|
Reference in New Issue
Block a user