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

Commit f2e6cf76 authored by Joe Perches's avatar Joe Perches Committed by Dominik Brodowski
Browse files

pcmcia: Convert dev_printk to dev_<level> 



Reduce object size a little by using dev_<level>
calls instead of dev_printk(KERN_<LEVEL>.

Other miscellanea:

o Coalesce formats
o Realign arguments
o Use pr_cont instead of naked printk
  reorder test to use "%s\n"

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 3ce3c1c4

drivers/char/pcmcia/cm4040_cs.c

+2 −3
Original line number Diff line number Diff line
@@ -532,8 +532,7 @@ static int reader_config(struct pcmcia_device *link, int devno) 


	fail_rc = pcmcia_enable_device(link);

	if (fail_rc != 0) {

		dev_printk(KERN_INFO, &link->dev,

			   "pcmcia_enable_device failed 0x%x\n",

		dev_info(&link->dev, "pcmcia_enable_device failed 0x%x\n",

			 fail_rc);

		goto cs_release;

	}

drivers/pcmcia/cistpl.c

+4 −6
Original line number Diff line number Diff line
@@ -94,8 +94,7 @@ static void __iomem *set_cis_map(struct pcmcia_socket *s, 
		mem->res = pcmcia_find_mem_region(0, s->map_size,

						s->map_size, 0, s);

		if (mem->res == NULL) {

			dev_printk(KERN_NOTICE, &s->dev,

				   "cs: unable to map card memory!\n");

			dev_notice(&s->dev, "cs: unable to map card memory!\n");

			return NULL;

		}

		s->cis_virt = NULL;
@@ -381,8 +380,7 @@ int verify_cis_cache(struct pcmcia_socket *s) 


	buf = kmalloc(256, GFP_KERNEL);

	if (buf == NULL) {

		dev_printk(KERN_WARNING, &s->dev,

			   "no memory for verifying CIS\n");

		dev_warn(&s->dev, "no memory for verifying CIS\n");

		return -ENOMEM;

	}

	mutex_lock(&s->ops_mutex);
@@ -414,14 +412,14 @@ int pcmcia_replace_cis(struct pcmcia_socket *s, 
		       const u8 *data, const size_t len)

{

	if (len > CISTPL_MAX_CIS_SIZE) {

		dev_printk(KERN_WARNING, &s->dev, "replacement CIS too big\n");

		dev_warn(&s->dev, "replacement CIS too big\n");

		return -EINVAL;

	}

	mutex_lock(&s->ops_mutex);

	kfree(s->fake_cis);

	s->fake_cis = kmalloc(len, GFP_KERNEL);

	if (s->fake_cis == NULL) {

		dev_printk(KERN_WARNING, &s->dev, "no memory to replace CIS\n");

		dev_warn(&s->dev, "no memory to replace CIS\n");

		mutex_unlock(&s->ops_mutex);

		return -ENOMEM;

	}

drivers/pcmcia/cs.c

+12 −17
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ int pcmcia_register_socket(struct pcmcia_socket *socket) 


	wait_for_completion(&socket->thread_done);

	if (!socket->thread) {

		dev_printk(KERN_WARNING, &socket->dev,

		dev_warn(&socket->dev,

			 "PCMCIA: warning: socket thread did not start\n");

		return -EIO;

	}
@@ -275,7 +275,7 @@ static int socket_reset(struct pcmcia_socket *skt) 
		msleep(unreset_check * 10);

	}



	dev_printk(KERN_ERR, &skt->dev, "time out after reset.\n");

	dev_err(&skt->dev, "time out after reset\n");

	return -ETIMEDOUT;

}
@@ -325,7 +325,7 @@ static void socket_shutdown(struct pcmcia_socket *s) 


	s->ops->get_status(s, &status);

	if (status & SS_POWERON) {

		dev_printk(KERN_ERR, &s->dev,

		dev_err(&s->dev,

			"*** DANGER *** unable to remove socket power\n");

	}
@@ -356,15 +356,13 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay) 
	}



	if (status & SS_PENDING) {

		dev_printk(KERN_ERR, &skt->dev,

			   "voltage interrogation timed out.\n");

		dev_err(&skt->dev, "voltage interrogation timed out\n");

		return -ETIMEDOUT;

	}



	if (status & SS_CARDBUS) {

		if (!(skt->features & SS_CAP_CARDBUS)) {

			dev_printk(KERN_ERR, &skt->dev,

				"cardbus cards are not supported.\n");

			dev_err(&skt->dev, "cardbus cards are not supported\n");

			return -EINVAL;

		}

		skt->state |= SOCKET_CARDBUS;
@@ -379,7 +377,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay) 
	else if (!(status & SS_XVCARD))

		skt->socket.Vcc = skt->socket.Vpp = 50;

	else {

		dev_printk(KERN_ERR, &skt->dev, "unsupported voltage key.\n");

		dev_err(&skt->dev, "unsupported voltage key\n");

		return -EIO;

	}
@@ -396,7 +394,7 @@ static int socket_setup(struct pcmcia_socket *skt, int initial_delay) 


	skt->ops->get_status(skt, &status);

	if (!(status & SS_POWERON)) {

		dev_printk(KERN_ERR, &skt->dev, "unable to apply power.\n");

		dev_err(&skt->dev, "unable to apply power\n");

		return -EIO;

	}
@@ -429,8 +427,7 @@ static int socket_insert(struct pcmcia_socket *skt) 
	if (ret == 0) {

		skt->state |= SOCKET_PRESENT;



		dev_printk(KERN_NOTICE, &skt->dev,

			   "pccard: %s card inserted into slot %d\n",

		dev_notice(&skt->dev, "pccard: %s card inserted into slot %d\n",

			   (skt->state & SOCKET_CARDBUS) ? "CardBus" : "PCMCIA",

			   skt->sock);
@@ -558,8 +555,7 @@ static int socket_resume(struct pcmcia_socket *skt) 


static void socket_remove(struct pcmcia_socket *skt)

{

	dev_printk(KERN_NOTICE, &skt->dev,

		   "pccard: card ejected from slot %d\n", skt->sock);

	dev_notice(&skt->dev, "pccard: card ejected from slot %d\n", skt->sock);

	socket_shutdown(skt);

}
@@ -605,8 +601,7 @@ static int pccardd(void *__skt) 
	/* register with the device core */

	ret = device_register(&skt->dev);

	if (ret) {

		dev_printk(KERN_WARNING, &skt->dev,

			   "PCMCIA: unable to register socket\n");

		dev_warn(&skt->dev, "PCMCIA: unable to register socket\n");

		skt->thread = NULL;

		complete(&skt->thread_done);

		return 0;

drivers/pcmcia/ds.c

+17 −22
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static int pcmcia_device_probe(struct device *dev) 
		dev_dbg(dev, "base %x, regs %x", p_dev->config_base,

			p_dev->config_regs);

	} else {

		dev_printk(KERN_INFO, dev,

		dev_info(dev,

			 "pcmcia: could not parse base and rmask0 of CIS\n");

		p_dev->config_base = 0;

		p_dev->config_regs = 0;
@@ -382,13 +382,13 @@ static int pcmcia_device_remove(struct device *dev) 


	/* check for proper unloading */

	if (p_dev->_irq || p_dev->_io || p_dev->_locked)

		dev_printk(KERN_INFO, dev,

		dev_info(dev,

			 "pcmcia: driver %s did not release config properly\n",

			 p_drv->name);



	for (i = 0; i < MAX_WIN; i++)

		if (p_dev->_win & CLIENT_WIN_REQ(i))

			dev_printk(KERN_INFO, dev,

			dev_info(dev,

				 "pcmcia: driver %s did not release window properly\n",

				 p_drv->name);
@@ -578,8 +578,7 @@ static struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s, 


	mutex_unlock(&s->ops_mutex);



	dev_printk(KERN_NOTICE, &p_dev->dev,

		   "pcmcia: registering new device %s (IRQ: %d)\n",

	dev_notice(&p_dev->dev, "pcmcia: registering new device %s (IRQ: %d)\n",

		   p_dev->devname, p_dev->irq);



	pcmcia_device_query(p_dev);
@@ -745,16 +744,14 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char *filename) 
	if (request_firmware(&fw, filename, &dev->dev) == 0) {

		if (fw->size >= CISTPL_MAX_CIS_SIZE) {

			ret = -EINVAL;

			dev_printk(KERN_ERR, &dev->dev,

				   "pcmcia: CIS override is too big\n");

			dev_err(&dev->dev, "pcmcia: CIS override is too big\n");

			goto release;

		}



		if (!pcmcia_replace_cis(s, fw->data, fw->size))

			ret = 0;

		else {

			dev_printk(KERN_ERR, &dev->dev,

				   "pcmcia: CIS override failed\n");

			dev_err(&dev->dev, "pcmcia: CIS override failed\n");

			goto release;

		}
@@ -1149,9 +1146,8 @@ static int pcmcia_dev_suspend(struct device *dev, pm_message_t state) 
	if (p_drv->suspend) {

		ret = p_drv->suspend(p_dev);

		if (ret) {

			dev_printk(KERN_ERR, dev,

				   "pcmcia: device %s (driver %s) did "

				   "not want to go to sleep (%d)\n",

			dev_err(dev,

				"pcmcia: device %s (driver %s) did not want to go to sleep (%d)\n",

				p_dev->devname, p_drv->name, ret);

			mutex_lock(&p_dev->socket->ops_mutex);

			p_dev->suspended = 0;
@@ -1343,14 +1339,13 @@ static int pcmcia_bus_add_socket(struct device *dev, 


	socket = pcmcia_get_socket(socket);

	if (!socket) {

		dev_printk(KERN_ERR, dev,

			   "PCMCIA obtaining reference to socket failed\n");

		dev_err(dev, "PCMCIA obtaining reference to socket failed\n");

		return -ENODEV;

	}



	ret = sysfs_create_bin_file(&dev->kobj, &pccard_cis_attr);

	if (ret) {

		dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");

		dev_err(dev, "PCMCIA registration failed\n");

		pcmcia_put_socket(socket);

		return ret;

	}
@@ -1362,7 +1357,7 @@ static int pcmcia_bus_add_socket(struct device *dev, 


	ret = pccard_register_pcmcia(socket, &pcmcia_bus_callback);

	if (ret) {

		dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");

		dev_err(dev, "PCMCIA registration failed\n");

		pcmcia_put_socket(socket);

		return ret;

	}

drivers/pcmcia/pcmcia_cis.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, 


	buf = kmalloc(256, GFP_KERNEL);

	if (buf == NULL) {

		dev_printk(KERN_WARNING, &s->dev, "no memory to read tuple\n");

		dev_warn(&s->dev, "no memory to read tuple\n");

		return -ENOMEM;

	}

	tuple.DesiredTuple = code;
@@ -94,7 +94,7 @@ int pccard_loop_tuple(struct pcmcia_socket *s, unsigned int function, 


	buf = kzalloc(256, GFP_KERNEL);

	if (buf == NULL) {

		dev_printk(KERN_WARNING, &s->dev, "no memory to read tuple\n");

		dev_warn(&s->dev, "no memory to read tuple\n");

		return -ENOMEM;

	}