* Re: [PATCH] fbdev: sh_mipi_dsi/sh_mobile_hdmi: clk_round_rate() can return a zero upon error
From: Kuninori Morimoto @ 2013-11-27 4:57 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <alpine.DEB.2.02.1311261651300.11450@tamien>
Hi Paul
> Treat both negative and zero return values from clk_round_rate() as
> errors. This is needed since subsequent patches will convert
> clk_round_rate()'s return value to be an unsigned type, rather than a
> signed type, since some clock sources can generate rates higher than
> (2^31)-1 Hz.
>
> Eventually, when calling clk_round_rate(), only a return value of zero
> will be considered a error. All other values will be considered valid
> rates. The comparison against values less than 0 is kept to preserve
> the correct behavior in the meantime.
>
> Signed-off-by: Paul Walmsley <pwalmsley@nvidia.com>
> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Applies on v3.13-rc1. See also:
>
> http://marc.info/?l=linux-arm-kernel&m\x138542591313620&w=2
>
> drivers/video/sh_mipi_dsi.c | 4 +++-
> drivers/video/sh_mobile_hdmi.c | 6 +++---
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/video/sh_mipi_dsi.c b/drivers/video/sh_mipi_dsi.c
> index 8f6e8ff620d4..510cfb668a0c 100644
> --- a/drivers/video/sh_mipi_dsi.c
> +++ b/drivers/video/sh_mipi_dsi.c
> @@ -494,8 +494,10 @@ static int __init sh_mipi_probe(struct platform_device *pdev)
> ret = clk_set_rate(mipi->dsit_clk, rate);
> else
> ret = rate;
> - if (ret < 0)
> + if (ret <= 0) {
> + ret = -ERANGE;
> goto esettrate;
> + }
>
> dev_dbg(&pdev->dev, "DSI-T clk %lu -> %lu\n", f_current, rate);
>
> diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
> index 9a33ee0413fb..1e757e54c784 100644
> --- a/drivers/video/sh_mobile_hdmi.c
> +++ b/drivers/video/sh_mobile_hdmi.c
> @@ -818,7 +818,7 @@ static unsigned long sh_hdmi_rate_error(struct sh_hdmi *hdmi,
> struct sh_mobile_hdmi_info *pdata = dev_get_platdata(hdmi->dev);
>
> *hdmi_rate = clk_round_rate(hdmi->hdmi_clk, target);
> - if ((long)*hdmi_rate < 0)
> + if ((long)*hdmi_rate <= 0)
> *hdmi_rate = clk_get_rate(hdmi->hdmi_clk);
>
> rate_error = (long)*hdmi_rate > 0 ? abs(*hdmi_rate - target) : ULONG_MAX;
> @@ -1321,8 +1321,8 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
> if (rate > 0)
> rate = sh_hdmi_clk_configure(hdmi, rate, 0);
>
> - if (rate < 0) {
> - ret = rate;
> + if (rate <= 0) {
> + ret = -EINVAL;
> goto erate;
> }
>
>
> -----------------------------------------------------------------------------------
> This email message is for the sole use of the intended recipient(s) and may contain
> confidential information. Any unauthorized review, use, disclosure or distribution
> is prohibited. If you are not the intended recipient, please contact the sender by
> reply email and destroy all copies of the original message.
> -----------------------------------------------------------------------------------
Best regards
---
Kuninori Morimoto
^ permalink raw reply
* [PATCH RESEND v2] ARM: OMAPFB: panel-sony-acx565akm: fix bad unlock balance
From: Aaro Koskinen @ 2013-11-27 21:32 UTC (permalink / raw)
To: Tomi Valkeinen, linux-omap, linux-fbdev
Cc: Eduardo Valentin, Aaro Koskinen, stable
When booting Nokia N900 smartphone with v3.12 + omap2plus_defconfig
(LOCKDEP enabled) and CONFIG_DISPLAY_PANEL_SONY_ACX565AKM enabled,
the following BUG is seen during the boot:
[ 7.302154] ==================[ 7.307128] [ BUG: bad unlock balance detected! ]
[ 7.312103] 3.12.0-los.git-2093492-00120-g5e01dc7 #3 Not tainted
[ 7.318450] -------------------------------------
[ 7.323425] kworker/u2:1/12 is trying to release lock (&ddata->mutex) at:
[ 7.330657] [<c031b760>] acx565akm_enable+0x12c/0x18c
[ 7.335998] but there are no more locks to release!
Fix by removing double unlock and handling the locking completely inside
acx565akm_panel_power_on() when doing the power on.
Reported-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: stable@vger.kernel.org
---
drivers/video/omap2/displays-new/panel-sony-acx565akm.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/video/omap2/displays-new/panel-sony-acx565akm.c b/drivers/video/omap2/displays-new/panel-sony-acx565akm.c
index e6d56f7..d94f35d 100644
--- a/drivers/video/omap2/displays-new/panel-sony-acx565akm.c
+++ b/drivers/video/omap2/displays-new/panel-sony-acx565akm.c
@@ -526,6 +526,8 @@ static int acx565akm_panel_power_on(struct omap_dss_device *dssdev)
struct omap_dss_device *in = ddata->in;
int r;
+ mutex_lock(&ddata->mutex);
+
dev_dbg(&ddata->spi->dev, "%s\n", __func__);
in->ops.sdi->set_timings(in, &ddata->videomode);
@@ -614,10 +616,7 @@ static int acx565akm_enable(struct omap_dss_device *dssdev)
if (omapdss_device_is_enabled(dssdev))
return 0;
- mutex_lock(&ddata->mutex);
r = acx565akm_panel_power_on(dssdev);
- mutex_unlock(&ddata->mutex);
-
if (r)
return r;
--
1.8.4.3
^ permalink raw reply related
* [PATCH 01/28] video: arkfb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:13 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/arkfb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index a6b29bd..cc9f8a2 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -1183,7 +1183,7 @@ fail:
/* List of boards that we are trying to support */
-static struct pci_device_id ark_devices[] = {
+static DEFINE_PCI_DEVICE_TABLE(ark_devices) = {
{PCI_DEVICE(0xEDD8, 0xA099)},
{0, 0, 0, 0, 0, 0, 0}
};
--
1.7.10.4
^ permalink raw reply related
* [PATCH 02/28] video: asiliantfb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:13 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/asiliantfb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c
index d611f1a..f1ba0d8 100644
--- a/drivers/video/asiliantfb.c
+++ b/drivers/video/asiliantfb.c
@@ -593,7 +593,7 @@ static void asiliantfb_remove(struct pci_dev *dp)
framebuffer_release(p);
}
-static struct pci_device_id asiliantfb_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(asiliantfb_pci_tbl) = {
{ PCI_VENDOR_ID_CT, PCI_DEVICE_ID_CT_69000, PCI_ANY_ID, PCI_ANY_ID },
{ 0 }
};
--
1.7.10.4
^ permalink raw reply related
* [PATCH 03/28] video: aty: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:16 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/aty/aty128fb.c | 2 +-
drivers/video/aty/atyfb_base.c | 2 +-
drivers/video/aty/radeon_base.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index 12ca031..699b587 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -171,7 +171,7 @@ static int aty128_pci_resume(struct pci_dev *pdev);
static int aty128_do_resume(struct pci_dev *pdev);
/* supported Rage128 chipsets */
-static struct pci_device_id aty128_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(aty128_pci_tbl) = {
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_LE,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_M3_pci },
{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_LF,
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 28fafbf..bfc2893 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -3772,7 +3772,7 @@ static void atyfb_pci_remove(struct pci_dev *pdev)
atyfb_remove(info);
}
-static struct pci_device_id atyfb_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(atyfb_pci_tbl) = {
#ifdef CONFIG_FB_ATY_GX
{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64GX) },
{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_CHIP_MACH64CX) },
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 26d80a4..e2ad734 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -101,7 +101,7 @@
#define CHIP_DEF(id, family, flags) \
{ PCI_VENDOR_ID_ATI, id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (flags) | (CHIP_FAMILY_##family) }
-static struct pci_device_id radeonfb_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(radeonfb_pci_table) = {
/* Radeon Xpress 200m */
CHIP_DEF(PCI_CHIP_RS480_5955, RS480, CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),
CHIP_DEF(PCI_CHIP_RS482_5975, RS480, CHIP_HAS_CRTC2 | CHIP_IS_IGP | CHIP_IS_MOBILITY),
--
1.7.10.4
^ permalink raw reply related
* [PATCH 04/28] video: carminefb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:17 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/carminefb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c
index 65f7c15..2eb9a35 100644
--- a/drivers/video/carminefb.c
+++ b/drivers/video/carminefb.c
@@ -750,7 +750,7 @@ static void carminefb_remove(struct pci_dev *dev)
}
#define PCI_VENDOR_ID_FUJITU_LIMITED 0x10cf
-static struct pci_device_id carmine_devices[] = {
+static DEFINE_PCI_DEVICE_TABLE(carmine_devices) = {
{
PCI_DEVICE(PCI_VENDOR_ID_FUJITU_LIMITED, 0x202b)},
{0, 0, 0, 0, 0, 0, 0}
--
1.7.10.4
^ permalink raw reply related
* [PATCH 05/28] video: chipsfb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:19 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/chipsfb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index 206a66b..edc74ce 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -483,7 +483,7 @@ static int chipsfb_pci_resume(struct pci_dev *pdev)
#endif /* CONFIG_PM */
-static struct pci_device_id chipsfb_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(chipsfb_pci_tbl) = {
{ PCI_VENDOR_ID_CT, PCI_DEVICE_ID_CT_65550, PCI_ANY_ID, PCI_ANY_ID },
{ 0 }
};
--
1.7.10.4
^ permalink raw reply related
* [PATCH 06/28] video: cirrusfb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:19 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/cirrusfb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index d992aa5..aeb165b 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -255,7 +255,7 @@ static const struct cirrusfb_board_info_rec {
#define CHIP(id, btype) \
{ PCI_VENDOR_ID_CIRRUS, id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (btype) }
-static struct pci_device_id cirrusfb_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(cirrusfb_pci_table) = {
CHIP(PCI_DEVICE_ID_CIRRUS_5436, BT_ALPINE),
CHIP(PCI_DEVICE_ID_CIRRUS_5434_8, BT_SD64),
CHIP(PCI_DEVICE_ID_CIRRUS_5434_4, BT_SD64),
--
1.7.10.4
^ permalink raw reply related
* [PATCH 07/28] video: cyber2000fb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:20 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/cyber2000fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index b0a950f..760200d 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1837,7 +1837,7 @@ static int cyberpro_pci_resume(struct pci_dev *dev)
return 0;
}
-static struct pci_device_id cyberpro_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(cyberpro_pci_table) = {
/* Not yet
* { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_1682,
* PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_IGA_1682 },
--
1.7.10.4
^ permalink raw reply related
* [PATCH 08/28] video: lxfb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:21 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/geode/lxfb_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c
index 9e1d19d..c6cec41 100644
--- a/drivers/video/geode/lxfb_core.c
+++ b/drivers/video/geode/lxfb_core.c
@@ -608,7 +608,7 @@ static void lxfb_remove(struct pci_dev *pdev)
framebuffer_release(info);
}
-static struct pci_device_id lxfb_id_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(lxfb_id_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LX_VIDEO) },
{ 0, }
};
--
1.7.10.4
^ permalink raw reply related
* [PATCH 09/28] video: gx1fb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:22 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/geode/gx1fb_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
index 2794ba1..a701452 100644
--- a/drivers/video/geode/gx1fb_core.c
+++ b/drivers/video/geode/gx1fb_core.c
@@ -427,7 +427,7 @@ static void __init gx1fb_setup(char *options)
}
#endif
-static struct pci_device_id gx1fb_id_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(gx1fb_id_table) = {
{ PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_VIDEO,
PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16,
0xff0000, 0 },
--
1.7.10.4
^ permalink raw reply related
* [PATCH 10/28] video: gxt4500: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:22 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/gxt4500.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
index 135d78a..c09d5e5 100644
--- a/drivers/video/gxt4500.c
+++ b/drivers/video/gxt4500.c
@@ -738,7 +738,7 @@ static void gxt4500_remove(struct pci_dev *pdev)
}
/* supported chipsets */
-static const struct pci_device_id gxt4500_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(gxt4500_pci_tbl) = {
{ PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT4500P),
.driver_data = GXT4500P },
{ PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_GXT6500P),
--
1.7.10.4
^ permalink raw reply related
* [PATCH 11/28] video: i810fb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:23 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/i810/i810_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 038192a..4d3e8a1 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -106,7 +106,7 @@ static const char * const i810_pci_list[] = {
"Intel(R) 815 (Internal Graphics with AGP) Framebuffer Device"
};
-static struct pci_device_id i810fb_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(i810fb_pci_tbl) = {
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82810_IG1,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82810_IG3,
--
1.7.10.4
^ permalink raw reply related
* [PATCH 12/28] video: imsttfb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:23 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/imsttfb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index aae10ce..10c769c 100644
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -1319,7 +1319,7 @@ imsttfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
}
}
-static struct pci_device_id imsttfb_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(imsttfb_pci_tbl) = {
{ PCI_VENDOR_ID_IMS, PCI_DEVICE_ID_IMS_TT128,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, IBM },
{ PCI_VENDOR_ID_IMS, PCI_DEVICE_ID_IMS_TT3D,
--
1.7.10.4
^ permalink raw reply related
* [PATCH 13/28] video: kyrofb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:24 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/kyro/fbdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/kyro/fbdev.c b/drivers/video/kyro/fbdev.c
index 50c8574..708d97d 100644
--- a/drivers/video/kyro/fbdev.c
+++ b/drivers/video/kyro/fbdev.c
@@ -640,7 +640,7 @@ static int kyrofb_ioctl(struct fb_info *info,
return 0;
}
-static struct pci_device_id kyrofb_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(kyrofb_pci_tbl) = {
{ PCI_VENDOR_ID_ST, PCI_DEVICE_ID_STG4000,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0, }
--
1.7.10.4
^ permalink raw reply related
* [PATCH 14/28] video: matroxfb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:25 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/matrox/matroxfb_base.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 87c64ff..ccd34c9 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -1594,7 +1594,7 @@ static int initMatrox2(struct matrox_fb_info *minfo, struct board *b)
unsigned int memsize;
int err;
- static struct pci_device_id intel_82437[] = {
+ static DEFINE_PCI_DEVICE_TABLE(intel_82437) = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437) },
{ },
};
@@ -2087,7 +2087,7 @@ static void pci_remove_matrox(struct pci_dev* pdev) {
matroxfb_remove(minfo, 1);
}
-static struct pci_device_id matroxfb_devices[] = {
+static DEFINE_PCI_DEVICE_TABLE(matroxfb_devices) = {
#ifdef CONFIG_FB_MATROX_MILLENIUM
{PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_MIL,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
--
1.7.10.4
^ permalink raw reply related
* [PATCH 15/28] video: mb862xxfb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:26 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/mb862xx/mb862xxfbdrv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/mb862xx/mb862xxfbdrv.c b/drivers/video/mb862xx/mb862xxfbdrv.c
index 0cd4c33..034abbb 100644
--- a/drivers/video/mb862xx/mb862xxfbdrv.c
+++ b/drivers/video/mb862xx/mb862xxfbdrv.c
@@ -982,7 +982,7 @@ static inline int mb862xx_pci_gdc_init(struct mb862xxfb_par *par)
#define CHIP_ID(id) \
{ PCI_DEVICE(PCI_VENDOR_ID_FUJITSU_LIMITED, id) }
-static struct pci_device_id mb862xx_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(mb862xx_pci_tbl) = {
/* MB86295/MB86296 */
CHIP_ID(PCI_DEVICE_ID_FUJITSU_CORALP),
CHIP_ID(PCI_DEVICE_ID_FUJITSU_CORALPA),
--
1.7.10.4
^ permalink raw reply related
* [PATCH 16/28] video: neofb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:27 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/neofb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index 44f99a6..2c7c19e 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -2150,7 +2150,7 @@ static void neofb_remove(struct pci_dev *dev)
}
}
-static struct pci_device_id neofb_devices[] = {
+static DEFINE_PCI_DEVICE_TABLE(neofb_devices) = {
{PCI_VENDOR_ID_NEOMAGIC, PCI_CHIP_NM2070,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_NEOMAGIC_NM2070},
--
1.7.10.4
^ permalink raw reply related
* [PATCH 17/28] video: nvidiafb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:27 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/nvidia/nvidia.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index ff22871..2ed0184 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -62,7 +62,7 @@
/* HW cursor parameters */
#define MAX_CURS 32
-static struct pci_device_id nvidiafb_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(nvidiafb_pci_tbl) = {
{PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
PCI_BASE_CLASS_DISPLAY << 16, 0xff0000, 0},
{ 0, }
--
1.7.10.4
^ permalink raw reply related
* [PATCH 18/28] video: pm2fb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:28 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/pm2fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 3b85b64..78efd82 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -1749,7 +1749,7 @@ static void pm2fb_remove(struct pci_dev *pdev)
framebuffer_release(info);
}
-static struct pci_device_id pm2fb_id_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pm2fb_id_table) = {
{ PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_TVP4020,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_3DLABS, PCI_DEVICE_ID_3DLABS_PERMEDIA2,
--
1.7.10.4
^ permalink raw reply related
* [PATCH 19/28] video: pm3fb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:29 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/pm3fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 4bf3273..0c850db 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -1493,7 +1493,7 @@ static void pm3fb_remove(struct pci_dev *dev)
}
}
-static struct pci_device_id pm3fb_id_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(pm3fb_id_table) = {
{ PCI_VENDOR_ID_3DLABS, 0x0a,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0, }
--
1.7.10.4
^ permalink raw reply related
* [PATCH 20/28] video: rivafb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:29 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/riva/fbdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index a5514ac..bb17eac 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -108,7 +108,7 @@ static int rivafb_blank(int blank, struct fb_info *info);
*
* ------------------------------------------------------------------------- */
-static struct pci_device_id rivafb_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(rivafb_pci_tbl) = {
{ PCI_VENDOR_ID_NVIDIA_SGS, PCI_DEVICE_ID_NVIDIA_SGS_RIVA128,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_TNT,
--
1.7.10.4
^ permalink raw reply related
* [PATCH 21/28] video: s3fb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:30 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/s3fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 968b299..6392d53 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -1503,7 +1503,7 @@ static int s3_pci_resume(struct pci_dev* dev)
/* List of boards that we are trying to support */
-static struct pci_device_id s3_devices[] = {
+static DEFINE_PCI_DEVICE_TABLE(s3_devices) = {
{PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8810), .driver_data = CHIP_XXX_TRIO},
{PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8811), .driver_data = CHIP_XXX_TRIO},
{PCI_DEVICE(PCI_VENDOR_ID_S3, 0x8812), .driver_data = CHIP_M65_AURORA64VP},
--
1.7.10.4
^ permalink raw reply related
* [PATCH 22/28] video: savagefb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:30 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/savage/savagefb_driver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 4dbf45f..d2d8fcf 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -2440,7 +2440,7 @@ static int savagefb_resume(struct pci_dev* dev)
}
-static struct pci_device_id savagefb_devices[] = {
+static DEFINE_PCI_DEVICE_TABLE(savagefb_devices) = {
{PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_MX128,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE},
--
1.7.10.4
^ permalink raw reply related
* [PATCH 23/28] video: sisfb: use DEFINE_PCI_DEVICE_TABLE macro
From: Jingoo Han @ 2013-11-28 3:31 UTC (permalink / raw)
To: linux-fbdev
This macro is used to create a struct pci_device_id array.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/sis/sis_main.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/sis/sis_main.h b/drivers/video/sis/sis_main.h
index 32e23c2..91dd282 100644
--- a/drivers/video/sis/sis_main.h
+++ b/drivers/video/sis/sis_main.h
@@ -113,7 +113,7 @@ static struct sisfb_chip_info {
{ XGI_40, SIS_315_VGA, 1, HW_CURSOR_AREA_SIZE_315 * 4, SIS_CRT2_WENABLE_315, "XGI V3XT/V5/V8" },
};
-static struct pci_device_id sisfb_pci_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(sisfb_pci_table) = {
#ifdef CONFIG_FB_SIS_300
{ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_540_VGA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
--
1.7.10.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox