FDDI: defxx: Use driver's name with resource requests

Replace repeated "defxx" strings with a reference to the DRV_NAME macro
and then use the driver's name rather that the bus address with resource
requests so as to have contents of /proc/iomem and /proc/ioports more
meaningful to the user, in line with what drivers usually do.

So rather than say:

5000-50ff : DEC FDDIcontroller/EISA Adapter
  5000-503f : 00:05
  5040-5043 : 00:05
5400-54ff : DEC FDDIcontroller/EISA Adapter
5800-58ff : DEC FDDIcontroller/EISA Adapter
5c00-5cff : DEC FDDIcontroller/EISA Adapter
  5c80-5cbf : 00:05

or:

620c080020000-620c08002007f : 0031:02:04.0
  620c080020000-620c08002007f : 0031:02:04.0
620c080030000-620c08003ffff : 0031:02:04.0

or:

1f100000-1f10003f : tc2

we report:

5000-50ff : DEC FDDIcontroller/EISA Adapter
  5000-503f : defxx
  5040-5043 : defxx
5400-54ff : DEC FDDIcontroller/EISA Adapter
5800-58ff : DEC FDDIcontroller/EISA Adapter
5c00-5cff : DEC FDDIcontroller/EISA Adapter
  5c80-5cbf : defxx

and:

620c080020000-620c08002007f : 0031:02:04.0
  620c080020000-620c08002007f : defxx
620c080030000-620c08003ffff : 0031:02:04.0

and:

1f100000-1f10003f : defxx

respectively for the DEFEA (EISA), DEFPA (PCI), and DEFTA (TURBOchannel)
adapters.

Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 7d733a6..6d1e3f4 100644 (file)
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -580,14 +580,15 @@ static int dfx_register(struct device *bdev)
 
        if (dfx_use_mmio) {
                region = request_mem_region(bar_start[0], bar_len[0],
-                                           print_name);
+                                           bdev->driver->name);
                if (!region && (dfx_bus_eisa || dfx_bus_pci)) {
                        bp->mmio = false;
                        dfx_get_bars(bp, bar_start, bar_len);
                }
        }
        if (!dfx_use_mmio)
-               region = request_region(bar_start[0], bar_len[0], print_name);
+               region = request_region(bar_start[0], bar_len[0],
+                                       bdev->driver->name);
        if (!region) {
                dfx_register_res_err(print_name, dfx_use_mmio,
                                     bar_start[0], bar_len[0]);
@@ -595,7 +596,8 @@ static int dfx_register(struct device *bdev)
                goto err_out_disable;
        }
        if (bar_start[1] != 0) {
-               region = request_region(bar_start[1], bar_len[1], print_name);
+               region = request_region(bar_start[1], bar_len[1],
+                                       bdev->driver->name);
                if (!region) {
                        dfx_register_res_err(print_name, 0,
                                             bar_start[1], bar_len[1]);
@@ -604,7 +606,8 @@ static int dfx_register(struct device *bdev)
                }
        }
        if (bar_start[2] != 0) {
-               region = request_region(bar_start[2], bar_len[2], print_name);
+               region = request_region(bar_start[2], bar_len[2],
+                                       bdev->driver->name);
                if (!region) {
                        dfx_register_res_err(print_name, 0,
                                             bar_start[2], bar_len[2]);
@@ -3745,7 +3748,7 @@ static const struct pci_device_id dfx_pci_table[] = {
 MODULE_DEVICE_TABLE(pci, dfx_pci_table);
 
 static struct pci_driver dfx_pci_driver = {
-       .name           = "defxx",
+       .name           = DRV_NAME,
        .id_table       = dfx_pci_table,
        .probe          = dfx_pci_register,
        .remove         = dfx_pci_unregister,
@@ -3776,7 +3779,7 @@ MODULE_DEVICE_TABLE(eisa, dfx_eisa_table);
 static struct eisa_driver dfx_eisa_driver = {
        .id_table       = dfx_eisa_table,
        .driver         = {
-               .name   = "defxx",
+               .name   = DRV_NAME,
                .bus    = &eisa_bus_type,
                .probe  = dfx_dev_register,
                .remove = dfx_dev_unregister,
@@ -3797,7 +3800,7 @@ MODULE_DEVICE_TABLE(tc, dfx_tc_table);
 static struct tc_driver dfx_tc_driver = {
        .id_table       = dfx_tc_table,
        .driver         = {
-               .name   = "defxx",
+               .name   = DRV_NAME,
                .bus    = &tc_bus_type,
                .probe  = dfx_dev_register,
                .remove = dfx_dev_unregister,