[PATCH 1/5] ALSA: mts64: fix trailing whitespace

[PATCH 1/5] ALSA: mts64: fix trailing whitespace

[Sudip Mukherjee]

Trailing whitespace is not encouraged by Kernel coding style.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 sound/drivers/mts64.c | 100 +++++++++++++++++++++++++-------------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 2a008a9..0f91e8e 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -1,14 +1,14 @@
-/*     
+/*
  *   ALSA Driver for Ego Systems Inc. (ESI) Miditerminal 4140
  *   Copyright (c) 2006 by Matthias König <mk@phasorlab.de>
  *
- *   This program is free software; you can redistribute it and/or modify 
- *   it under the terms of the GNU General Public License as published by 
- *   the Free Software Foundation; either version 2 of the License, or 
- *   (at your option) any later version. 
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
  *
- *   This program is distributed in the hope that it will be useful, 
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU General Public License for more details.
  *
@@ -38,7 +38,7 @@ static int index[SNDRV_CARDS]  = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS]   = SNDRV_DEFAULT_STR;
 static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
-static struct platform_device *platform_devices[SNDRV_CARDS]; 
+static struct platform_device *platform_devices[SNDRV_CARDS];
 static int device_count;
 
 module_param_array(index, int, NULL, S_IRUGO);
@@ -92,7 +92,7 @@ static int snd_mts64_create(struct snd_card *card,
 	*rchip = NULL;
 
 	mts = kzalloc(sizeof(struct mts64), GFP_KERNEL);
-	if (mts == NULL) 
+	if (mts == NULL)
 		return -ENOMEM;
 
 	/* Init chip specific data */
@@ -118,9 +118,9 @@ static int snd_mts64_create(struct snd_card *card,
 
 /* Control Bits */
 #define MTS64_CTL_READOUT          0x08  /* enable readout */
-#define MTS64_CTL_WRITE_CMD        0x06  
-#define MTS64_CTL_WRITE_DATA       0x02  
-#define MTS64_CTL_STROBE           0x01  
+#define MTS64_CTL_WRITE_CMD        0x06
+#define MTS64_CTL_WRITE_DATA       0x02
+#define MTS64_CTL_STROBE           0x01
 
 /* Command */
 #define MTS64_CMD_RESET            0xfe
@@ -130,7 +130,7 @@ static int snd_mts64_create(struct snd_card *card,
 #define MTS64_CMD_SMPTE_STOP       0xef
 #define MTS64_CMD_SMPTE_FPS_24     0xe3
 #define MTS64_CMD_SMPTE_FPS_25     0xe2
-#define MTS64_CMD_SMPTE_FPS_2997   0xe4 
+#define MTS64_CMD_SMPTE_FPS_2997   0xe4
 #define MTS64_CMD_SMPTE_FPS_30D    0xe1
 #define MTS64_CMD_SMPTE_FPS_30     0xe0
 #define MTS64_CMD_COM_OPEN         0xf8  /* setting the communication mode */
@@ -171,10 +171,10 @@ static void mts64_enable_readout(struct parport *p)
 
 	c = parport_read_control(p);
 	c |= MTS64_CTL_READOUT;
-	parport_write_control(p, c); 
+	parport_write_control(p, c);
 }
 
-/*  Disables readout 
+/*  Disables readout
  *
  *  Readout is disabled by clearing bit 3 of control
  */
@@ -201,9 +201,9 @@ static int mts64_device_ready(struct parport *p)
 	for (i = 0; i < 0xffff; ++i) {
 		c = parport_read_status(p);
 		c &= MTS64_STAT_BSY;
-		if (c != 0) 
+		if (c != 0)
 			return 1;
-	} 
+	}
 
 	return 0;
 }
@@ -234,7 +234,7 @@ static int mts64_device_init(struct parport *p)
 	return -EIO;
 }
 
-/* 
+/*
  *  Opens the device (set communication mode)
  */
 static int mts64_device_open(struct mts64 *mts)
@@ -248,7 +248,7 @@ static int mts64_device_open(struct mts64 *mts)
 	return 0;
 }
 
-/*  
+/*
  *  Close device (clear communication mode)
  */
 static int mts64_device_close(struct mts64 *mts)
@@ -265,14 +265,14 @@ static int mts64_device_close(struct mts64 *mts)
 }
 
 /*  map hardware port to substream number
- * 
+ *
  *  When reading a byte from the device, the device tells us
  *  on what port the byte is. This HW port has to be mapped to
  *  the midiport (substream number).
  *  substream 0-3 are Midiports 1-4
  *  substream 4 is SMPTE Timecode
  *  The mapping is done by the table:
- *  HW | 0 | 1 | 2 | 3 | 4 
+ *  HW | 0 | 1 | 2 | 3 | 4
  *  SW | 0 | 1 | 4 | 2 | 3
  */
 static u8 mts64_map_midi_input(u8 c)
@@ -285,7 +285,7 @@ static u8 mts64_map_midi_input(u8 c)
 
 /*  Probe parport for device
  *
- *  Do we have a Miditerminal 4140 on parport? 
+ *  Do we have a Miditerminal 4140 on parport?
  *  Returns:
  *  0       device found
  *  -ENODEV no device
@@ -298,13 +298,13 @@ static int mts64_probe(struct parport *p)
 	mts64_write_command(p, MTS64_CMD_PROBE);
 
 	msleep(50);
-	
+
 	c = mts64_read(p);
 
 	c &= 0x00ff;
-	if (c != MTS64_CMD_PROBE) 
+	if (c != MTS64_CMD_PROBE)
 		return -ENODEV;
-	else 
+	else
 		return 0;
 
 }
@@ -330,7 +330,7 @@ static u16 mts64_read(struct parport *p)
 /*  Read a byte from device
  *
  *  Note, that readout mode has to be enabled.
- *  readout procedure is as follows: 
+ *  readout procedure is as follows:
  *  - Write number of the Bit to read to DATA
  *  - Read STATUS
  *  - Bit 5 of STATUS indicates if Bit is set
@@ -348,10 +348,10 @@ static u8 mts64_read_char(struct parport *p)
 		parport_write_data(p, i);
 		c >>= 1;
 		status = parport_read_status(p);
-		if (status & MTS64_STAT_BIT_SET) 
+		if (status & MTS64_STAT_BIT_SET)
 			c |= 0x80;
 	}
-	
+
 	return c;
 }
 
@@ -369,9 +369,9 @@ static void mts64_smpte_start(struct parport *p,
 			      u8 seconds, u8 frames,
 			      u8 idx)
 {
-	static u8 fps[5] = { MTS64_CMD_SMPTE_FPS_24, 
+	static u8 fps[5] = { MTS64_CMD_SMPTE_FPS_24,
 			     MTS64_CMD_SMPTE_FPS_25,
-			     MTS64_CMD_SMPTE_FPS_2997, 
+			     MTS64_CMD_SMPTE_FPS_2997,
 			     MTS64_CMD_SMPTE_FPS_30D,
 			     MTS64_CMD_SMPTE_FPS_30    };
 
@@ -405,7 +405,7 @@ static void mts64_write_command(struct parport *p, u8 c)
 	parport_write_control(p, MTS64_CTL_WRITE_CMD);
 }
 
-/*  Write a data byte to device 
+/*  Write a data byte to device
  */
 static void mts64_write_data(struct parport *p, u8 c)
 {
@@ -669,7 +669,7 @@ static int snd_mts64_ctl_create(struct snd_card *card,
 	for (i = 0; control[i]; ++i) {
 		err = snd_ctl_add(card, snd_ctl_new1(control[i], mts));
 		if (err < 0) {
-			snd_printd("Cannot create control: %s\n", 
+			snd_printd("Cannot create control: %s\n",
 				   control[i]->name);
 			return err;
 		}
@@ -688,8 +688,8 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
 	struct mts64 *mts = substream->rmidi->private_data;
 
 	if (mts->open_count == 0) {
-		/* We don't need a spinlock here, because this is just called 
-		   if the device has not been opened before. 
+		/* We don't need a spinlock here, because this is just called
+		   if the device has not been opened before.
 		   So there aren't any IRQs from the device */
 		mts64_device_open(mts);
 
@@ -747,7 +747,7 @@ static void snd_mts64_rawmidi_input_trigger(struct snd_rawmidi_substream *substr
 		mts->mode[substream->number] |= MTS64_MODE_INPUT_TRIGGERED;
 	else
  		mts->mode[substream->number] &= ~MTS64_MODE_INPUT_TRIGGERED;
-	
+
 	spin_unlock_irqrestore(&mts->lock, flags);
 }
 
@@ -771,12 +771,12 @@ static int snd_mts64_rawmidi_create(struct snd_card *card)
 	struct snd_rawmidi_substream *substream;
 	struct list_head *list;
 	int err;
-	
-	err = snd_rawmidi_new(card, CARD_NAME, 0, 
-			      MTS64_NUM_OUTPUT_PORTS, 
-			      MTS64_NUM_INPUT_PORTS, 
+
+	err = snd_rawmidi_new(card, CARD_NAME, 0,
+			      MTS64_NUM_OUTPUT_PORTS,
+			      MTS64_NUM_INPUT_PORTS,
 			      &rmidi);
-	if (err < 0) 
+	if (err < 0)
 		return err;
 
 	rmidi->private_data = mts;
@@ -788,21 +788,21 @@ static int snd_mts64_rawmidi_create(struct snd_card *card)
 	mts->rmidi = rmidi;
 
 	/* register rawmidi ops */
-	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, 
+	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,
 			    &snd_mts64_rawmidi_output_ops);
-	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, 
+	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT,
 			    &snd_mts64_rawmidi_input_ops);
 
 	/* name substreams */
 	/* output */
-	list_for_each(list, 
+	list_for_each(list,
 		      &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams) {
 		substream = list_entry(list, struct snd_rawmidi_substream, list);
 		sprintf(substream->name,
 			"Miditerminal %d", substream->number+1);
 	}
 	/* input */
-	list_for_each(list, 
+	list_for_each(list,
 		      &rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT].substreams) {
 		substream = list_entry(list, struct snd_rawmidi_substream, list);
 		mts->midi_input_substream[substream->number] = substream;
@@ -840,7 +840,7 @@ static void snd_mts64_interrupt(void *private)
 	if (status & MTS64_STAT_PORT) {
 		mts->current_midi_input_port = mts64_map_midi_input(data);
 	} else {
-		if (mts->current_midi_input_port == -1) 
+		if (mts->current_midi_input_port == -1)
 			goto __out;
 		substream = mts->midi_input_substream[mts->current_midi_input_port];
 		if (mts->mode[substream->number] & MTS64_MODE_INPUT_TRIGGERED)
@@ -860,7 +860,7 @@ static int snd_mts64_probe_port(struct parport *p)
 					 0, NULL);
 	if (!pardev)
 		return -EIO;
-	
+
 	if (parport_claim(pardev)) {
 		parport_unregister_device(pardev);
 		return -EIO;
@@ -944,7 +944,7 @@ static int snd_mts64_probe(struct platform_device *pdev)
 
 	if (dev >= SNDRV_CARDS)
 		return -ENODEV;
-	if (!enable[dev]) 
+	if (!enable[dev])
 		return -ENOENT;
 	if ((err = snd_mts64_probe_port(p)) < 0)
 		return err;
@@ -957,7 +957,7 @@ static int snd_mts64_probe(struct platform_device *pdev)
 	}
 	strcpy(card->driver, DRIVER_NAME);
 	strcpy(card->shortname, "ESI " CARD_NAME);
-	sprintf(card->longname,  "%s at 0x%lx, irq %i", 
+	sprintf(card->longname,  "%s at 0x%lx, irq %i",
 		card->shortname, p->base, p->irq);
 
 	pardev = parport_register_device(p,                   /* port */
@@ -980,7 +980,7 @@ static int snd_mts64_probe(struct platform_device *pdev)
 	}
 	card->private_data = mts;
 	card->private_free = snd_mts64_card_private_free;
-	
+
 	if ((err = snd_mts64_rawmidi_create(card)) < 0) {
 		snd_printd("Creating Rawmidi component failed\n");
 		goto __err;
@@ -1045,7 +1045,7 @@ static void snd_mts64_unregister_all(void)
 			platform_device_unregister(platform_devices[i]);
 			platform_devices[i] = NULL;
 		}
-	}		
+	}
 	platform_driver_unregister(&snd_mts64_driver);
 	parport_unregister_driver(&mts64_parport_driver);
 }
-- 
1.9.1

[PATCH 2/5] LSA: mts64: assignment in if

[Sudip Mukherjee]

It is not general practice to assign some values inside if statement.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 sound/drivers/mts64.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 0f91e8e..efecb6e 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -946,7 +946,9 @@ static int snd_mts64_probe(struct platform_device *pdev)
 		return -ENODEV;
 	if (!enable[dev])
 		return -ENOENT;
-	if ((err = snd_mts64_probe_port(p)) < 0)
+
+	err = snd_mts64_probe_port(p);
+	if (err < 0)
 		return err;
 
 	err = snd_card_new(&pdev->dev, index[dev], id[dev], THIS_MODULE,
@@ -973,7 +975,8 @@ static int snd_mts64_probe(struct platform_device *pdev)
 		goto __err;
 	}
 
-	if ((err = snd_mts64_create(card, pardev, &mts)) < 0) {
+	err = snd_mts64_create(card, pardev, &mts);
+	if (err < 0) {
 		snd_printd("Cannot create main component\n");
 		parport_unregister_device(pardev);
 		goto __err;
@@ -981,7 +984,8 @@ static int snd_mts64_probe(struct platform_device *pdev)
 	card->private_data = mts;
 	card->private_free = snd_mts64_card_private_free;
 
-	if ((err = snd_mts64_rawmidi_create(card)) < 0) {
+	err = snd_mts64_rawmidi_create(card);
+	if (err < 0) {
 		snd_printd("Creating Rawmidi component failed\n");
 		goto __err;
 	}
@@ -995,13 +999,15 @@ static int snd_mts64_probe(struct platform_device *pdev)
 	mts->pardev_claimed = 1;
 
 	/* init device */
-	if ((err = mts64_device_init(p)) < 0)
+	err = mts64_device_init(p);
+	if (err < 0)
 		goto __err;
 
 	platform_set_drvdata(pdev, card);
 
 	/* At this point card will be usable */
-	if ((err = snd_card_register(card)) < 0) {
+	err = snd_card_register(card);
+	if (err < 0) {
 		snd_printd("Cannot register card\n");
 		goto __err;
 	}
@@ -1054,7 +1060,8 @@ static int __init snd_mts64_module_init(void)
 {
 	int err;
 
-	if ((err = platform_driver_register(&snd_mts64_driver)) < 0)
+	err = platform_driver_register(&snd_mts64_driver);
+	if (err < 0)
 		return err;
 
 	if (parport_register_driver(&mts64_parport_driver) != 0) {
-- 
1.9.1

[PATCH 3/5] ALSA: mts64: fix multiple blanklines

[Sudip Mukherjee]

checkpatch complains about multiple blank lines.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 sound/drivers/mts64.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index efecb6e..f00e938 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -159,7 +159,6 @@ static void mts64_write_command(struct parport *p, u8 c);
 static void mts64_write_data(struct parport *p, u8 c);
 static void mts64_write_midi(struct mts64 *mts, u8 c, int midiport);
 
-
 /*  Enables the readout procedure
  *
  *  Before we can read a midi byte from the device, we have to set
@@ -282,7 +281,6 @@ static u8 mts64_map_midi_input(u8 c)
 	return map[c];
 }
 
-
 /*  Probe parport for device
  *
  *  Do we have a Miditerminal 4140 on parport?
@@ -652,7 +650,6 @@ static struct snd_kcontrol_new mts64_ctl_smpte_fps = {
 	.put   = snd_mts64_ctl_smpte_fps_put
 };
 
-
 static int snd_mts64_ctl_create(struct snd_card *card,
 				struct mts64 *mts)
 {
@@ -1030,7 +1027,6 @@ static int snd_mts64_remove(struct platform_device *pdev)
 	return 0;
 }
 
-
 static struct platform_driver snd_mts64_driver = {
 	.probe  = snd_mts64_probe,
 	.remove = snd_mts64_remove,
-- 
1.9.1

[PATCH 4/5] ALSA: mts64: fix checkpatch space complains

[Sudip Mukherjee]

checkpatch was complaining about space before start of a line and a
required space before opening brace.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 sound/drivers/mts64.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index f00e938..ee6a87f 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -743,7 +743,7 @@ static void snd_mts64_rawmidi_input_trigger(struct snd_rawmidi_substream *substr
 	if (up)
 		mts->mode[substream->number] |= MTS64_MODE_INPUT_TRIGGERED;
 	else
- 		mts->mode[substream->number] &= ~MTS64_MODE_INPUT_TRIGGERED;
+		mts->mode[substream->number] &= ~MTS64_MODE_INPUT_TRIGGERED;
 
 	spin_unlock_irqrestore(&mts->lock, flags);
 }
@@ -779,8 +779,8 @@ static int snd_mts64_rawmidi_create(struct snd_card *card)
 	rmidi->private_data = mts;
 	strcpy(rmidi->name, CARD_NAME);
 	rmidi->info_flags = SNDRV_RAWMIDI_INFO_OUTPUT |
-		            SNDRV_RAWMIDI_INFO_INPUT |
-                            SNDRV_RAWMIDI_INFO_DUPLEX;
+			    SNDRV_RAWMIDI_INFO_INPUT |
+			    SNDRV_RAWMIDI_INFO_DUPLEX;
 
 	mts->rmidi = rmidi;
 
@@ -803,7 +803,7 @@ static int snd_mts64_rawmidi_create(struct snd_card *card)
 		      &rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT].substreams) {
 		substream = list_entry(list, struct snd_rawmidi_substream, list);
 		mts->midi_input_substream[substream->number] = substream;
-		switch(substream->number) {
+		switch (substream->number) {
 		case MTS64_SMPTE_SUBSTREAM:
 			strcpy(substream->name, "Miditerminal SMPTE");
 			break;
-- 
1.9.1

[PATCH 5/5] ALSA: mts64: use new parport device model

[Sudip Mukherjee]

Modify mts64 driver to use the new parallel port device model.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 sound/drivers/mts64.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index ee6a87f..4d393ea 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -905,9 +905,10 @@ static void snd_mts64_detach(struct parport *p)
 }
 
 static struct parport_driver mts64_parport_driver = {
-	.name   = "mts64",
-	.attach = snd_mts64_attach,
-	.detach = snd_mts64_detach
+	.name		= "mts64",
+	.match_port	= snd_mts64_attach,
+	.detach		= snd_mts64_detach,
+	.devmodel	= true,
 };
 
 /*********************************************************************
@@ -935,6 +936,7 @@ static int snd_mts64_probe(struct platform_device *pdev)
 	struct snd_card *card = NULL;
 	struct mts64 *mts = NULL;
 	int err;
+	struct pardev_cb mts64_cb;
 
 	p = platform_get_drvdata(pdev);
 	platform_set_drvdata(pdev, NULL);
@@ -959,14 +961,16 @@ static int snd_mts64_probe(struct platform_device *pdev)
 	sprintf(card->longname,  "%s at 0x%lx, irq %i",
 		card->shortname, p->base, p->irq);
 
-	pardev = parport_register_device(p,                   /* port */
-					 DRIVER_NAME,         /* name */
-					 NULL,                /* preempt */
-					 NULL,                /* wakeup */
-					 snd_mts64_interrupt, /* ISR */
-					 PARPORT_DEV_EXCL,    /* flags */
-					 (void *)card);       /* private */
-	if (pardev == NULL) {
+	memset(&mts64_cb, 0, sizeof(mts64_cb));
+	mts64_cb.private = card;			/* private */
+	mts64_cb.irq_func = snd_mts64_interrupt;	/* ISR */
+	mts64_cb.flags = PARPORT_DEV_EXCL;		/* flags */
+
+	pardev = parport_register_dev_model(p,		   /* port */
+					    DRIVER_NAME,   /* name */
+					    &mts64_cb,   /* callbacks */
+					    device_count); /* device number */
+	if (!pardev) {
 		snd_printd("Cannot register pardevice\n");
 		err = -EIO;
 		goto __err;
-- 
1.9.1