* linux-next: manual merge of the driver-core tree with the powerpc tree
@ 2012-03-09 5:40 Stephen Rothwell
2012-03-09 15:18 ` Greg KH
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2012-03-09 5:40 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Benjamin Herrenschmidt, Paul Mackerras,
linuxppc-dev, Alan Stern
[-- Attachment #1: Type: text/plain, Size: 2222 bytes --]
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 Rothwell sfr@canb.auug.org.au
diff --cc drivers/base/driver.c
index db4f54c,60e4f77..0000000
--- 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)
{
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the powerpc tree
2012-03-09 5:40 linux-next: manual merge of the driver-core tree with the powerpc tree Stephen Rothwell
@ 2012-03-09 15:18 ` Greg KH
0 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2012-03-09 15:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Benjamin Herrenschmidt, Paul Mackerras,
linuxppc-dev, Alan Stern
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the powerpc tree
2011-12-28 5:51 Stephen Rothwell
@ 2012-01-04 23:08 ` Greg KH
0 siblings, 0 replies; 8+ messages in thread
From: Greg KH @ 2012-01-04 23:08 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Kay Sievers,
Ananth N Mavinakayanahalli, Benjamin Herrenschmidt,
Paul Mackerras, linuxppc-dev, Deepthi Dharwar, Trinabh Gupta,
Arun R Bharadwaj
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the driver-core tree with the powerpc tree
@ 2011-12-28 5:51 Stephen Rothwell
2012-01-04 23:08 ` Greg KH
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2011-12-28 5:51 UTC (permalink / raw)
To: Greg KH
Cc: Deepthi Dharwar, Trinabh Gupta, Kay Sievers, linux-kernel,
linux-next, Paul Mackerras, linuxppc-dev, Arun R Bharadwaj
[-- Attachment #1.1: Type: text/plain, Size: 3429 bytes --]
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 Rothwell sfr@canb.auug.org.au
diff --cc arch/powerpc/kernel/sysfs.c
index 6fdf5ff,5e7c165..0000000
--- 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);
[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the powerpc tree
2009-06-16 6:18 ` Greg KH
@ 2009-06-16 6:42 ` Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2009-06-16 6:42 UTC (permalink / raw)
To: Greg KH
Cc: Roel Kluin, linux-kernel, ppc-dev, linux-next, Geert, Uytterhoeven
[-- Attachment #1.1: Type: text/plain, Size: 552 bytes --]
Hi Greg,
On Mon, 15 Jun 2009 23:18:49 -0700 Greg KH <greg@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 Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: manual merge of the driver-core tree with the powerpc tree
2009-06-16 5:53 Stephen Rothwell
@ 2009-06-16 6:18 ` Greg KH
2009-06-16 6:42 ` Stephen Rothwell
0 siblings, 1 reply; 8+ messages in thread
From: Greg KH @ 2009-06-16 6:18 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Geert Uytterhoeven, Roel Kluin,
Benjamin Herrenschmidt, ppc-dev
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the driver-core tree with the powerpc tree
@ 2009-06-16 5:58 Stephen Rothwell
0 siblings, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2009-06-16 5:58 UTC (permalink / raw)
To: Greg KH
Cc: Roel Kluin, linux-kernel, ppc-dev, linux-next, Geert, Uytterhoeven
[-- Attachment #1.1: Type: text/plain, Size: 727 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/block/ps3vram.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 (used the powerpc tree version). Again, Greg, I think the
driver-core tree version is no longer relevant.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: manual merge of the driver-core tree with the powerpc tree
@ 2009-06-16 5:53 Stephen Rothwell
2009-06-16 6:18 ` Greg KH
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2009-06-16 5:53 UTC (permalink / raw)
To: Greg KH
Cc: Roel Kluin, linux-kernel, ppc-dev, linux-next, Geert, Uytterhoeven
[-- Attachment #1.1: Type: text/plain, Size: 724 bytes --]
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 Rothwell sfr@canb.auug.org.au
[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-03-09 15:19 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-09 5:40 linux-next: manual merge of the driver-core tree with the powerpc tree Stephen Rothwell
2012-03-09 15:18 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2011-12-28 5:51 Stephen Rothwell
2012-01-04 23:08 ` Greg KH
2009-06-16 5:58 Stephen Rothwell
2009-06-16 5:53 Stephen Rothwell
2009-06-16 6:18 ` Greg KH
2009-06-16 6:42 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).