OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Sven Van Asbroeck 2019-04-30 11:25:15 -04:00 committed by Greg Kroah-Hartman
parent be7d6b0360
commit 39e8046240
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/fieldbus/anybuss/anybuss-client.h
View File

@ -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);

2
drivers/staging/fieldbus/anybuss/hms-profinet.c
View File

@ -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)

4
drivers/staging/fieldbus/anybuss/host.c
View File

@ -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;