pcmcia: use dev_printk in module pcmcia (ac449d6e) · Commits · jan.koester / Linux

drivers/pcmcia/ds.c

+73 −62

Original line number	Original line	Diff line number	Diff line
	@@ -51,8 +51,13 @@ module_param_named(pc_debug, ds_pc_debug, int, 0644);
	if (ds_pc_debug > (lvl)) \		if (ds_pc_debug > (lvl)) \
	printk(KERN_DEBUG "ds: " fmt , ## arg); \		printk(KERN_DEBUG "ds: " fmt , ## arg); \
	} while (0)		} while (0)
			#define ds_dev_dbg(lvl, dev, fmt, arg...) do { \
			if (ds_pc_debug > (lvl)) \
			dev_printk(KERN_DEBUG, dev, "ds: " fmt , ## arg); \
			} while (0)
	#else		#else
	#define ds_dbg(lvl, fmt, arg...) do { } while (0)		#define ds_dbg(lvl, fmt, arg...) do { } while (0)
			#define ds_dev_dbg(lvl, dev, fmt, arg...) do { } while (0)
	#endif		#endif

	spinlock_t pcmcia_dev_list_lock;		spinlock_t pcmcia_dev_list_lock;
	@@ -391,7 +396,7 @@ static void pcmcia_release_function(struct kref *ref)
	static void pcmcia_release_dev(struct device *dev)		static void pcmcia_release_dev(struct device *dev)
	{		{
	struct pcmcia_device *p_dev = to_pcmcia_dev(dev);		struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
	ds_dbg(1, "releasing device %s\n", p_dev->dev.bus_id);		ds_dev_dbg(1, dev, "releasing device\n");
	pcmcia_put_socket(p_dev->socket);		pcmcia_put_socket(p_dev->socket);
	kfree(p_dev->devname);		kfree(p_dev->devname);
	kref_put(&p_dev->function_config->ref, pcmcia_release_function);		kref_put(&p_dev->function_config->ref, pcmcia_release_function);
	@@ -401,7 +406,7 @@ static void pcmcia_release_dev(struct device *dev)
	static void pcmcia_add_device_later(struct pcmcia_socket *s, int mfc)		static void pcmcia_add_device_later(struct pcmcia_socket *s, int mfc)
	{		{
	if (!s->pcmcia_state.device_add_pending) {		if (!s->pcmcia_state.device_add_pending) {
	ds_dbg(1, "scheduling to add %s secondary"		ds_dev_dbg(1, &s->dev, "scheduling to add %s secondary"
	" device to %d\n", mfc ? "mfc" : "pfc", s->sock);		" device to %d\n", mfc ? "mfc" : "pfc", s->sock);
	s->pcmcia_state.device_add_pending = 1;		s->pcmcia_state.device_add_pending = 1;
	s->pcmcia_state.mfc_pfc = mfc;		s->pcmcia_state.mfc_pfc = mfc;
	@@ -427,8 +432,7 @@ static int pcmcia_device_probe(struct device * dev)
	p_drv = to_pcmcia_drv(dev->driver);		p_drv = to_pcmcia_drv(dev->driver);
	s = p_dev->socket;		s = p_dev->socket;

	ds_dbg(1, "trying to bind %s to %s\n", p_dev->dev.bus_id,		ds_dev_dbg(1, dev, "trying to bind to %s\n", p_drv->drv.name);
	p_drv->drv.name);

	if ((!p_drv->probe) \|\| (!p_dev->function_config) \|\|		if ((!p_drv->probe) \|\| (!p_dev->function_config) \|\|
	(!try_module_get(p_drv->owner))) {		(!try_module_get(p_drv->owner))) {
	@@ -443,15 +447,16 @@ static int pcmcia_device_probe(struct device * dev)
	p_dev->conf.ConfigBase = cis_config.base;		p_dev->conf.ConfigBase = cis_config.base;
	p_dev->conf.Present = cis_config.rmask[0];		p_dev->conf.Present = cis_config.rmask[0];
	} else {		} else {
	printk(KERN_INFO "pcmcia: could not parse base and rmask0 of CIS\n");		dev_printk(KERN_INFO, dev,
			"pcmcia: could not parse base and rmask0 of CIS\n");
	p_dev->conf.ConfigBase = 0;		p_dev->conf.ConfigBase = 0;
	p_dev->conf.Present = 0;		p_dev->conf.Present = 0;
	}		}

	ret = p_drv->probe(p_dev);		ret = p_drv->probe(p_dev);
	if (ret) {		if (ret) {
	ds_dbg(1, "binding %s to %s failed with %d\n",		ds_dev_dbg(1, dev, "binding to %s failed with %d\n",
	p_dev->dev.bus_id, p_drv->drv.name, ret);		p_drv->drv.name, ret);
	goto put_module;		goto put_module;
	}		}

	@@ -485,7 +490,8 @@ static void pcmcia_card_remove(struct pcmcia_socket s, struct pcmcia_device le
	struct pcmcia_device *tmp;		struct pcmcia_device *tmp;
	unsigned long flags;		unsigned long flags;

	ds_dbg(2, "pcmcia_card_remove(%d) %s\n", s->sock,		ds_dev_dbg(2, leftover ? &leftover->dev : &s->dev,
			"pcmcia_card_remove(%d) %s\n", s->sock,
	leftover ? leftover->devname : "");		leftover ? leftover->devname : "");

	if (!leftover)		if (!leftover)
	@@ -503,7 +509,7 @@ static void pcmcia_card_remove(struct pcmcia_socket s, struct pcmcia_device le
	p_dev->_removed=1;		p_dev->_removed=1;
	spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);		spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);

	ds_dbg(2, "unregistering device %s\n", p_dev->dev.bus_id);		ds_dev_dbg(2, &p_dev->dev, "unregistering device\n");
	device_unregister(&p_dev->dev);		device_unregister(&p_dev->dev);
	}		}

	@@ -520,7 +526,7 @@ static int pcmcia_device_remove(struct device * dev)
	p_dev = to_pcmcia_dev(dev);		p_dev = to_pcmcia_dev(dev);
	p_drv = to_pcmcia_drv(dev->driver);		p_drv = to_pcmcia_drv(dev->driver);

	ds_dbg(1, "removing device %s\n", p_dev->dev.bus_id);		ds_dev_dbg(1, dev, "removing device\n");

	/* If we're removing the primary module driving a		/* If we're removing the primary module driving a
	* pseudo multi-function card, we need to unbind		* pseudo multi-function card, we need to unbind
	@@ -543,12 +549,14 @@ static int pcmcia_device_remove(struct device * dev)

	/* check for proper unloading */		/* check for proper unloading */
	if (p_dev->_irq \|\| p_dev->_io \|\| p_dev->_locked)		if (p_dev->_irq \|\| p_dev->_io \|\| p_dev->_locked)
	printk(KERN_INFO "pcmcia: driver %s did not release config properly\n",		dev_printk(KERN_INFO, dev,
			"pcmcia: driver %s did not release config properly\n",
	p_drv->drv.name);		p_drv->drv.name);

	for (i = 0; i < MAX_WIN; i++)		for (i = 0; i < MAX_WIN; i++)
	if (p_dev->_win & CLIENT_WIN_REQ(i))		if (p_dev->_win & CLIENT_WIN_REQ(i))
	printk(KERN_INFO "pcmcia: driver %s did not release windows properly\n",		dev_printk(KERN_INFO, dev,
			"pcmcia: driver %s did not release window properly\n",
	p_drv->drv.name);		p_drv->drv.name);

	/* references from pcmcia_probe_device */		/* references from pcmcia_probe_device */
	@@ -598,7 +606,8 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
	}		}
	if (!pccard_read_tuple(p_dev->socket, p_dev->func,		if (!pccard_read_tuple(p_dev->socket, p_dev->func,
	CISTPL_DEVICE_GEO, devgeo)) {		CISTPL_DEVICE_GEO, devgeo)) {
	ds_dbg(0, "mem device geometry probably means "		ds_dev_dbg(0, &p_dev->dev,
			"mem device geometry probably means "
	"FUNCID_MEMORY\n");		"FUNCID_MEMORY\n");
	p_dev->func_id = CISTPL_FUNCID_MEMORY;		p_dev->func_id = CISTPL_FUNCID_MEMORY;
	p_dev->has_func_id = 1;		p_dev->has_func_id = 1;
	@@ -680,7 +689,7 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
	if (!p_dev->devname)		if (!p_dev->devname)
	goto err_free;		goto err_free;
	sprintf (p_dev->devname, "pcmcia%s", p_dev->dev.bus_id);		sprintf (p_dev->devname, "pcmcia%s", p_dev->dev.bus_id);
	ds_dbg(3, "devname is %s\n", p_dev->devname);		ds_dev_dbg(3, &p_dev->dev, "devname is %s\n", p_dev->devname);

	spin_lock_irqsave(&pcmcia_dev_list_lock, flags);		spin_lock_irqsave(&pcmcia_dev_list_lock, flags);

	@@ -701,7 +710,7 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
	spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);		spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);

	if (!p_dev->function_config) {		if (!p_dev->function_config) {
	ds_dbg(3, "creating config_t for %s\n", p_dev->dev.bus_id);		ds_dev_dbg(3, &p_dev->dev, "creating config_t\n");
	p_dev->function_config = kzalloc(sizeof(struct config_t),		p_dev->function_config = kzalloc(sizeof(struct config_t),
	GFP_KERNEL);		GFP_KERNEL);
	if (!p_dev->function_config)		if (!p_dev->function_config)
	@@ -709,7 +718,8 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
	kref_init(&p_dev->function_config->ref);		kref_init(&p_dev->function_config->ref);
	}		}

	printk(KERN_NOTICE "pcmcia: registering new device %s\n",		dev_printk(KERN_NOTICE, &p_dev->dev,
			"pcmcia: registering new device %s\n",
	p_dev->devname);		p_dev->devname);

	pcmcia_device_query(p_dev);		pcmcia_device_query(p_dev);
	@@ -745,19 +755,20 @@ static int pcmcia_card_add(struct pcmcia_socket *s)
	int ret = 0;		int ret = 0;

	if (!(s->resource_setup_done)) {		if (!(s->resource_setup_done)) {
	ds_dbg(3, "no resources available, delaying card_add\n");		ds_dev_dbg(3, &s->dev,
			"no resources available, delaying card_add\n");
	return -EAGAIN; /* try again, but later... */		return -EAGAIN; /* try again, but later... */
	}		}

	if (pcmcia_validate_mem(s)) {		if (pcmcia_validate_mem(s)) {
	ds_dbg(3, "validating mem resources failed, "		ds_dev_dbg(3, &s->dev, "validating mem resources failed, "
	"delaying card_add\n");		"delaying card_add\n");
	return -EAGAIN; /* try again, but later... */		return -EAGAIN; /* try again, but later... */
	}		}

	ret = pccard_validate_cis(s, BIND_FN_ALL, &no_chains);		ret = pccard_validate_cis(s, BIND_FN_ALL, &no_chains);
	if (ret \|\| !no_chains) {		if (ret \|\| !no_chains) {
	ds_dbg(0, "invalid CIS or invalid resources\n");		ds_dev_dbg(0, &s->dev, "invalid CIS or invalid resources\n");
	return -ENODEV;		return -ENODEV;
	}		}

	@@ -778,7 +789,7 @@ static void pcmcia_delayed_add_device(struct work_struct *work)
	{		{
	struct pcmcia_socket *s =		struct pcmcia_socket *s =
	container_of(work, struct pcmcia_socket, device_add);		container_of(work, struct pcmcia_socket, device_add);
	ds_dbg(1, "adding additional device to %d\n", s->sock);		ds_dev_dbg(1, &s->dev, "adding additional device to %d\n", s->sock);
	pcmcia_device_add(s, s->pcmcia_state.mfc_pfc);		pcmcia_device_add(s, s->pcmcia_state.mfc_pfc);
	s->pcmcia_state.device_add_pending = 0;		s->pcmcia_state.device_add_pending = 0;
	s->pcmcia_state.mfc_pfc = 0;		s->pcmcia_state.mfc_pfc = 0;
	@@ -788,8 +799,7 @@ static int pcmcia_requery(struct device dev, void _data)
	{		{
	struct pcmcia_device *p_dev = to_pcmcia_dev(dev);		struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
	if (!p_dev->dev.driver) {		if (!p_dev->dev.driver) {
	ds_dbg(1, "update device information for %s\n",		ds_dev_dbg(1, dev, "update device information\n");
	p_dev->dev.bus_id);
	pcmcia_device_query(p_dev);		pcmcia_device_query(p_dev);
	}		}

	@@ -803,7 +813,7 @@ static void pcmcia_bus_rescan(struct pcmcia_socket *skt, int new_cis)
	unsigned long flags;		unsigned long flags;

	/* must be called with skt_mutex held */		/* must be called with skt_mutex held */
	ds_dbg(0, "re-scanning socket %d\n", skt->sock);		ds_dev_dbg(0, &skt->dev, "re-scanning socket %d\n", skt->sock);

	spin_lock_irqsave(&pcmcia_dev_list_lock, flags);		spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
	if (list_empty(&skt->devices_list))		if (list_empty(&skt->devices_list))
	@@ -860,10 +870,11 @@ static int pcmcia_load_firmware(struct pcmcia_device dev, char filename)
	if (!filename)		if (!filename)
	return -EINVAL;		return -EINVAL;

	ds_dbg(1, "trying to load CIS file %s\n", filename);		ds_dev_dbg(1, &dev->dev, "trying to load CIS file %s\n", filename);

	if (strlen(filename) > (FIRMWARE_NAME_MAX - 1)) {		if (strlen(filename) > (FIRMWARE_NAME_MAX - 1)) {
	printk(KERN_WARNING "pcmcia: CIS filename is too long [%s]\n",		dev_printk(KERN_WARNING, &dev->dev,
			"pcmcia: CIS filename is too long [%s]\n",
	filename);		filename);
	return -EINVAL;		return -EINVAL;
	}		}
	@@ -873,7 +884,8 @@ static int pcmcia_load_firmware(struct pcmcia_device dev, char filename)
	if (request_firmware(&fw, path, &dev->dev) == 0) {		if (request_firmware(&fw, path, &dev->dev) == 0) {
	if (fw->size >= CISTPL_MAX_CIS_SIZE) {		if (fw->size >= CISTPL_MAX_CIS_SIZE) {
	ret = -EINVAL;		ret = -EINVAL;
	printk(KERN_ERR "pcmcia: CIS override is too big\n");		dev_printk(KERN_ERR, &dev->dev,
			"pcmcia: CIS override is too big\n");
	goto release;		goto release;
	}		}

	@@ -889,7 +901,8 @@ static int pcmcia_load_firmware(struct pcmcia_device dev, char filename)
	if (!pcmcia_replace_cis(s, cis))		if (!pcmcia_replace_cis(s, cis))
	ret = 0;		ret = 0;
	else {		else {
	printk(KERN_ERR "pcmcia: CIS override failed\n");		dev_printk(KERN_ERR, &dev->dev,
			"pcmcia: CIS override failed\n");
	goto release;		goto release;
	}		}

	@@ -993,14 +1006,14 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
	* after it has re-checked that there is no possible module		* after it has re-checked that there is no possible module
	* with a prod_id/manf_id/card_id match.		* with a prod_id/manf_id/card_id match.
	*/		*/
	ds_dbg(0, "skipping FUNC_ID match for %s until userspace "		ds_dev_dbg(0, &dev->dev,
	"interaction\n", dev->dev.bus_id);		"skipping FUNC_ID match until userspace interaction\n");
	if (!dev->allow_func_id_match)		if (!dev->allow_func_id_match)
	return 0;		return 0;
	}		}

	if (did->match_flags & PCMCIA_DEV_ID_MATCH_FAKE_CIS) {		if (did->match_flags & PCMCIA_DEV_ID_MATCH_FAKE_CIS) {
	ds_dbg(0, "device %s needs a fake CIS\n", dev->dev.bus_id);		ds_dev_dbg(0, &dev->dev, "device needs a fake CIS\n");
	if (!dev->socket->fake_cis)		if (!dev->socket->fake_cis)
	pcmcia_load_firmware(dev, did->cisfile);		pcmcia_load_firmware(dev, did->cisfile);

	@@ -1032,11 +1045,9 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {
	/* match dynamic devices first */		/* match dynamic devices first */
	spin_lock(&p_drv->dynids.lock);		spin_lock(&p_drv->dynids.lock);
	list_for_each_entry(dynid, &p_drv->dynids.list, node) {		list_for_each_entry(dynid, &p_drv->dynids.list, node) {
	ds_dbg(3, "trying to match %s to %s\n", dev->bus_id,		ds_dev_dbg(3, dev, "trying to match to %s\n", drv->name);
	drv->name);
	if (pcmcia_devmatch(p_dev, &dynid->id)) {		if (pcmcia_devmatch(p_dev, &dynid->id)) {
	ds_dbg(0, "matched %s to %s\n", dev->bus_id,		ds_dev_dbg(0, dev, "matched to %s\n", drv->name);
	drv->name);
	spin_unlock(&p_drv->dynids.lock);		spin_unlock(&p_drv->dynids.lock);
	return 1;		return 1;
	}		}
	@@ -1046,18 +1057,15 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {
	#ifdef CONFIG_PCMCIA_IOCTL		#ifdef CONFIG_PCMCIA_IOCTL
	/* matching by cardmgr */		/* matching by cardmgr */
	if (p_dev->cardmgr == p_drv) {		if (p_dev->cardmgr == p_drv) {
	ds_dbg(0, "cardmgr matched %s to %s\n", dev->bus_id,		ds_dev_dbg(0, dev, "cardmgr matched to %s\n", drv->name);
	drv->name);
	return 1;		return 1;
	}		}
	#endif		#endif

	while (did && did->match_flags) {		while (did && did->match_flags) {
	ds_dbg(3, "trying to match %s to %s\n", dev->bus_id,		ds_dev_dbg(3, dev, "trying to match to %s\n", drv->name);
	drv->name);
	if (pcmcia_devmatch(p_dev, did)) {		if (pcmcia_devmatch(p_dev, did)) {
	ds_dbg(0, "matched %s to %s\n", dev->bus_id,		ds_dev_dbg(0, dev, "matched to %s\n", drv->name);
	drv->name);
	return 1;		return 1;
	}		}
	did++;		did++;
	@@ -1263,7 +1271,7 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
	if (p_dev->suspended)		if (p_dev->suspended)
	return 0;		return 0;

	ds_dbg(2, "suspending %s\n", dev->bus_id);		ds_dev_dbg(2, dev, "suspending\n");

	if (dev->driver)		if (dev->driver)
	p_drv = to_pcmcia_drv(dev->driver);		p_drv = to_pcmcia_drv(dev->driver);
	@@ -1274,7 +1282,8 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
	if (p_drv->suspend) {		if (p_drv->suspend) {
	ret = p_drv->suspend(p_dev);		ret = p_drv->suspend(p_dev);
	if (ret) {		if (ret) {
	printk(KERN_ERR "pcmcia: device %s (driver %s) did "		dev_printk(KERN_ERR, dev,
			"pcmcia: device %s (driver %s) did "
	"not want to go to sleep (%d)\n",		"not want to go to sleep (%d)\n",
	p_dev->devname, p_drv->drv.name, ret);		p_dev->devname, p_drv->drv.name, ret);
	goto out;		goto out;
	@@ -1282,7 +1291,7 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
	}		}

	if (p_dev->device_no == p_dev->func) {		if (p_dev->device_no == p_dev->func) {
	ds_dbg(2, "releasing configuration for %s\n", dev->bus_id);		ds_dev_dbg(2, dev, "releasing configuration\n");
	pcmcia_release_configuration(p_dev);		pcmcia_release_configuration(p_dev);
	}		}

	@@ -1302,7 +1311,7 @@ static int pcmcia_dev_resume(struct device * dev)
	if (!p_dev->suspended)		if (!p_dev->suspended)
	return 0;		return 0;

	ds_dbg(2, "resuming %s\n", dev->bus_id);		ds_dev_dbg(2, dev, "resuming\n");

	if (dev->driver)		if (dev->driver)
	p_drv = to_pcmcia_drv(dev->driver);		p_drv = to_pcmcia_drv(dev->driver);
	@@ -1311,7 +1320,7 @@ static int pcmcia_dev_resume(struct device * dev)
	goto out;		goto out;

	if (p_dev->device_no == p_dev->func) {		if (p_dev->device_no == p_dev->func) {
	ds_dbg(2, "requesting configuration for %s\n", dev->bus_id);		ds_dev_dbg(2, dev, "requesting configuration\n");
	ret = pcmcia_request_configuration(p_dev, &p_dev->conf);		ret = pcmcia_request_configuration(p_dev, &p_dev->conf);
	if (ret)		if (ret)
	goto out;		goto out;
	@@ -1353,14 +1362,14 @@ static int pcmcia_bus_resume_callback(struct device dev, void _data)

	static int pcmcia_bus_resume(struct pcmcia_socket *skt)		static int pcmcia_bus_resume(struct pcmcia_socket *skt)
	{		{
	ds_dbg(2, "resuming socket %d\n", skt->sock);		ds_dev_dbg(2, &skt->dev, "resuming socket %d\n", skt->sock);
	bus_for_each_dev(&pcmcia_bus_type, NULL, skt, pcmcia_bus_resume_callback);		bus_for_each_dev(&pcmcia_bus_type, NULL, skt, pcmcia_bus_resume_callback);
	return 0;		return 0;
	}		}

	static int pcmcia_bus_suspend(struct pcmcia_socket *skt)		static int pcmcia_bus_suspend(struct pcmcia_socket *skt)
	{		{
	ds_dbg(2, "suspending socket %d\n", skt->sock);		ds_dev_dbg(2, &skt->dev, "suspending socket %d\n", skt->sock);
	if (bus_for_each_dev(&pcmcia_bus_type, NULL, skt,		if (bus_for_each_dev(&pcmcia_bus_type, NULL, skt,
	pcmcia_bus_suspend_callback)) {		pcmcia_bus_suspend_callback)) {
	pcmcia_bus_resume(skt);		pcmcia_bus_resume(skt);
	@@ -1386,12 +1395,13 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)
	struct pcmcia_socket *s = pcmcia_get_socket(skt);		struct pcmcia_socket *s = pcmcia_get_socket(skt);

	if (!s) {		if (!s) {
	printk(KERN_ERR "PCMCIA obtaining reference to socket %p " \		dev_printk(KERN_ERR, &skt->dev,
	"failed, event 0x%x lost!\n", skt, event);		"PCMCIA obtaining reference to socket " \
			"failed, event 0x%x lost!\n", event);
	return -ENODEV;		return -ENODEV;
	}		}

	ds_dbg(1, "ds_event(0x%06x, %d, 0x%p)\n",		ds_dev_dbg(1, &skt->dev, "ds_event(0x%06x, %d, 0x%p)\n",
	event, priority, skt);		event, priority, skt);

	switch (event) {		switch (event) {
	@@ -1467,7 +1477,8 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,

	socket = pcmcia_get_socket(socket);		socket = pcmcia_get_socket(socket);
	if (!socket) {		if (!socket) {
	printk(KERN_ERR "PCMCIA obtaining reference to socket %p failed\n", socket);		dev_printk(KERN_ERR, dev,
			"PCMCIA obtaining reference to socket failed\n");
	return -ENODEV;		return -ENODEV;
	}		}

	@@ -1487,7 +1498,7 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,

	ret = pccard_register_pcmcia(socket, &pcmcia_bus_callback);		ret = pccard_register_pcmcia(socket, &pcmcia_bus_callback);
	if (ret) {		if (ret) {
	printk(KERN_ERR "PCMCIA registration PCCard core failed for socket %p\n", socket);		dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");
	pcmcia_put_socket(socket);		pcmcia_put_socket(socket);
	return (ret);		return (ret);
	}		}

drivers/pcmcia/pcmcia_resource.c

+8 −5

Original line number	Original line	Diff line number	Diff line
	@@ -49,11 +49,12 @@ extern int ds_pc_debug;

	#define ds_dbg(skt, lvl, fmt, arg...) do { \		#define ds_dbg(skt, lvl, fmt, arg...) do { \
	if (ds_pc_debug >= lvl) \		if (ds_pc_debug >= lvl) \
	printk(KERN_DEBUG "pcmcia_resource: %s: " fmt, \		dev_printk(KERN_DEBUG, &skt->dev, \
	cs_socket_name(skt) , ## arg); \		"pcmcia_resource: " fmt, \
			## arg); \
	} while (0)		} while (0)
	#else		#else
	#define ds_dbg(lvl, fmt, arg...) do { } while (0)		#define ds_dbg(skt, lvl, fmt, arg...) do { } while (0)
	#endif		#endif


	@@ -802,8 +803,10 @@ int pcmcia_request_irq(struct pcmcia_device p_dev, irq_req_t req)
	/* Make sure the fact the request type was overridden is passed back */		/* Make sure the fact the request type was overridden is passed back */
	if (type == IRQF_SHARED && !(req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)) {		if (type == IRQF_SHARED && !(req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)) {
	req->Attributes \|= IRQ_TYPE_DYNAMIC_SHARING;		req->Attributes \|= IRQ_TYPE_DYNAMIC_SHARING;
	printk(KERN_WARNING "pcmcia: request for exclusive IRQ could not be fulfilled.\n");		dev_printk(KERN_WARNING, &p_dev->dev, "pcmcia: "
	printk(KERN_WARNING "pcmcia: the driver needs updating to supported shared IRQ lines.\n");		"request for exclusive IRQ could not be fulfilled.\n");
			dev_printk(KERN_WARNING, &p_dev->dev, "pcmcia: the driver "
			"needs updating to supported shared IRQ lines.\n");
	}		}
	c->irq.Attributes = req->Attributes;		c->irq.Attributes = req->Attributes;
	s->irq.AssignedIRQ = req->AssignedIRQ = irq;		s->irq.AssignedIRQ = req->AssignedIRQ = irq;