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

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

staging: fieldbus: anybus-s: keep device bus id in bus endianness 

"Normal" bus structures such as USB or PCI keep device bus ids
in bus endinanness, and driver bus ids in host endianness.
Endianness conversion happens each time bus_match() is called.

Modify anybus-s to conform to this pattern. As a pleasant side-
effect, sparse warnings will now disappear.

This was suggested by Al Viro.

Link: https://lkml.org/lkml/2019/4/30/834


Signed-off-by: default avatarSven Van Asbroeck <TheSven73@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d5d66cfe

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

+1 −1
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;

	u16 fieldbus_type;

	__be16 fieldbus_type;

	/*

	 * these can be optionally set by the client to receive event

	 * notifications from the host.

drivers/staging/fieldbus/anybuss/host.c

+3 −4
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 == adev->fieldbus_type;

	return adrv->fieldbus_type == be16_to_cpu(adev->fieldbus_type);

}



static int anybus_bus_probe(struct device *dev)
@@ -1264,7 +1264,7 @@ anybuss_host_common_probe(struct device *dev, 
{

	int ret, i;

	u8 val[4];

	u16 fieldbus_type;

	__be16 fieldbus_type;

	struct anybuss_host *cd;



	cd = devm_kzalloc(dev, sizeof(*cd), GFP_KERNEL);
@@ -1348,8 +1348,7 @@ anybuss_host_common_probe(struct device *dev, 
	add_device_randomness(&val, 4);

	regmap_bulk_read(cd->regmap, REG_FIELDBUS_TYPE, &fieldbus_type,

			 sizeof(fieldbus_type));

	fieldbus_type = be16_to_cpu(fieldbus_type);

	dev_info(dev, "Fieldbus type: %04X", fieldbus_type);

	dev_info(dev, "Fieldbus type: %04X", be16_to_cpu(fieldbus_type));

	regmap_bulk_read(cd->regmap, REG_MODULE_SW_V, val, 2);

	dev_info(dev, "Module SW version: %02X%02X",

		 val[0], val[1]);