mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
fddi: 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> Cc: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
a0a4efedf9
commit
c354dfc3f2
2 changed files with 22 additions and 22 deletions
|
@ -228,7 +228,7 @@
|
|||
#define DRV_VERSION "v1.10"
|
||||
#define DRV_RELDATE "2006/12/14"
|
||||
|
||||
static char version[] __devinitdata =
|
||||
static char version[] =
|
||||
DRV_NAME ": " DRV_VERSION " " DRV_RELDATE
|
||||
" Lawrence V. Stefani and others\n";
|
||||
|
||||
|
@ -515,7 +515,7 @@ static const struct net_device_ops dfx_netdev_ops = {
|
|||
* initialized and the board resources are read and stored in
|
||||
* the device structure.
|
||||
*/
|
||||
static int __devinit dfx_register(struct device *bdev)
|
||||
static int dfx_register(struct device *bdev)
|
||||
{
|
||||
static int version_disp;
|
||||
int dfx_bus_pci = DFX_BUS_PCI(bdev);
|
||||
|
@ -663,7 +663,7 @@ static int __devinit dfx_register(struct device *bdev)
|
|||
* enabled yet.
|
||||
*/
|
||||
|
||||
static void __devinit dfx_bus_init(struct net_device *dev)
|
||||
static void dfx_bus_init(struct net_device *dev)
|
||||
{
|
||||
DFX_board_t *bp = netdev_priv(dev);
|
||||
struct device *bdev = bp->bus_dev;
|
||||
|
@ -809,7 +809,7 @@ static void __devinit dfx_bus_init(struct net_device *dev)
|
|||
* Interrupts are disabled at the adapter bus-specific logic.
|
||||
*/
|
||||
|
||||
static void __devexit dfx_bus_uninit(struct net_device *dev)
|
||||
static void dfx_bus_uninit(struct net_device *dev)
|
||||
{
|
||||
DFX_board_t *bp = netdev_priv(dev);
|
||||
struct device *bdev = bp->bus_dev;
|
||||
|
@ -866,7 +866,7 @@ static void __devexit dfx_bus_uninit(struct net_device *dev)
|
|||
* None
|
||||
*/
|
||||
|
||||
static void __devinit dfx_bus_config_check(DFX_board_t *bp)
|
||||
static void dfx_bus_config_check(DFX_board_t *bp)
|
||||
{
|
||||
struct device __maybe_unused *bdev = bp->bus_dev;
|
||||
int dfx_bus_eisa = DFX_BUS_EISA(bdev);
|
||||
|
@ -962,7 +962,7 @@ static void __devinit dfx_bus_config_check(DFX_board_t *bp)
|
|||
* returning from this routine.
|
||||
*/
|
||||
|
||||
static int __devinit dfx_driver_init(struct net_device *dev,
|
||||
static int dfx_driver_init(struct net_device *dev,
|
||||
const char *print_name,
|
||||
resource_size_t bar_start)
|
||||
{
|
||||
|
@ -3579,7 +3579,7 @@ static void dfx_xmt_flush( DFX_board_t *bp )
|
|||
* Device structures for FDDI adapters (fddi0, fddi1, etc) are
|
||||
* freed.
|
||||
*/
|
||||
static void __devexit dfx_unregister(struct device *bdev)
|
||||
static void dfx_unregister(struct device *bdev)
|
||||
{
|
||||
struct net_device *dev = dev_get_drvdata(bdev);
|
||||
DFX_board_t *bp = netdev_priv(dev);
|
||||
|
@ -3619,13 +3619,13 @@ static void __devexit dfx_unregister(struct device *bdev)
|
|||
}
|
||||
|
||||
|
||||
static int __devinit __maybe_unused dfx_dev_register(struct device *);
|
||||
static int __devexit __maybe_unused dfx_dev_unregister(struct device *);
|
||||
static int __maybe_unused dfx_dev_register(struct device *);
|
||||
static int __maybe_unused dfx_dev_unregister(struct device *);
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
static int __devinit dfx_pci_register(struct pci_dev *,
|
||||
static int dfx_pci_register(struct pci_dev *,
|
||||
const struct pci_device_id *);
|
||||
static void __devexit dfx_pci_unregister(struct pci_dev *);
|
||||
static void dfx_pci_unregister(struct pci_dev *);
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(dfx_pci_table) = {
|
||||
{ PCI_DEVICE(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_FDDI) },
|
||||
|
@ -3637,16 +3637,16 @@ static struct pci_driver dfx_pci_driver = {
|
|||
.name = "defxx",
|
||||
.id_table = dfx_pci_table,
|
||||
.probe = dfx_pci_register,
|
||||
.remove = __devexit_p(dfx_pci_unregister),
|
||||
.remove = dfx_pci_unregister,
|
||||
};
|
||||
|
||||
static __devinit int dfx_pci_register(struct pci_dev *pdev,
|
||||
static int dfx_pci_register(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
{
|
||||
return dfx_register(&pdev->dev);
|
||||
}
|
||||
|
||||
static void __devexit dfx_pci_unregister(struct pci_dev *pdev)
|
||||
static void dfx_pci_unregister(struct pci_dev *pdev)
|
||||
{
|
||||
dfx_unregister(&pdev->dev);
|
||||
}
|
||||
|
@ -3668,7 +3668,7 @@ static struct eisa_driver dfx_eisa_driver = {
|
|||
.name = "defxx",
|
||||
.bus = &eisa_bus_type,
|
||||
.probe = dfx_dev_register,
|
||||
.remove = __devexit_p(dfx_dev_unregister),
|
||||
.remove = dfx_dev_unregister,
|
||||
},
|
||||
};
|
||||
#endif /* CONFIG_EISA */
|
||||
|
@ -3689,12 +3689,12 @@ static struct tc_driver dfx_tc_driver = {
|
|||
.name = "defxx",
|
||||
.bus = &tc_bus_type,
|
||||
.probe = dfx_dev_register,
|
||||
.remove = __devexit_p(dfx_dev_unregister),
|
||||
.remove = dfx_dev_unregister,
|
||||
},
|
||||
};
|
||||
#endif /* CONFIG_TC */
|
||||
|
||||
static int __devinit __maybe_unused dfx_dev_register(struct device *dev)
|
||||
static int __maybe_unused dfx_dev_register(struct device *dev)
|
||||
{
|
||||
int status;
|
||||
|
||||
|
@ -3704,7 +3704,7 @@ static int __devinit __maybe_unused dfx_dev_register(struct device *dev)
|
|||
return status;
|
||||
}
|
||||
|
||||
static int __devexit __maybe_unused dfx_dev_unregister(struct device *dev)
|
||||
static int __maybe_unused dfx_dev_unregister(struct device *dev)
|
||||
{
|
||||
put_device(dev);
|
||||
dfx_unregister(dev);
|
||||
|
@ -3712,7 +3712,7 @@ static int __devexit __maybe_unused dfx_dev_unregister(struct device *dev)
|
|||
}
|
||||
|
||||
|
||||
static int __devinit dfx_init(void)
|
||||
static int dfx_init(void)
|
||||
{
|
||||
int status;
|
||||
|
||||
|
@ -3724,7 +3724,7 @@ static int __devinit dfx_init(void)
|
|||
return status;
|
||||
}
|
||||
|
||||
static void __devexit dfx_cleanup(void)
|
||||
static void dfx_cleanup(void)
|
||||
{
|
||||
tc_unregister_driver(&dfx_tc_driver);
|
||||
eisa_driver_unregister(&dfx_eisa_driver);
|
||||
|
|
|
@ -321,7 +321,7 @@ static int skfp_init_one(struct pci_dev *pdev,
|
|||
/*
|
||||
* Called for each adapter board from pci_unregister_driver
|
||||
*/
|
||||
static void __devexit skfp_remove_one(struct pci_dev *pdev)
|
||||
static void skfp_remove_one(struct pci_dev *pdev)
|
||||
{
|
||||
struct net_device *p = pci_get_drvdata(pdev);
|
||||
struct s_smc *lp = netdev_priv(p);
|
||||
|
@ -2243,7 +2243,7 @@ static struct pci_driver skfddi_pci_driver = {
|
|||
.name = "skfddi",
|
||||
.id_table = skfddi_pci_tbl,
|
||||
.probe = skfp_init_one,
|
||||
.remove = __devexit_p(skfp_remove_one),
|
||||
.remove = skfp_remove_one,
|
||||
};
|
||||
|
||||
static int __init skfd_init(void)
|
||||
|
|
Loading…
Reference in a new issue