The patch titled
pcmcia: some class_device fallout
has been added to the -mm tree. Its filename is
pcmcia-some-class_device-fallout.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: pcmcia: some class_device fallout
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
As found on some arm defconfigs.
I only looked at how original patch changes things and other patches fix
compilation. ;-)
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pcmcia/at91_cf.c | 2 +-
drivers/pcmcia/soc_common.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/pcmcia/at91_cf.c~pcmcia-some-class_device-fallout drivers/pcmcia/at91_cf.c
--- a/drivers/pcmcia/at91_cf.c~pcmcia-some-class_device-fallout
+++ a/drivers/pcmcia/at91_cf.c
@@ -278,7 +278,7 @@ static int __init at91_cf_probe(struct p
board->det_pin, board->irq_pin);
cf->socket.owner = THIS_MODULE;
- cf->socket.dev.dev = &pdev->dev;
+ cf->socket.dev.parent = &pdev->dev;
cf->socket.ops = &at91_cf_ops;
cf->socket.resource_ops = &pccard_static_ops;
cf->socket.features = SS_CAP_PCCARD | SS_CAP_STATIC_MAP
diff -puN drivers/pcmcia/soc_common.c~pcmcia-some-class_device-fallout drivers/pcmcia/soc_common.c
--- a/drivers/pcmcia/soc_common.c~pcmcia-some-class_device-fallout
+++ a/drivers/pcmcia/soc_common.c
@@ -478,7 +478,7 @@ dump_bits(char **p, const char *prefix,
*
* Returns: the number of characters added to the buffer
*/
-static ssize_t show_status(struct device *dev, char *buf)
+static ssize_t show_status(struct device *dev, struct device_attribute *attr, char *buf)
{
struct soc_pcmcia_socket *skt =
container_of(dev, struct soc_pcmcia_socket, socket.dev);
@@ -501,7 +501,7 @@ static ssize_t show_status(struct device
return p-buf;
}
-static CLASS_DEVICE_ATTR(status, S_IRUGO, show_status, NULL);
+static DEVICE_ATTR(status, S_IRUGO, show_status, NULL);
static struct pccard_operations soc_common_pcmcia_operations = {
@@ -660,7 +660,7 @@ int soc_common_drv_pcmcia_probe(struct d
skt->socket.ops = &soc_common_pcmcia_operations;
skt->socket.owner = ops->owner;
- skt->socket.dev.dev = dev;
+ skt->socket.dev.parent = dev;
init_timer(&skt->poll_timer);
skt->poll_timer.function = soc_common_pcmcia_poll_event;
@@ -747,7 +747,7 @@ int soc_common_drv_pcmcia_probe(struct d
add_timer(&skt->poll_timer);
- device_create_file(&skt->socket.dev, &device_attr_status);
+ device_create_file(&skt->socket.dev, &dev_attr_status);
}
dev_set_drvdata(dev, sinfo);
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
origin.patch
pcmcia-some-class_device-fallout.patch
git-dvb.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
mwave-interesting-flags-savings.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
