Dominik Brodowski wrote:
> Signed-off-by: Dominik Brodowski <[EMAIL PROTECTED]>
> ---
> drivers/pcmcia/ds.c | 135 ++++++++++++++++++++-----------------
> drivers/pcmcia/pcmcia_resource.c | 11 ++--
> 2 files changed, 79 insertions(+), 67 deletions(-)
>
> diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
> index 4174d96..beac24a 100644
> --- a/drivers/pcmcia/ds.c
> +++ b/drivers/pcmcia/ds.c
> @@ -48,11 +48,16 @@ int ds_pc_debug;
> module_param_named(pc_debug, ds_pc_debug, int, 0644);
>
> #define ds_dbg(lvl, fmt, arg...) do { \
> - if (ds_pc_debug > (lvl)) \
> + if (ds_pc_debug > (lvl)) \
> printk(KERN_DEBUG "ds: " fmt , ## arg); \
> } 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
> #define ds_dbg(lvl, fmt, arg...) do { } while (0)
> +#define ds_dev_dbg(lvl, dev, fmt, arg...) do { } while (0)
> #endif
>
> 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)
> {
> 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);
> kfree(p_dev->devname);
> 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)
> {
> 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);
> s->pcmcia_state.device_add_pending = 1;
> 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);
> s = p_dev->socket;
>
> - ds_dbg(1, "trying to bind %s to %s\n", p_dev->dev.bus_id,
> - p_drv->drv.name);
> + ds_dev_dbg(1, dev, "trying to bind to %s\n", p_drv->drv.name);
>
> if ((!p_drv->probe) || (!p_dev->function_config) ||
> (!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.Present = cis_config.rmask[0];
> } 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.Present = 0;
> }
>
> ret = p_drv->probe(p_dev);
> if (ret) {
> - ds_dbg(1, "binding %s to %s failed with %d\n",
> - p_dev->dev.bus_id, p_drv->drv.name, ret);
> + ds_dev_dbg(1, dev, "binding to %s failed with %d\n",
> + p_drv->drv.name, ret);
> goto put_module;
> }
>
> @@ -485,8 +490,9 @@ static void pcmcia_card_remove(struct pcmcia_socket *s,
> struct pcmcia_device *le
> struct pcmcia_device *tmp;
> unsigned long flags;
>
> - ds_dbg(2, "pcmcia_card_remove(%d) %s\n", s->sock,
> - leftover ? leftover->devname : "");
> + ds_dev_dbg(2, leftover ? &leftover->dev : &s->dev,
> + "pcmcia_card_remove(%d) %s\n", s->sock,
> + leftover ? leftover->devname : "");
>
> if (!leftover)
> s->device_count = 0;
> @@ -503,7 +509,7 @@ static void pcmcia_card_remove(struct pcmcia_socket *s,
> struct pcmcia_device *le
> p_dev->_removed=1;
> 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);
> }
>
> @@ -520,7 +526,7 @@ static int pcmcia_device_remove(struct device * dev)
> p_dev = to_pcmcia_dev(dev);
> 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
> * pseudo multi-function card, we need to unbind
> @@ -543,13 +549,15 @@ static int pcmcia_device_remove(struct device * dev)
>
> /* check for proper unloading */
> if (p_dev->_irq || p_dev->_io || p_dev->_locked)
> - printk(KERN_INFO "pcmcia: driver %s did not release config
> properly\n",
> - p_drv->drv.name);
> + dev_printk(KERN_INFO, dev,
> + "pcmcia: driver %s did not release config
> properly\n",
> + p_drv->drv.name);
>
> for (i = 0; i < MAX_WIN; i++)
> if (p_dev->_win & CLIENT_WIN_REQ(i))
> - printk(KERN_INFO "pcmcia: driver %s did not release
> windows properly\n",
> - p_drv->drv.name);
> + dev_printk(KERN_INFO, dev,
> + "pcmcia: driver %s did not release windows
> properly\n",
> + p_drv->drv.name);
>
> /* references from pcmcia_probe_device */
> pcmcia_put_dev(p_dev);
> @@ -598,8 +606,9 @@ static int pcmcia_device_query(struct pcmcia_device
> *p_dev)
> }
> if (!pccard_read_tuple(p_dev->socket, p_dev->func,
> CISTPL_DEVICE_GEO, devgeo)) {
> - ds_dbg(0, "mem device geometry probably means "
> - "FUNCID_MEMORY\n");
> + ds_dev_dbg(0, &p_dev->dev,
> + "mem device geometry probably means "
> + "FUNCID_MEMORY\n");
> p_dev->func_id = CISTPL_FUNCID_MEMORY;
> 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)
> goto err_free;
> 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);
>
> @@ -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);
>
> 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),
> GFP_KERNEL);
> if (!p_dev->function_config)
> @@ -709,8 +718,9 @@ struct pcmcia_device * pcmcia_device_add(struct
> pcmcia_socket *s, unsigned int f
> kref_init(&p_dev->function_config->ref);
> }
>
> - printk(KERN_NOTICE "pcmcia: registering new device %s\n",
> - p_dev->devname);
> + dev_printk(KERN_NOTICE, &p_dev->dev,
> + "pcmcia: registering new device %s\n",
> + p_dev->devname);
>
> pcmcia_device_query(p_dev);
>
> @@ -745,19 +755,20 @@ static int pcmcia_card_add(struct pcmcia_socket *s)
> int ret = 0;
>
> 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... */
> }
>
> 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");
> return -EAGAIN; /* try again, but later... */
> }
>
> ret = pccard_validate_cis(s, BIND_FN_ALL, &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;
> }
>
> @@ -778,7 +789,7 @@ static void pcmcia_delayed_add_device(struct work_struct
> *work)
> {
> struct pcmcia_socket *s =
> 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);
> s->pcmcia_state.device_add_pending = 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);
> if (!p_dev->dev.driver) {
> - ds_dbg(1, "update device information for %s\n",
> - p_dev->dev.bus_id);
> + ds_dev_dbg(1, dev, "update device information\n");
> pcmcia_device_query(p_dev);
> }
>
> @@ -803,7 +813,7 @@ static void pcmcia_bus_rescan(struct pcmcia_socket *skt,
> int new_cis)
> unsigned long flags;
>
> /* 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);
> if (list_empty(&skt->devices_list))
> @@ -860,11 +870,12 @@ static int pcmcia_load_firmware(struct pcmcia_device
> *dev, char * filename)
> if (!filename)
> 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)) {
> - printk(KERN_WARNING "pcmcia: CIS filename is too long [%s]\n",
> - filename);
> + dev_printk(KERN_WARNING, &dev->dev,
> + "pcmcia: CIS filename is too long [%s]\n",
> + filename);
> 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 (fw->size >= CISTPL_MAX_CIS_SIZE) {
> 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;
> }
>
> @@ -889,7 +901,8 @@ static int pcmcia_load_firmware(struct pcmcia_device
> *dev, char * filename)
> if (!pcmcia_replace_cis(s, cis))
> ret = 0;
> else {
> - printk(KERN_ERR "pcmcia: CIS override failed\n");
> + dev_printk(KERN_ERR, &dev->dev,
> + "pcmcia: CIS override failed\n");
> 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
> * with a prod_id/manf_id/card_id match.
> */
> - ds_dbg(0, "skipping FUNC_ID match for %s until userspace "
> - "interaction\n", dev->dev.bus_id);
> + ds_dev_dbg(0, dev, "skipping FUNC_ID match until userspace "
===
This needs to be &dev->dev.
> + "interaction\n");
> if (!dev->allow_func_id_match)
> return 0;
> }
>
> 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, "device needs a fake CIS\n");
===
Same here.
Larry
_______________________________________________
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
