From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, Kay Sievers <kay.sievers@vrfy•org>,
Adrian McMenamin <adrian@mcmen•demon.co.uk>,
Paul Mundt <lethal@linux-sh•org>
Subject: linux-next: manual merge of the driver-core tree with the sh tree
Date: Tue, 3 Mar 2009 10:45:33 +1100 [thread overview]
Message-ID: <20090303104533.e411cdff.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
drivers/sh/maple/maple.c between commit
b233b28eac0cc37d07c2d007ea08c86c778c5af4 ("sh: maple: Support block reads
and writes") from the sh tree and commit
f1f93f5605f08a698418e52828bef46973b6a4ec ("sh: struct device - replace
bus_id with dev_name(), dev_set_name()") from the driver-core tree.
I fixed it up (see below) and can carry the fix as necessary.
Maybe we could persuade Paul to apply the driver-core patch (not the
patch below)to the sh tree (assuming he has been sent a copy)?
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/sh/maple/maple.c
index 4054fe9,7e1257a..0000000
--- a/drivers/sh/maple/maple.c
+++ b/drivers/sh/maple/maple.c
@@@ -367,10 -423,12 +367,10 @@@ static void maple_attach_driver(struct
if (function > 0x200) {
/* Do this silently - as not a real device */
function = 0;
- mdev->driver = &maple_dummy_driver;
+ mdev->driver = &maple_unsupported_device;
- sprintf(mdev->dev.bus_id, "%d:0.port", mdev->port);
+ dev_set_name(&mdev->dev, "%d:0.port", mdev->port);
+
} else {
- printk(KERN_INFO
- "Maple bus at (%d, %d): Function 0x%lX\n",
- mdev->port, mdev->unit, function);
matched =
bus_for_each_drv(&maple_bus_type, NULL, mdev,
@@@ -378,22 -436,21 +378,22 @@@
if (matched == 0) {
/* Driver does not exist yet */
- printk(KERN_INFO
- "No maple driver found.\n");
- mdev->driver = &maple_dummy_driver;
+ dev_info(&mdev->dev, "no driver found\n");
+ mdev->driver = &maple_unsupported_device;
}
- sprintf(mdev->dev.bus_id, "%d:0%d.%lX", mdev->port,
- mdev->unit, function);
+ dev_set_name(&mdev->dev, "%d:0%d.%lX", mdev->port,
+ mdev->unit, function);
}
+
mdev->function = function;
mdev->dev.release = &maple_release_device;
- retval = device_register(&mdev->dev);
- if (retval) {
- printk(KERN_INFO
- "Maple bus: Attempt to register device"
- " (%x, %x) failed.\n",
- mdev->port, mdev->unit);
+
+ atomic_set(&mdev->busy, 0);
+ error = device_register(&mdev->dev);
+ if (error) {
+ dev_warn(&mdev->dev, "could not register device at"
+ " (%d, %d), with error 0x%X\n", mdev->unit,
+ mdev->port, error);
maple_free_dev(mdev);
mdev = NULL;
return;
next reply other threads:[~2009-03-02 23:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-02 23:45 Stephen Rothwell [this message]
2009-03-02 23:59 ` linux-next: manual merge of the driver-core tree with the sh tree Greg KH
2009-03-03 0:12 ` Paul Mundt
-- strict thread matches above, loose matches on Subject: below --
2010-03-31 5:03 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090303104533.e411cdff.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=adrian@mcmen$(echo .)demon.co.uk \
--cc=greg@kroah$(echo .)com \
--cc=kay.sievers@vrfy$(echo .)org \
--cc=lethal@linux-sh$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox