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

Commit 1d7e6cca authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0252c3b4

drivers/macintosh/macio_asic.c

+12 −12
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


#undef DEBUG



#define MAX_NODE_NAME_SIZE (BUS_ID_SIZE - 12)

#define MAX_NODE_NAME_SIZE (20 - 12)



static struct macio_chip      *macio_on_hold;
@@ -240,7 +240,7 @@ static void macio_create_fixup_irq(struct macio_dev *dev, int index, 
	if (irq != NO_IRQ) {

		dev->interrupt[index].start = irq;

		dev->interrupt[index].flags = IORESOURCE_IRQ;

		dev->interrupt[index].name = dev->ofdev.dev.bus_id;

		dev->interrupt[index].name = dev_name(&dev->ofdev.dev);

	}

	if (dev->n_interrupts <= index)

		dev->n_interrupts = index + 1;
@@ -303,7 +303,7 @@ static void macio_setup_interrupts(struct macio_dev *dev) 
			break;

		res->start = irq;

		res->flags = IORESOURCE_IRQ;

		res->name = dev->ofdev.dev.bus_id;

		res->name = dev_name(&dev->ofdev.dev);

		if (macio_resource_quirks(np, res, i - 1)) {

			memset(res, 0, sizeof(struct resource));

			continue;
@@ -325,7 +325,7 @@ static void macio_setup_resources(struct macio_dev *dev, 
		if (index >= MACIO_DEV_COUNT_RESOURCES)

			break;

		*res = r;

		res->name = dev->ofdev.dev.bus_id;

		res->name = dev_name(&dev->ofdev.dev);



		if (macio_resource_quirks(np, res, index)) {

			memset(res, 0, sizeof(struct resource));
@@ -338,7 +338,7 @@ static void macio_setup_resources(struct macio_dev *dev, 
		if (insert_resource(parent_res, res)) {

			printk(KERN_WARNING "Can't request resource "

			       "%d for MacIO device %s\n",

			       index, dev->ofdev.dev.bus_id);

			       index, dev_name(&dev->ofdev.dev));

		}

	}

	dev->n_resources = index;
@@ -385,7 +385,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip, 


	/* MacIO itself has a different reg, we use it's PCI base */

	if (np == chip->of_node) {

		sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s",

		dev_set_name(&dev->ofdev.dev, "%1d.%08x:%.*s",

			     chip->lbus.index,

#ifdef CONFIG_PCI

			(unsigned int)pci_resource_start(chip->lbus.pdev, 0),
@@ -395,7 +395,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip, 
			MAX_NODE_NAME_SIZE, np->name);

	} else {

		reg = of_get_property(np, "reg", NULL);

		sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s",

		dev_set_name(&dev->ofdev.dev, "%1d.%08x:%.*s",

			     chip->lbus.index,

			     reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name);

	}
@@ -408,7 +408,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip, 
	/* Register with core */

	if (of_device_register(&dev->ofdev) != 0) {

		printk(KERN_DEBUG"macio: device registration error for %s!\n",

		       dev->ofdev.dev.bus_id);

		       dev_name(&dev->ofdev.dev));

		kfree(dev);

		return NULL;

	}
@@ -558,7 +558,7 @@ int macio_request_resource(struct macio_dev *dev, int resource_no, 
		resource_no,

		macio_resource_len(dev, resource_no),

		macio_resource_start(dev, resource_no),

		dev->ofdev.dev.bus_id);

		dev_name(&dev->ofdev.dev));

	return -EBUSY;

}