mirror of https://gitee.com/openkylin/linux.git
b44: 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: Gary Zambrano <zambrano@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
a9590879e1
commit
2397188710
|
@ -2083,7 +2083,7 @@ static int b44_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int __devinit b44_get_invariants(struct b44 *bp)
|
||||
static int b44_get_invariants(struct b44 *bp)
|
||||
{
|
||||
struct ssb_device *sdev = bp->sdev;
|
||||
int err = 0;
|
||||
|
@ -2141,7 +2141,7 @@ static const struct net_device_ops b44_netdev_ops = {
|
|||
#endif
|
||||
};
|
||||
|
||||
static int __devinit b44_init_one(struct ssb_device *sdev,
|
||||
static int b44_init_one(struct ssb_device *sdev,
|
||||
const struct ssb_device_id *ent)
|
||||
{
|
||||
struct net_device *dev;
|
||||
|
@ -2249,7 +2249,7 @@ static int __devinit b44_init_one(struct ssb_device *sdev,
|
|||
return err;
|
||||
}
|
||||
|
||||
static void __devexit b44_remove_one(struct ssb_device *sdev)
|
||||
static void b44_remove_one(struct ssb_device *sdev)
|
||||
{
|
||||
struct net_device *dev = ssb_get_drvdata(sdev);
|
||||
|
||||
|
@ -2340,7 +2340,7 @@ static struct ssb_driver b44_ssb_driver = {
|
|||
.name = DRV_MODULE_NAME,
|
||||
.id_table = b44_ssb_tbl,
|
||||
.probe = b44_init_one,
|
||||
.remove = __devexit_p(b44_remove_one),
|
||||
.remove = b44_remove_one,
|
||||
.suspend = b44_suspend,
|
||||
.resume = b44_resume,
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue