From 65d2897c0f1b240420d657f41e561239fa10ba94 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 7 Dec 2012 06:20:27 +0000 Subject: caif_usb: Make the driver name check more efficient Use the device model to get just the name, rather than using the ethtool API to get all driver information. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller --- net/caif/caif_usb.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'net/caif') diff --git a/net/caif/caif_usb.c b/net/caif/caif_usb.c index 582f80c8ef3..3ebc8cbc91f 100644 --- a/net/caif/caif_usb.c +++ b/net/caif/caif_usb.c @@ -128,17 +128,10 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what, struct cflayer *layer, *link_support; struct usbnet *usbnet; struct usb_device *usbdev; - struct ethtool_drvinfo drvinfo; - /* - * Quirks: High-jack ethtool to find if we have a NCM device, - * and find it's VID/PID. - */ - if (dev->ethtool_ops == NULL || dev->ethtool_ops->get_drvinfo == NULL) - return 0; - - dev->ethtool_ops->get_drvinfo(dev, &drvinfo); - if (strncmp(drvinfo.driver, "cdc_ncm", 7) != 0) + /* Check whether we have a NCM device, and find its VID/PID. */ + if (!(dev->dev.parent && dev->dev.parent->driver && + strcmp(dev->dev.parent->driver->name, "cdc_ncm") == 0)) return 0; usbnet = netdev_priv(dev); -- cgit v1.2.3