diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2007-05-25 05:50:53 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-07-09 18:07:39 -0400 |
| commit | dd7f2928d834f7ac67202bcdf24a44ba9b138f08 (patch) | |
| tree | c24379bfcc628c3f46b14105baa7885e592e856e /drivers/ieee1394/dv1394.c | |
| parent | 59337087cb33db58aa0d4463892b4475cf66a50b (diff) | |
ieee1394: convert ieee1394 from "struct class_device" to "struct device"
Here is a straightforward conversion to "struct device". The "struct
class_device" will be removed from the kernel.
It seems to work fine for me with and without CONFIG_SYSFS_DEPRECATED
set.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394/dv1394.c')
| -rw-r--r-- | drivers/ieee1394/dv1394.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c index 208141377612..65722117ab6e 100644 --- a/drivers/ieee1394/dv1394.c +++ b/drivers/ieee1394/dv1394.c | |||
| @@ -2280,7 +2280,7 @@ static void dv1394_remove_host(struct hpsb_host *host) | |||
| 2280 | } while (video); | 2280 | } while (video); |
| 2281 | 2281 | ||
| 2282 | if (found_ohci_card) | 2282 | if (found_ohci_card) |
| 2283 | class_device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR, | 2283 | device_destroy(hpsb_protocol_class, MKDEV(IEEE1394_MAJOR, |
| 2284 | IEEE1394_MINOR_BLOCK_DV1394 * 16 + (host->id << 2))); | 2284 | IEEE1394_MINOR_BLOCK_DV1394 * 16 + (host->id << 2))); |
| 2285 | } | 2285 | } |
| 2286 | 2286 | ||
| @@ -2295,9 +2295,9 @@ static void dv1394_add_host(struct hpsb_host *host) | |||
| 2295 | 2295 | ||
| 2296 | ohci = (struct ti_ohci *)host->hostdata; | 2296 | ohci = (struct ti_ohci *)host->hostdata; |
| 2297 | 2297 | ||
| 2298 | class_device_create(hpsb_protocol_class, NULL, MKDEV( | 2298 | device_create(hpsb_protocol_class, NULL, MKDEV( |
| 2299 | IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)), | 2299 | IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_DV1394 * 16 + (id<<2)), |
| 2300 | NULL, "dv1394-%d", id); | 2300 | "dv1394-%d", id); |
| 2301 | 2301 | ||
| 2302 | dv1394_init(ohci, DV1394_NTSC, MODE_RECEIVE); | 2302 | dv1394_init(ohci, DV1394_NTSC, MODE_RECEIVE); |
| 2303 | dv1394_init(ohci, DV1394_NTSC, MODE_TRANSMIT); | 2303 | dv1394_init(ohci, DV1394_NTSC, MODE_TRANSMIT); |