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

Commit 3f978704 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

arm: bus_id -> dev_name() and dev_set_name() conversions 



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

arch/arm/common/locomo.c

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,6 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info) 
		goto out;

	}



	strncpy(dev->dev.bus_id, info->name, sizeof(dev->dev.bus_id));

	/*

	 * If the parent device has a DMA mask associated with it,

	 * propagate it down to the children.
@@ -553,6 +552,7 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info) 
		dev->dev.dma_mask = &dev->dma_mask;

	}



	dev_set_name(&dev->dev, "%s", info->name);

	dev->devid	 = info->devid;

	dev->dev.parent  = lchip->dev;

	dev->dev.bus     = &locomo_bus_type;

arch/arm/common/sa1111.c

+3 −4
Original line number Diff line number Diff line
@@ -550,9 +550,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent, 
		goto out;

	}



	snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id),

		 "%4.4lx", info->offset);



	dev_set_name(&dev->dev, "%4.4lx", info->offset);

	dev->devid	 = info->devid;

	dev->dev.parent  = sachip->dev;

	dev->dev.bus     = &sa1111_bus_type;
@@ -560,7 +558,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent, 
	dev->dev.coherent_dma_mask = sachip->dev->coherent_dma_mask;

	dev->res.start   = sachip->phys + info->offset;

	dev->res.end     = dev->res.start + 511;

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

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

	dev->res.flags   = IORESOURCE_MEM;

	dev->mapbase     = sachip->base + info->offset;

	dev->skpcr_mask  = info->skpcr_mask;
@@ -570,6 +568,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent, 
	if (ret) {

		printk("SA1111: failed to allocate resource for %s\n",

			dev->res.name);

		dev_set_name(&dev->dev, NULL);

		kfree(dev);

		goto out;

	}

arch/arm/common/scoop.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static int __devinit scoop_probe(struct platform_device *pdev) 
	devptr->gpio.base = -1;



	if (inf->gpio_base != 0) {

		devptr->gpio.label = pdev->dev.bus_id;

		devptr->gpio.label = dev_name(&pdev->dev);

		devptr->gpio.base = inf->gpio_base;

		devptr->gpio.ngpio = 12; /* PA11 = 0, PA12 = 1, etc. up to PA22 = 11 */

		devptr->gpio.set = scoop_gpio_set;

arch/arm/kernel/ecard.c

+1 −1
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ static void ecard_proc_init(void) 


#define ec_set_resource(ec,nr,st,sz)				\

	do {							\

		(ec)->resource[nr].name = ec->dev.bus_id;	\

		(ec)->resource[nr].name = dev_name(&ec->dev);	\

		(ec)->resource[nr].start = st;			\

		(ec)->resource[nr].end = (st) + (sz) - 1;	\

		(ec)->resource[nr].flags = IORESOURCE_MEM;	\

arch/arm/mach-integrator/impd1.c

+1 −3
Original line number Diff line number Diff line
@@ -393,9 +393,7 @@ static int impd1_probe(struct lm_device *dev) 
		if (!d)

			continue;



		snprintf(d->dev.bus_id, sizeof(d->dev.bus_id),

			 "lm%x:%5.5lx", dev->id, idev->offset >> 12);



		dev_set_name(&d->dev, "lm%x:%5.5lx", dev->id, idev->offset >> 12);

		d->dev.parent	= &dev->dev;

		d->res.start	= dev->resource.start + idev->offset;

		d->res.end	= d->res.start + SZ_4K - 1;