Re: linux-next: manual merge of the driver-core tree with the powerpc tree
On Fri, Mar 09, 2012 at 04:40:25PM +1100, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/base/driver.c between commit fcd6f7620202 (driver-core: remove legacy iSeries hack) from the powerpc tree and commit 9875bb480cc8 (Eliminate get_driver() and put_driver()) from the driver-core tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. Looks good to me, thanks for doing this. greg k-h ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
linux-next: manual merge of the driver-core tree with the powerpc tree
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/base/driver.c between commit fcd6f7620202 (driver-core: remove
legacy iSeries hack) from the powerpc tree and commit 9875bb480cc8
(Eliminate get_driver() and put_driver()) from the driver-core tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/base/driver.c
index db4f54c,60e4f77..000
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@@ -123,34 -123,36 +123,6 @@@ void driver_remove_file(struct device_d
}
EXPORT_SYMBOL_GPL(driver_remove_file);
--/**
- * get_driver - increment driver reference count.
- * @drv: driver.
- */
- struct device_driver *get_driver(struct device_driver *drv)
- {
- if (drv) {
- struct driver_private *priv;
- struct kobject *kobj;
-
- kobj = kobject_get(drv-p-kobj);
- priv = to_driver(kobj);
- return priv-driver;
- }
- return NULL;
- }
- EXPORT_SYMBOL_GPL(get_driver);
-
- /**
- * put_driver - decrement driver's refcount.
- * @drv: driver.
- */
- void put_driver(struct device_driver *drv)
- {
- kobject_put(drv-p-kobj);
- }
- EXPORT_SYMBOL_GPL(put_driver);
-
- * driver_add_kobj - add a kobject below the specified driver
- * @drv: requesting device driver
- * @kobj: kobject to add below this driver
- * @fmt: format string that names the kobject
- *
- * You really don't want to do this, this is only here due to one looney
- * iseries driver, go poke those developers if you are annoyed about
- * this...
- */
-int driver_add_kobj(struct device_driver *drv, struct kobject *kobj,
- const char *fmt, ...)
-{
- va_list args;
- char *name;
- int ret;
-
- va_start(args, fmt);
- name = kvasprintf(GFP_KERNEL, fmt, args);
- va_end(args);
-
- if (!name)
- return -ENOMEM;
-
- ret = kobject_add(kobj, drv-p-kobj, %s, name);
- kfree(name);
- return ret;
-}
-EXPORT_SYMBOL_GPL(driver_add_kobj);
-
static int driver_add_groups(struct device_driver *drv,
const struct attribute_group **groups)
{
pgpgg0g0MD5ry.pgp
Description: PGP signature
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: linux-next: manual merge of the driver-core tree with the powerpc tree
On Wed, Dec 28, 2011 at 04:51:02PM +1100, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in arch/powerpc/kernel/sysfs.c between commit 595fe91447b0 (powerpc: Export PIR data through sysfs) from the powerpc tree and commits 8a25a2fd126c (cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem) and 707827f3387d (powerpc/cpuidle: cpuidle driver for pSeries) from the driver-core tree. I fixed it up (see below) and can carry the fix as necessary. Looks good, thanks. greg k-h ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
linux-next: manual merge of the driver-core tree with the powerpc tree
Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in arch/powerpc/kernel/sysfs.c between commit 595fe91447b0 (powerpc: Export PIR data through sysfs) from the powerpc tree and commits 8a25a2fd126c (cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem) and 707827f3387d (powerpc/cpuidle: cpuidle driver for pSeries) from the driver-core tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/powerpc/kernel/sysfs.c index 6fdf5ff,5e7c165..000 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@@ -51,8 -50,7 +51,8 @@@ static ssize_t store_smt_snooze_delay(s if (ret != 1) return -EINVAL; - per_cpu(smt_snooze_delay, cpu-sysdev.id) = snooze; + per_cpu(smt_snooze_delay, cpu-dev.id) = snooze; + update_smt_snooze_delay(snooze); return count; } @@@ -179,13 -177,11 +179,13 @@@ SYSFS_PMCSETUP(mmcra, SPRN_MMCRA) SYSFS_PMCSETUP(purr, SPRN_PURR); SYSFS_PMCSETUP(spurr, SPRN_SPURR); SYSFS_PMCSETUP(dscr, SPRN_DSCR); +SYSFS_PMCSETUP(pir, SPRN_PIR); - static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra); - static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL); - static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr); - static SYSDEV_ATTR(purr, 0600, show_purr, store_purr); - static SYSDEV_ATTR(pir, 0400, show_pir, NULL); + static DEVICE_ATTR(mmcra, 0600, show_mmcra, store_mmcra); + static DEVICE_ATTR(spurr, 0600, show_spurr, NULL); + static DEVICE_ATTR(dscr, 0600, show_dscr, store_dscr); + static DEVICE_ATTR(purr, 0600, show_purr, store_purr); ++static DEVICE_ATTR(pir, 0400, show_pir, NULL); unsigned long dscr_default = 0; EXPORT_SYMBOL(dscr_default); @@@ -386,19 -381,16 +385,19 @@@ static void __cpuinit register_cpu_onli #ifdef CONFIG_PPC64 if (cpu_has_feature(CPU_FTR_MMCRA)) - sysdev_create_file(s, attr_mmcra); + device_create_file(s, dev_attr_mmcra); if (cpu_has_feature(CPU_FTR_PURR)) - sysdev_create_file(s, attr_purr); + device_create_file(s, dev_attr_purr); if (cpu_has_feature(CPU_FTR_SPURR)) - sysdev_create_file(s, attr_spurr); + device_create_file(s, dev_attr_spurr); if (cpu_has_feature(CPU_FTR_DSCR)) - sysdev_create_file(s, attr_dscr); + device_create_file(s, dev_attr_dscr); + + if (cpu_has_feature(CPU_FTR_PPCAS_ARCH_V2)) - sysdev_create_file(s, attr_pir); ++ device_create_file(s, dev_attr_pir); #endif /* CONFIG_PPC64 */ cacheinfo_cpu_online(cpu); @@@ -459,19 -451,16 +458,19 @@@ static void unregister_cpu_online(unsig #ifdef CONFIG_PPC64 if (cpu_has_feature(CPU_FTR_MMCRA)) - sysdev_remove_file(s, attr_mmcra); + device_remove_file(s, dev_attr_mmcra); if (cpu_has_feature(CPU_FTR_PURR)) - sysdev_remove_file(s, attr_purr); + device_remove_file(s, dev_attr_purr); if (cpu_has_feature(CPU_FTR_SPURR)) - sysdev_remove_file(s, attr_spurr); + device_remove_file(s, dev_attr_spurr); if (cpu_has_feature(CPU_FTR_DSCR)) - sysdev_remove_file(s, attr_dscr); + device_remove_file(s, dev_attr_dscr); + + if (cpu_has_feature(CPU_FTR_PPCAS_ARCH_V2)) - sysdev_remove_file(s, attr_pir); ++ device_remove_file(s, dev_attr_pir); #endif /* CONFIG_PPC64 */ cacheinfo_cpu_offline(cpu); pgpkXdWP4hNVc.pgp Description: PGP signature ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
linux-next: manual merge of the driver-core tree with the powerpc tree
Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/block/ps3disk.c between commits 6dee2c87ebbe5d7ce8c4c163966a0bd9c02c75ef (block/ps3: remove driver_data direct access of struct device) and 03fa68c245cccbcb99035cbabaa13b408ba91ab5 (ps3: shorten ps3_system_bus_ [gs]et_driver_data to ps3_system_bus_[gs]et_drvdata) from the powerpc tree and commit db7afa200c4ef6823a2a40e4ea1dd747775be01a (block/ps3: remove driver_data direct access of struct device) from the driver-core tree. I fixed it up (I used the version from the powerpc tree). Greg, I think the driver-core patch is no longer relevant. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp7DK8NPJvkN.pgp Description: PGP signature ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: linux-next: manual merge of the driver-core tree with the powerpc tree
On Tue, Jun 16, 2009 at 03:53:17PM +1000, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in drivers/block/ps3disk.c between commits 6dee2c87ebbe5d7ce8c4c163966a0bd9c02c75ef (block/ps3: remove driver_data direct access of struct device) and 03fa68c245cccbcb99035cbabaa13b408ba91ab5 (ps3: shorten ps3_system_bus_ [gs]et_driver_data to ps3_system_bus_[gs]et_drvdata) from the powerpc tree and commit db7afa200c4ef6823a2a40e4ea1dd747775be01a (block/ps3: remove driver_data direct access of struct device) from the driver-core tree. I fixed it up (I used the version from the powerpc tree). Greg, I think the driver-core patch is no longer relevant. I pushed out an update a number of hours ago (like 6+), so you should have gotten it with this update. When did you pull from my tree? I also just sent a merge request to Linus, so everything should be fixed up now. thanks, greg k-h ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: linux-next: manual merge of the driver-core tree with the powerpc tree
Hi Greg, On Mon, 15 Jun 2009 23:18:49 -0700 Greg KH g...@kroah.com wrote: I pushed out an update a number of hours ago (like 6+), so you should have gotten it with this update. When did you pull from my tree? I also just sent a merge request to Linus, so everything should be fixed up now. OK, thanks. I fetch the trees usually between 8:30am and 10:00am UTC +1000 (or +1100 in summer), so about 7 hours ago :-) -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpdq8U6asvT8.pgp Description: PGP signature ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
