mirror of
https://github.com/torvalds/linux.git
synced 2024-11-20 02:51:44 +00:00
chelsio: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d289f86460
commit
ff76a3cca3
@ -974,7 +974,7 @@ static const struct net_device_ops cxgb_netdev_ops = {
|
||||
#endif
|
||||
};
|
||||
|
||||
static int __devinit init_one(struct pci_dev *pdev,
|
||||
static int init_one(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
{
|
||||
static int version_printed;
|
||||
@ -1332,7 +1332,7 @@ static inline void t1_sw_reset(struct pci_dev *pdev)
|
||||
pci_write_config_dword(pdev, A_PCICFG_PM_CSR, 0);
|
||||
}
|
||||
|
||||
static void __devexit remove_one(struct pci_dev *pdev)
|
||||
static void remove_one(struct pci_dev *pdev)
|
||||
{
|
||||
struct net_device *dev = pci_get_drvdata(pdev);
|
||||
struct adapter *adapter = dev->ml_priv;
|
||||
@ -1361,7 +1361,7 @@ static struct pci_driver driver = {
|
||||
.name = DRV_NAME,
|
||||
.id_table = t1_pci_tbl,
|
||||
.probe = init_one,
|
||||
.remove = __devexit_p(remove_one),
|
||||
.remove = remove_one,
|
||||
};
|
||||
|
||||
static int __init t1_init_module(void)
|
||||
|
@ -2071,7 +2071,7 @@ static void espibug_workaround(unsigned long data)
|
||||
/*
|
||||
* Creates a t1_sge structure and returns suggested resource parameters.
|
||||
*/
|
||||
struct sge * __devinit t1_sge_create(struct adapter *adapter,
|
||||
struct sge *t1_sge_create(struct adapter *adapter,
|
||||
struct sge_params *p)
|
||||
{
|
||||
struct sge *sge = kzalloc(sizeof(*sge), GFP_KERNEL);
|
||||
|
@ -892,7 +892,7 @@ static void power_sequence_xpak(adapter_t* adapter)
|
||||
}
|
||||
}
|
||||
|
||||
int __devinit t1_get_board_rev(adapter_t *adapter, const struct board_info *bi,
|
||||
int t1_get_board_rev(adapter_t *adapter, const struct board_info *bi,
|
||||
struct adapter_params *p)
|
||||
{
|
||||
p->chip_version = bi->chip_term;
|
||||
@ -992,7 +992,7 @@ out_err:
|
||||
/*
|
||||
* Determine a card's PCI mode.
|
||||
*/
|
||||
static void __devinit get_pci_mode(adapter_t *adapter, struct chelsio_pci_params *p)
|
||||
static void get_pci_mode(adapter_t *adapter, struct chelsio_pci_params *p)
|
||||
{
|
||||
static const unsigned short speed_map[] = { 33, 66, 100, 133 };
|
||||
u32 pci_mode;
|
||||
@ -1028,7 +1028,7 @@ void t1_free_sw_modules(adapter_t *adapter)
|
||||
t1_espi_destroy(adapter->espi);
|
||||
}
|
||||
|
||||
static void __devinit init_link_config(struct link_config *lc,
|
||||
static void init_link_config(struct link_config *lc,
|
||||
const struct board_info *bi)
|
||||
{
|
||||
lc->supported = bi->caps;
|
||||
@ -1049,7 +1049,7 @@ static void __devinit init_link_config(struct link_config *lc,
|
||||
* Allocate and initialize the data structures that hold the SW state of
|
||||
* the Terminator HW modules.
|
||||
*/
|
||||
int __devinit t1_init_sw_modules(adapter_t *adapter,
|
||||
int t1_init_sw_modules(adapter_t *adapter,
|
||||
const struct board_info *bi)
|
||||
{
|
||||
unsigned int i;
|
||||
|
@ -55,7 +55,7 @@ void t1_tp_destroy(struct petp *tp)
|
||||
kfree(tp);
|
||||
}
|
||||
|
||||
struct petp *__devinit t1_tp_create(adapter_t * adapter, struct tp_params *p)
|
||||
struct petp *t1_tp_create(adapter_t *adapter, struct tp_params *p)
|
||||
{
|
||||
struct petp *tp = kzalloc(sizeof(*tp), GFP_KERNEL);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user