Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39e80462 authored by Sven Van Asbroeck's avatar Sven Van Asbroeck Committed by Greg Kroah-Hartman
Browse files

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: default avatarSven Van Asbroeck <TheSven73@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent be7d6b03

drivers/staging/fieldbus/anybuss/anybuss-client.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/staging/fieldbus/anybuss/hms-profinet.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/staging/fieldbus/anybuss/host.c

+2 −2
Original line number Diff line number Diff line
@@ -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;