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

Commit e4a3c3f0 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Greg Kroah-Hartman
Browse files

pcmcia: some class_device fallout 



As found on some arm defconfigs.

I only looked at how original patch changes things and other patches fix
compilation. ;-)

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4aca67e5

drivers/pcmcia/at91_cf.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int __init at91_cf_probe(struct platform_device *pdev) 
		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

drivers/pcmcia/soc_common.c

+4 −4
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ dump_bits(char **p, const char *prefix, unsigned int val, struct bittbl *bits, i 
 *

 * 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 *dev, char *buf) 


	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 device *dev, struct pcmcia_low_level *ops 


		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 device *dev, struct pcmcia_low_level *ops 


		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);