aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorSven Van Asbroeck <thesven73@gmail.com>2019-04-30 11:25:15 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-30 17:40:34 +0200
commit39e8046240e2b1a4c2e431e08a3356abce93cf35 (patch)
tree89d2eb4a1fd7e5a13dba8c6efd35d6a2155ee214 /drivers/staging
parentbe7d6b03602eb0d3dccae0bbce4c796526c51661 (diff)
downloadlinux-39e8046240e2b1a4c2e431e08a3356abce93cf35.tar.gz
staging: fieldbus: anybus-s: rename bus id field to avoid confusion
Rename the anybus-s bus id from fieldbus_type to anybus_id, to avoid confusion with an identically named variable in the fieldbus_dev framework. Although this value is called fieldbus_type in the anybus-s docs, it acts like a bus id, so the name change is appropriate. Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/fieldbus/anybuss/anybuss-client.h4
-rw-r--r--drivers/staging/fieldbus/anybuss/hms-profinet.c2
-rw-r--r--drivers/staging/fieldbus/anybuss/host.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/fieldbus/anybuss/anybuss-client.h b/drivers/staging/fieldbus/anybuss/anybuss-client.h
index dce60f86c16f..0c4b6a1ffe10 100644
--- a/drivers/staging/fieldbus/anybuss/anybuss-client.h
+++ b/drivers/staging/fieldbus/anybuss/anybuss-client.h
@@ -17,7 +17,7 @@ struct anybuss_host;
struct anybuss_client {
struct device dev;
struct anybuss_host *host;
- __be16 fieldbus_type;
+ __be16 anybus_id;
/*
* these can be optionally set by the client to receive event
* notifications from the host.
@@ -30,7 +30,7 @@ struct anybuss_client_driver {
struct device_driver driver;
int (*probe)(struct anybuss_client *adev);
int (*remove)(struct anybuss_client *adev);
- u16 fieldbus_type;
+ u16 anybus_id;
};
int anybuss_client_driver_register(struct anybuss_client_driver *drv);
diff --git a/drivers/staging/fieldbus/anybuss/hms-profinet.c b/drivers/staging/fieldbus/anybuss/hms-profinet.c
index c5db648aa65f..5446843e35f4 100644
--- a/drivers/staging/fieldbus/anybuss/hms-profinet.c
+++ b/drivers/staging/fieldbus/anybuss/hms-profinet.c
@@ -208,7 +208,7 @@ static struct anybuss_client_driver profinet_driver = {
.name = "hms-profinet",
.owner = THIS_MODULE,
},
- .fieldbus_type = 0x0089,
+ .anybus_id = 0x0089,
};
static int __init profinet_init(void)
diff --git a/drivers/staging/fieldbus/anybuss/host.c b/drivers/staging/fieldbus/anybuss/host.c
index a153b0fde963..dc692f69df84 100644
--- a/drivers/staging/fieldbus/anybuss/host.c
+++ b/drivers/staging/fieldbus/anybuss/host.c
@@ -1173,7 +1173,7 @@ static int anybus_bus_match(struct device *dev,
struct anybuss_client *adev =
to_anybuss_client(dev);
- return adrv->fieldbus_type == be16_to_cpu(adev->fieldbus_type);
+ return adrv->anybus_id == be16_to_cpu(adev->anybus_id);
}
static int anybus_bus_probe(struct device *dev)
@@ -1372,7 +1372,7 @@ anybuss_host_common_probe(struct device *dev,
ret = -ENOMEM;
goto err_kthread;
}
- cd->client->fieldbus_type = fieldbus_type;
+ cd->client->anybus_id = fieldbus_type;
cd->client->host = cd;
cd->client->dev.bus = &anybus_bus;
cd->client->dev.parent = dev;