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

Commit a9b12619 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

device create: misc: convert device_create_drvdata to device_create 



Now that device_create() has been audited, rename things back to the
original call to be sane.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 91bd418f

arch/mips/kernel/rtlx.c

+2 −2
Original line number Diff line number Diff line
@@ -522,8 +522,8 @@ static int __init rtlx_module_init(void) 
		atomic_set(&channel_wqs[i].in_open, 0);

		mutex_init(&channel_wqs[i].mutex);



		dev = device_create_drvdata(mt_class, NULL, MKDEV(major, i),

					    NULL, "%s%d", module_name, i);

		dev = device_create(mt_class, NULL, MKDEV(major, i), NULL,

				    "%s%d", module_name, i);

		if (IS_ERR(dev)) {

			err = PTR_ERR(dev);

			goto out_chrdev;

arch/mips/sibyte/common/sb_tbprof.c

+1 −2
Original line number Diff line number Diff line
@@ -576,8 +576,7 @@ static int __init sbprof_tb_init(void) 


	tb_class = tbc;



	dev = device_create_drvdata(tbc, NULL, MKDEV(SBPROF_TB_MAJOR, 0),

				    NULL, "tb");

	dev = device_create(tbc, NULL, MKDEV(SBPROF_TB_MAJOR, 0), NULL, "tb");

	if (IS_ERR(dev)) {

		err = PTR_ERR(dev);

		goto out_class;

arch/x86/kernel/cpuid.c

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ static __cpuinit int cpuid_device_create(int cpu) 
{

	struct device *dev;



	dev = device_create_drvdata(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu),

				    NULL, "cpu%d", cpu);

	dev = device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu), NULL,

			    "cpu%d", cpu);

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}

arch/x86/kernel/msr.c

+2 −2
Original line number Diff line number Diff line
@@ -163,8 +163,8 @@ static int __cpuinit msr_device_create(int cpu) 
{

	struct device *dev;



	dev = device_create_drvdata(msr_class, NULL, MKDEV(MSR_MAJOR, cpu),

				    NULL, "msr%d", cpu);

	dev = device_create(msr_class, NULL, MKDEV(MSR_MAJOR, cpu), NULL,

			    "msr%d", cpu);

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}

drivers/dca/dca-sysfs.c

+3 −5
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ int dca_sysfs_add_req(struct dca_provider *dca, struct device *dev, int slot) 
	struct device *cd;

	static int req_count;



	cd = device_create_drvdata(dca_class, dca->cd,

				   MKDEV(0, slot + 1), NULL,

	cd = device_create(dca_class, dca->cd, MKDEV(0, slot + 1), NULL,

			   "requester%d", req_count++);

	if (IS_ERR(cd))

		return PTR_ERR(cd);
@@ -48,8 +47,7 @@ idr_try_again: 
		return err;

	}



	cd = device_create_drvdata(dca_class, dev, MKDEV(0, 0), NULL,

				   "dca%d", dca->id);

	cd = device_create(dca_class, dev, MKDEV(0, 0), NULL, "dca%d", dca->id);

	if (IS_ERR(cd)) {

		spin_lock(&dca_idr_lock);

		idr_remove(&dca_idr, dca->id);