[Linux-kernel-commits] v4l2: ppi info converts to use enum type instead of string

[Scott Jiang]

commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=23f0176a58e6b871f3d90409cc248fa1e5d4df60
branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk

Signed-off-by: Scott Jiang <scott.jiang.li...@gmail.com>
---
 drivers/media/video/blackfin/ppi.c |   10 +++++-----
 include/media/blackfin/ppi.h       |    7 ++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/media/video/blackfin/ppi.c b/drivers/media/video/blackfin/ppi.c
index e582227..094aba0 100644
--- a/drivers/media/video/blackfin/ppi.c
+++ b/drivers/media/video/blackfin/ppi.c
@@ -49,7 +49,7 @@ static irqreturn_t ppi_irq_err(int irq, void *dev_id)
 	const struct ppi_info *info = ppi->info;
 	unsigned short status;
 
-	if (!strcmp(info->name, "ppi")) {
+	if (info->type == PPI_TYPE_PPI) {
 		struct bfin_ppi_regs *reg = info->base;
 		status = bfin_read16(&reg->status);
 		bfin_write16(&reg->status, 0xff00);
@@ -96,7 +96,7 @@ static int ppi_start(struct ppi_if *ppi)
 
 	/* enable PPI */
 	ppi->ppi_control |= PORT_EN;
-	if (!strcmp(info->name, "ppi")) {
+	if (info->type == PPI_TYPE_PPI) {
 		struct bfin_ppi_regs *reg = info->base;
 		bfin_write16(&reg->control, ppi->ppi_control);
 	}
@@ -111,7 +111,7 @@ static int ppi_stop(struct ppi_if *ppi)
 
 	/* disable PPI */
 	ppi->ppi_control &= ~PORT_EN;
-	if (!strcmp(info->name, "ppi")) {
+	if (info->type == PPI_TYPE_PPI) {
 		struct bfin_ppi_regs *reg = info->base;
 		bfin_write16(&reg->control, ppi->ppi_control);
 	}
@@ -149,7 +149,7 @@ static int ppi_set_params(struct ppi_if *ppi, struct ppi_params *params)
 
 	/* config PPI */
 	ppi->ppi_control = params->ppi_control & ~PORT_EN;
-	if (!strcmp(info->name, "ppi")) {
+	if (info->type == PPI_TYPE_PPI) {
 		struct bfin_ppi_regs *reg = info->base;
 		bfin_write16(&reg->control, ppi->ppi_control);
 		bfin_write16(&reg->count, ppi->bytes_per_line - 1);
@@ -169,7 +169,7 @@ struct ppi_if *ppi_create_instance(const struct ppi_info *info)
 {
 	struct ppi_if *ppi;
 
-	if (!info || !info->name || !info->pin_req)
+	if (!info || !info->pin_req)
 		return NULL;
 
 	if (peripheral_request_list(info->pin_req, KBUILD_MODNAME)) {
diff --git a/include/media/blackfin/ppi.h b/include/media/blackfin/ppi.h
index 89d75ad..32e9a1d 100644
--- a/include/media/blackfin/ppi.h
+++ b/include/media/blackfin/ppi.h
@@ -40,8 +40,13 @@ struct ppi_ops {
 	void (*update_addr)(struct ppi_if *ppi, unsigned long addr);
 };
 
+enum ppi_type {
+	PPI_TYPE_PPI,
+	PPI_TYPE_EPPI,
+};
+
 struct ppi_info {
-	const char *name; /* ppi or eppi */
+	enum ppi_type type;
 	int dma_ch;
 	int irq_err;
 	void __iomem *base;

_______________________________________________
Linux-kernel-commits mailing list
Linux-kernel-commits@blackfin.uclinux.org
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits