From: Ben Hutchings <bhutchings@solarflare.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-net-drivers@solarflare.com
Subject: [PATCH 16/33] sfc: Add phy_type device attribute
Date: Fri, 12 Dec 2008 12:54:02 +0000 [thread overview]
Message-ID: <20081212125401.GP10372@solarflare.com> (raw)
In-Reply-To: <20081212124622.GK32518@solarflare.com>
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
drivers/net/sfc/efx.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 844580f..4fb5ba2 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -1496,6 +1496,14 @@ static struct notifier_block efx_netdev_notifier = {
.notifier_call = efx_netdev_event,
};
+static ssize_t
+show_phy_type(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ struct efx_nic *efx = pci_get_drvdata(to_pci_dev(dev));
+ return sprintf(buf, "%d\n", efx->phy_type);
+}
+static DEVICE_ATTR(phy_type, 0644, show_phy_type, NULL);
+
static int efx_register_netdev(struct efx_nic *efx)
{
struct net_device *net_dev = efx->net_dev;
@@ -1522,7 +1530,17 @@ static int efx_register_netdev(struct efx_nic *efx)
strcpy(efx->name, net_dev->name);
efx_set_channel_names(efx);
+ rc = device_create_file(&efx->pci_dev->dev, &dev_attr_phy_type);
+ if (rc) {
+ EFX_ERR(efx, "failed to init net dev attributes\n");
+ goto fail_registered;
+ }
+
return 0;
+
+fail_registered:
+ unregister_netdev(net_dev);
+ return rc;
}
static void efx_unregister_netdev(struct efx_nic *efx)
@@ -1542,6 +1560,7 @@ static void efx_unregister_netdev(struct efx_nic *efx)
if (efx_dev_registered(efx)) {
strlcpy(efx->name, pci_name(efx->pci_dev), sizeof(efx->name));
+ device_remove_file(&efx->pci_dev->dev, &dev_attr_phy_type);
unregister_netdev(efx->net_dev);
}
}
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
next prev parent reply other threads:[~2008-12-12 12:54 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1229085672.git.bhutchings@solarflare.com>
2008-12-12 12:46 ` [PATCH 00/33] sfc version 2.3 Ben Hutchings
2008-12-12 12:48 ` [PATCH 01/33] sfc: Board support fixes Ben Hutchings
2008-12-13 5:29 ` David Miller
2008-12-12 12:48 ` [PATCH 02/33] sfc: Change SPI lengths to type size_t Ben Hutchings
2008-12-13 5:30 ` David Miller
2008-12-13 5:53 ` David Miller
2008-12-13 6:30 ` Ben Hutchings
2008-12-12 12:49 ` [PATCH 03/33] sfc: Do not use pci_disable_device() to disable bus mastering Ben Hutchings
2008-12-13 5:31 ` David Miller
2008-12-13 6:27 ` Ben Hutchings
2008-12-12 12:49 ` [PATCH 04/33] sfc: Remove unneeded register write Ben Hutchings
2008-12-13 5:31 ` David Miller
2008-12-12 12:49 ` [PATCH 05/33] sfc: Correct interpretation of second param to ethtool phys_id() Ben Hutchings
2008-12-13 5:32 ` David Miller
2008-12-12 12:50 ` [PATCH 06/33] sfc: Make reset_workqueue driver-global rather than per-NIC Ben Hutchings
2008-12-13 5:33 ` David Miller
2008-12-12 12:51 ` [PATCH 07/33] sfc: Clean up waits for flash/EEPROM operations Ben Hutchings
2008-12-13 5:33 ` David Miller
2008-12-12 12:51 ` [PATCH 08/33] sfc: Work around unreliable strap pins Ben Hutchings
2008-12-13 5:34 ` David Miller
2008-12-12 12:51 ` [PATCH 09/33] sfc: Restore phy_flash_cfg module parameter Ben Hutchings
2008-12-13 5:35 ` David Miller
2008-12-12 12:53 ` [PATCH 13/33] sfc: Don't count RX checksum errors during loopback self-test Ben Hutchings
2008-12-13 5:42 ` David Miller
2008-12-12 12:53 ` [PATCH 14/33] sfc: Remove MII extension cruft Ben Hutchings
2008-12-13 5:43 ` David Miller
2008-12-12 12:53 ` [PATCH 15/33] sfc: Add support for MMDs numbered >15 Ben Hutchings
2008-12-13 5:44 ` David Miller
2008-12-12 12:54 ` Ben Hutchings [this message]
2008-12-13 5:47 ` [PATCH 16/33] sfc: Add phy_type device attribute David Miller
2008-12-12 12:54 ` [PATCH 17/33] sfc: Clean up board identification Ben Hutchings
2008-12-13 5:48 ` David Miller
2008-12-12 12:54 ` [PATCH 18/33] sfc: Clean up MDIO flag setting Ben Hutchings
2008-12-13 5:49 ` David Miller
2008-12-12 12:54 ` [PATCH 19/33] sfc: Add support for sub-10G speeds Ben Hutchings
2008-12-13 5:50 ` David Miller
2008-12-12 12:55 ` [PATCH 20/33] sfc: Implement auto-negotiation Ben Hutchings
2008-12-13 5:50 ` David Miller
2008-12-12 12:55 ` [PATCH 21/33] sfc: Rework MAC, PHY and board event handling Ben Hutchings
2008-12-13 5:59 ` David Miller
2008-12-12 12:56 ` [PATCH 22/33] sfc: Add support for Solarflare 10Xpress SFT9001 Ben Hutchings
2008-12-13 6:00 ` David Miller
2008-12-12 12:56 ` [PATCH 23/33] sfc: Add support for SFN4111T Ben Hutchings
2008-12-13 6:01 ` David Miller
2008-12-12 12:56 ` [PATCH 25/33] sfc: Generate unique names for per-NIC workqueues Ben Hutchings
2008-12-13 6:04 ` David Miller
2008-12-13 6:23 ` Ben Hutchings
2008-12-13 6:29 ` David Miller
2008-12-13 14:01 ` Ben Hutchings
2008-12-12 12:57 ` [PATCH 26/33] sfc: Remove leading spaces Ben Hutchings
2008-12-13 6:05 ` David Miller
2008-12-12 12:57 ` [PATCH 27/33] sfc: Specify a meaningful component for loopback RX-side and PHY tests Ben Hutchings
2008-12-13 6:05 ` David Miller
2008-12-12 12:59 ` [PATCH 28/33] sfc: Use mutex_lock_interruptible() for ethtool EEPROM access Ben Hutchings
2008-12-13 6:06 ` David Miller
2008-12-12 12:59 ` [PATCH 29/33] sfc: Use model numbers for PHY type names Ben Hutchings
2008-12-13 6:07 ` David Miller
2008-12-12 13:00 ` [PATCH 30/33] sfc: Treat probe as unsuccessful if it scheduled a reset Ben Hutchings
2008-12-13 6:08 ` David Miller
2008-12-12 13:00 ` [PATCH 31/33] sfc: Use kzalloc() to ensure struct efx_spi_device is fully initialised Ben Hutchings
2008-12-13 6:09 ` David Miller
2008-12-12 12:52 ` [PATCH 10/33] sfc: Add option to use a separate channel for TX completions Ben Hutchings
2008-12-13 5:36 ` David Miller
2008-12-12 12:52 ` [PATCH 11/33] sfc: Provide hints to irqbalance daemon Ben Hutchings
2008-12-13 5:37 ` David Miller
2008-12-12 12:52 ` [PATCH 12/33] sfc: Abbreviate self-test names so they are not truncated Ben Hutchings
2008-12-13 5:42 ` David Miller
2008-12-12 12:56 ` [PATCH 24/33] sfc: Fix format arguments for warning about MSI-X allocation Ben Hutchings
2008-12-12 20:34 ` Ben Hutchings
2008-12-13 5:25 ` David Miller
2008-12-12 13:00 ` [PATCH 32/33] sfc: Fix synchronisation of efx_mtd_{probe,rename,remove} Ben Hutchings
2008-12-13 6:09 ` David Miller
2008-12-12 13:01 ` [PATCH 33/33] sfc: Version 2.3 Ben Hutchings
2008-12-13 6:10 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081212125401.GP10372@solarflare.com \
--to=bhutchings@solarflare.com \
--cc=davem@davemloft.net \
--cc=linux-net-drivers@solarflare.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).