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

Commit 48ef2bb4 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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



Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 24f81a70

arch/ia64/kernel/pci-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ int iommu_detected __read_mostly; 
   be probably a smaller DMA mask, but this is bug-to-bug compatible

   to i386. */

struct device fallback_dev = {

	.bus_id = "fallback device",

	.init_name = "fallback device",

	.coherent_dma_mask = DMA_32BIT_MASK,

	.dma_mask = &fallback_dev.coherent_dma_mask,

};

arch/ia64/sn/kernel/tiocx.c

+1 −2
Original line number Diff line number Diff line
@@ -206,8 +206,7 @@ cx_device_register(nasid_t nasid, int part_num, int mfg_num, 
	cx_dev->dev.parent = NULL;

	cx_dev->dev.bus = &tiocx_bus_type;

	cx_dev->dev.release = tiocx_bus_release;

	snprintf(cx_dev->dev.bus_id, BUS_ID_SIZE, "%d",

		 cx_dev->cx_id.nasid);

	dev_set_name(&cx_dev->dev, "%d", cx_dev->cx_id.nasid);

	device_register(&cx_dev->dev);

	get_device(&cx_dev->dev);