From patchwork Fri Dec 7 16:20:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 204572 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D64912C00C1 for ; Sat, 8 Dec 2012 03:20:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422690Ab2LGQUb (ORCPT ); Fri, 7 Dec 2012 11:20:31 -0500 Received: from webmail.solarflare.com ([12.187.104.25]:8635 "EHLO webmail.solarflare.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161012Ab2LGQUa (ORCPT ); Fri, 7 Dec 2012 11:20:30 -0500 Received: from [10.17.20.137] (10.17.20.137) by ocex02.SolarFlarecom.com (10.20.40.31) with Microsoft SMTP Server (TLS) id 14.1.355.2; Fri, 7 Dec 2012 08:20:30 -0800 Message-ID: <1354897227.2707.10.camel@bwh-desktop.uk.solarflarecom.com> Subject: [PATCH net-next 2/2] caif_usb: Make the driver name check more efficient From: Ben Hutchings To: Sjur Braendeland CC: Date: Fri, 7 Dec 2012 16:20:27 +0000 Organization: Solarflare X-Mailer: Evolution 3.2.3 (3.2.3-3.fc16) MIME-Version: 1.0 X-Originating-IP: [10.17.20.137] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- Compile-tested only. I'm assuming that the strncmp() is not really necessary, but perhaps there is some OOT variant of cdc_ncm that is also supposed to be supported? Ben. net/caif/caif_usb.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/net/caif/caif_usb.c b/net/caif/caif_usb.c index 582f80c..3ebc8cb 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);