2003-09-09 23:04:41

by Stephen Hemminger

[permalink] [raw]
Subject: [PATCH] video/hexium_orion warning removal

The hexium_orion driver in 2.6.0-test5 gets a warning because it defines
setup data that is never used.

Builds fine if it is deleted; don't have real hardware.

diff -Nru a/drivers/media/video/hexium_orion.h b/drivers/media/video/hexium_orion.h
--- a/drivers/media/video/hexium_orion.h Tue Sep 9 15:56:54 2003
+++ b/drivers/media/video/hexium_orion.h Tue Sep 9 15:56:54 2003
@@ -30,109 +30,4 @@
/*30*/ 0x44,0x75,0x01,0x8C,0x03
};

-static struct {
- struct hexium_data data[8];
-} hexium_input_select[] = {
-{
- { /* input 0 */
- { 0x06, 0x00 },
- { 0x20, 0xD9 },
- { 0x21, 0x17 }, // 0x16,
- { 0x22, 0x40 },
- { 0x2C, 0x03 },
- { 0x30, 0x44 },
- { 0x31, 0x75 }, // ??
- { 0x21, 0x16 }, // 0x03,
- }
-}, {
- { /* input 1 */
- { 0x06, 0x00 },
- { 0x20, 0xD8 },
- { 0x21, 0x17 }, // 0x16,
- { 0x22, 0x40 },
- { 0x2C, 0x03 },
- { 0x30, 0x44 },
- { 0x31, 0x75 }, // ??
- { 0x21, 0x16 }, // 0x03,
- }
-}, {
- { /* input 2 */
- { 0x06, 0x00 },
- { 0x20, 0xBA },
- { 0x21, 0x07 }, // 0x05,
- { 0x22, 0x91 },
- { 0x2C, 0x03 },
- { 0x30, 0x60 },
- { 0x31, 0xB5 }, // ??
- { 0x21, 0x05 }, // 0x03,
- }
-}, {
- { /* input 3 */
- { 0x06, 0x00 },
- { 0x20, 0xB8 },
- { 0x21, 0x07 }, // 0x05,
- { 0x22, 0x91 },
- { 0x2C, 0x03 },
- { 0x30, 0x60 },
- { 0x31, 0xB5 }, // ??
- { 0x21, 0x05 }, // 0x03,
- }
-}, {
- { /* input 4 */
- { 0x06, 0x00 },
- { 0x20, 0x7C },
- { 0x21, 0x07 }, // 0x03
- { 0x22, 0xD2 },
- { 0x2C, 0x83 },
- { 0x30, 0x60 },
- { 0x31, 0xB5 }, // ??
- { 0x21, 0x03 },
- }
-}, {
- { /* input 5 */
- { 0x06, 0x00 },
- { 0x20, 0x78 },
- { 0x21, 0x07 }, // 0x03,
- { 0x22, 0xD2 },
- { 0x2C, 0x83 },
- { 0x30, 0x60 },
- { 0x31, 0xB5 }, // ?
- { 0x21, 0x03 },
- }
-}, {
- { /* input 6 */
- { 0x06, 0x80 },
- { 0x20, 0x59 },
- { 0x21, 0x17 },
- { 0x22, 0x42 },
- { 0x2C, 0xA3 },
- { 0x30, 0x44 },
- { 0x31, 0x75 },
- { 0x21, 0x12 },
- }
-}, {
- { /* input 7 */
- { 0x06, 0x80 },
- { 0x20, 0x9A },
- { 0x21, 0x17 },
- { 0x22, 0xB1 },
- { 0x2C, 0x13 },
- { 0x30, 0x60 },
- { 0x31, 0xB5 },
- { 0x21, 0x14 },
- }
-}, {
- { /* input 8 */
- { 0x06, 0x80 },
- { 0x20, 0x3C },
- { 0x21, 0x27 },
- { 0x22, 0xC1 },
- { 0x2C, 0x23 },
- { 0x30, 0x44 },
- { 0x31, 0x75 },
- { 0x21, 0x21 },
- }
-}
-};
-
#endif


2003-09-10 08:20:34

by Gerd Knorr

[permalink] [raw]
Subject: Re: [PATCH] video/hexium_orion warning removal

> diff -Nru a/drivers/media/video/hexium_orion.h b/drivers/media/video/hexium_orion.h
> --- a/drivers/media/video/hexium_orion.h Tue Sep 9 15:56:54 2003
> +++ b/drivers/media/video/hexium_orion.h Tue Sep 9 15:56:54 2003
> @@ -30,109 +30,4 @@
> /*30*/ 0x44,0x75,0x01,0x8C,0x03
> };
>
> -static struct {
> - struct hexium_data data[8];
> -} hexium_input_select[] = {
> -{
> - { /* input 1 */

I'd suggest to #if 0 that instead of deleting, it is probably there for
a reason, maybe just a not completed-yet part of the driver ...

Gerd

2003-09-11 09:38:16

by Michael Hunold

[permalink] [raw]
Subject: Re: [PATCH] video/hexium_orion warning removal

Hello Stephen,

> The hexium_orion driver in 2.6.0-test5 gets a warning because it defines
> setup data that is never used.

Yes, I know. I did not have the time to hack on the Hexium Orion driver
recently.

> Builds fine if it is deleted; don't have real hardware.

But I do. ;-) Please leave it in. I know it's an annoying warning, but
the data will be useful once I've added real input selection support
with proper usage of the setup data.

If this patch has already been applied, don't worry -- I'll resend this
stuff then...

> diff -Nru a/drivers/media/video/hexium_orion.h b/drivers/media/video/hexium_orion.h
> --- a/drivers/media/video/hexium_orion.h Tue Sep 9 15:56:54 2003
> +++ b/drivers/media/video/hexium_orion.h Tue Sep 9 15:56:54 2003
[...]

CU
Michael.