diff options
author | David Vrabel <david.vrabel@citrix.com> | 2014-09-08 12:30:41 -0400 |
---|---|---|
committer | David Vrabel <david.vrabel@citrix.com> | 2014-10-06 05:27:57 -0400 |
commit | 95afae481414cbdb0567bf82d5e5077c3ac9da20 (patch) | |
tree | 653ae2fae22966dd2a634ac4865ead3c6937eee9 /drivers/net/xen-netfront.c | |
parent | 305559f16538708b603ceeb317ebaed9c4da9ce9 (diff) |
xen: remove DEFINE_XENBUS_DRIVER() macro
The DEFINE_XENBUS_DRIVER() macro looks a bit weird and causes sparse
errors.
Replace the uses with standard structure definitions instead. This is
similar to pci and usb device registration.
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Diffstat (limited to 'drivers/net/xen-netfront.c')
-rw-r--r-- | drivers/net/xen-netfront.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index ca82f545ec2c..fa671442f420 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
@@ -2300,12 +2300,6 @@ static void xennet_sysfs_delif(struct net_device *netdev) | |||
2300 | 2300 | ||
2301 | #endif /* CONFIG_SYSFS */ | 2301 | #endif /* CONFIG_SYSFS */ |
2302 | 2302 | ||
2303 | static const struct xenbus_device_id netfront_ids[] = { | ||
2304 | { "vif" }, | ||
2305 | { "" } | ||
2306 | }; | ||
2307 | |||
2308 | |||
2309 | static int xennet_remove(struct xenbus_device *dev) | 2303 | static int xennet_remove(struct xenbus_device *dev) |
2310 | { | 2304 | { |
2311 | struct netfront_info *info = dev_get_drvdata(&dev->dev); | 2305 | struct netfront_info *info = dev_get_drvdata(&dev->dev); |
@@ -2338,12 +2332,18 @@ static int xennet_remove(struct xenbus_device *dev) | |||
2338 | return 0; | 2332 | return 0; |
2339 | } | 2333 | } |
2340 | 2334 | ||
2341 | static DEFINE_XENBUS_DRIVER(netfront, , | 2335 | static const struct xenbus_device_id netfront_ids[] = { |
2336 | { "vif" }, | ||
2337 | { "" } | ||
2338 | }; | ||
2339 | |||
2340 | static struct xenbus_driver netfront_driver = { | ||
2341 | .ids = netfront_ids, | ||
2342 | .probe = netfront_probe, | 2342 | .probe = netfront_probe, |
2343 | .remove = xennet_remove, | 2343 | .remove = xennet_remove, |
2344 | .resume = netfront_resume, | 2344 | .resume = netfront_resume, |
2345 | .otherend_changed = netback_changed, | 2345 | .otherend_changed = netback_changed, |
2346 | ); | 2346 | }; |
2347 | 2347 | ||
2348 | static int __init netif_init(void) | 2348 | static int __init netif_init(void) |
2349 | { | 2349 | { |