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

Commit 9d605e63 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] mantis: cleanup CodingStyle issues due to last commit 



Commit a96762da('[media] mantis: add remote control support')
introduced some new CodingStyle issues. Fix them.

No functional changes.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent a96762da

drivers/media/pci/mantis/hopper_cards.c

+4 −3
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ static irqreturn_t hopper_irq_handler(int irq, void *dev_id) 
	if (stat & MANTIS_INT_IRQ1) {

		dprintk(MANTIS_DEBUG, 0, "<%s>", label[2]);

		spin_lock(&mantis->intmask_lock);

		mmwrite(mmread(MANTIS_INT_MASK) & ~MANTIS_INT_IRQ1, MANTIS_INT_MASK);

		mmwrite(mmread(MANTIS_INT_MASK) & ~MANTIS_INT_IRQ1,

			MANTIS_INT_MASK);

		spin_unlock(&mantis->intmask_lock);

		schedule_work(&mantis->uart_work);

	}
@@ -169,7 +170,7 @@ static int hopper_pci_probe(struct pci_dev *pdev, 
		goto fail0;

	}



	drvdata			= (struct mantis_pci_drvdata *) pci_id->driver_data;

	drvdata			= (void *)pci_id->driver_data;

	mantis->num		= devs;

	mantis->verbose		= verbose;

	mantis->pdev		= pdev;

drivers/media/pci/mantis/mantis_cards.c

+16 −14
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ static irqreturn_t mantis_irq_handler(int irq, void *dev_id) 
	if (stat & MANTIS_INT_IRQ1) {

		dprintk(MANTIS_DEBUG, 0, "<%s>", label[2]);

		spin_lock(&mantis->intmask_lock);

		mmwrite(mmread(MANTIS_INT_MASK) & ~MANTIS_INT_IRQ1, MANTIS_INT_MASK);

		mmwrite(mmread(MANTIS_INT_MASK) & ~MANTIS_INT_IRQ1,

			MANTIS_INT_MASK);

		spin_unlock(&mantis->intmask_lock);

		schedule_work(&mantis->uart_work);

	}
@@ -178,7 +179,7 @@ static int mantis_pci_probe(struct pci_dev *pdev, 
		return -ENOMEM;

	}



	drvdata			= (struct mantis_pci_drvdata *) pci_id->driver_data;

	drvdata			= (void *)pci_id->driver_data;

	mantis->num		= devs;

	mantis->verbose		= verbose;

	mantis->pdev		= pdev;
@@ -227,7 +228,8 @@ static int mantis_pci_probe(struct pci_dev *pdev, 


	err = mantis_input_init(mantis);

	if (err < 0) {

		dprintk(MANTIS_ERROR, 1, "ERROR: Mantis DVB initialization failed <%d>", err);

		dprintk(MANTIS_ERROR, 1,

			"ERROR: Mantis DVB initialization failed <%d>", err);

		goto err_dvb_exit;

	}

drivers/media/pci/mantis/mantis_input.c

+2 −6
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 
	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.



	You should have received a copy of the GNU General Public License

	along with this program; if not, write to the Free Software

	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/



#include <media/rc-core.h>

drivers/media/pci/mantis/mantis_input.h

+3 −7
Original line number Diff line number Diff line
@@ -12,17 +12,13 @@ 
	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.



	You should have received a copy of the GNU General Public License

	along with this program; if not, write to the Free Software

	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

*/



#ifndef __MANTIS_INPUT_H

#define __MANTIS_INPUT_H



extern int mantis_input_init(struct mantis_pci *mantis);

extern void mantis_input_exit(struct mantis_pci *mantis);

extern void mantis_input_process(struct mantis_pci *mantis, int scancode);

int mantis_input_init(struct mantis_pci *mantis);

void mantis_input_exit(struct mantis_pci *mantis);

void mantis_input_process(struct mantis_pci *mantis, int scancode);



#endif /* __MANTIS_UART_H */

drivers/media/pci/mantis/mantis_uart.c

+3 −2
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ static void mantis_uart_read(struct mantis_pci *mantis) 
	dprintk(MANTIS_DEBUG, 1, "UART Reading ...");

	for (i = 0; i < (config->bytes + 1); i++) {

		int data = mmread(MANTIS_UART_RXD);



		dprintk(MANTIS_DEBUG, 0, " <%02x>", data);



		scancode = (scancode << 8) | (data & 0x3f);
@@ -98,8 +99,8 @@ static void mantis_uart_work(struct work_struct *work) 
		dprintk(MANTIS_ERROR, 1, "RX Fifo FULL");



	/*

	 * MANTIS_UART_RXFIFO_DATA is only set if at least config->bytes + 1 bytes

	 * are in the FIFO.

	 * MANTIS_UART_RXFIFO_DATA is only set if at least

	 * config->bytes + 1 bytes are in the FIFO.

	 */

	while (stat & MANTIS_UART_RXFIFO_DATA) {

		mantis_uart_read(mantis);