2006-02-11 11:01:09

by Arthur Othieno

Subject: [PATCH] matroxfb: simply return what i2c_add_driver() does

insmod will tell us when the module failed to load. We do no further
processing on the return from i2c_add_driver(), so just return what
i2c_add_driver() did, instead of storing it.

Add __init/__exit annotations while we're at it.

Signed-off-by: Arthur Othieno <[email protected]>

---

Andrew, originally sent 12/19/05. No notification from mm-commits of
patch being accepted/dropped. Assuming it got lost along the way? ;-)


drivers/video/matrox/matroxfb_maven.c | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)

3d7e2f6d53ac04029f02e1ce7b966f3521617447
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 6019710..531a0c3 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1297,20 +1297,13 @@ static struct i2c_driver maven_driver={
.detach_client = maven_detach_client,
};

-/* ************************** */
-
-static int matroxfb_maven_init(void) {
- int err;
-
- err = i2c_add_driver(&maven_driver);
- if (err) {
- printk(KERN_ERR "maven: Maven driver failed to register (%d).\n", err);
- return err;
- }
- return 0;
+static int __init matroxfb_maven_init(void)
+{
+ return i2c_add_driver(&maven_driver);
}

-static void matroxfb_maven_exit(void) {
+static void __exit matroxfb_maven_exit(void)
+{
i2c_del_driver(&maven_driver);
}

--
1.1.5

2006-02-11 13:53:18

by Jean Delvare

Subject: Re: [PATCH] matroxfb: simply return what i2c_add_driver() does

Hi Arthur,

> insmod will tell us when the module failed to load. We do no further
> processing on the return from i2c_add_driver(), so just return what
> i2c_add_driver() did, instead of storing it.
>
> Add __init/__exit annotations while we're at it.
>
> Signed-off-by: Arthur Othieno <[email protected]>

Acked-by: Jean Delvare <[email protected]>

Arthur, do you have such a device yourself? I have another cleanup
patch for this driver and am looking for testers.

Thanks,
--
Jean Delvare

2006-02-11 14:40:40

by Arthur Othieno

Subject: Re: [PATCH] matroxfb: simply return what i2c_add_driver() does

On Sat, Feb 11, 2006 at 02:53:22PM +0100, Jean Delvare wrote:
> Hi Arthur,
>
> > insmod will tell us when the module failed to load. We do no further
> > processing on the return from i2c_add_driver(), so just return what
> > i2c_add_driver() did, instead of storing it.
> >
> > Add __init/__exit annotations while we're at it.
> >
> > Signed-off-by: Arthur Othieno <[email protected]>
>
> Acked-by: Jean Delvare <[email protected]>
>
> Arthur, do you have such a device yourself? I have another cleanup
> patch for this driver and am looking for testers.

Unfortunately not ;( This was the last of i2c_add_driver() return audit
I had sitting around. I'm sure someone with said device will speak up..