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

Commit b53c7583 authored by Kay Sievers's avatar Kay Sievers Committed by Paul Mackerras
Browse files

rapidio: struct device - replace bus_id with dev_name(), dev_set_name() 



Cc: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent aab0d375

drivers/rapidio/rio-scan.c

+4 −4
Original line number Diff line number Diff line
@@ -365,14 +365,14 @@ static struct rio_dev *rio_setup_device(struct rio_net *net, 
				rdid++)

			rswitch->route_table[rdid] = RIO_INVALID_ROUTE;

		rdev->rswitch = rswitch;

		sprintf(rio_name(rdev), "%02x:s:%04x", rdev->net->id,

		dev_set_name(&rdev->dev, "%02x:s:%04x", rdev->net->id,

			     rdev->rswitch->switchid);

		rio_route_set_ops(rdev);



		list_add_tail(&rswitch->node, &rio_switches);



	} else

		sprintf(rio_name(rdev), "%02x:e:%04x", rdev->net->id,

		dev_set_name(&rdev->dev, "%02x:e:%04x", rdev->net->id,

			     rdev->destid);



	rdev->dev.bus = &rio_bus_type;

include/linux/rio_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -427,9 +427,9 @@ void rio_dev_put(struct rio_dev *); 
 * Get the unique RIO device identifier. Returns the device

 * identifier string.

 */

static inline char *rio_name(struct rio_dev *rdev)

static inline const char *rio_name(struct rio_dev *rdev)

{

	return rdev->dev.bus_id;

	return dev_name(&rdev->dev);

}



/**